diff --git a/.gitattributes b/.gitattributes
index 47f6d98b40..03e65f1908 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1 +1,8 @@
-*.ai binary
+# MOLLY: Reduce the number of merge conflicts.
+#
+# Note: also need:
+# git config merge.ours.driver true
+# git config merge.theirs.driver 'cp -- %B %A'
+
+/app/src/main/res/values-*/strings.xml merge=theirs
+/gradle/verification-metadata.xml merge=union
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 007302c532..ff5cfed736 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -9,7 +9,7 @@ plugins {
   id("app.cash.exhaustive")
   id("kotlin-parcelize")
   id("com.squareup.wire")
-  id("translations")
+  id("molly")
   id("licenses")
 }
 
@@ -19,8 +19,8 @@ apply {
   from("fix-profm.gradle")
 }
 
-val canonicalVersionCode = 1410
-val canonicalVersionName = "7.4.2"
+val canonicalVersionCode = 1416
+val canonicalVersionName = "7.6.2"
 val mollyRevision = 1
 
 val postFixSize = 100
@@ -177,7 +177,6 @@ android {
     buildConfigField("String", "SIGNAL_CDN3_URL", "\"https://cdn3.signal.org\"")
     buildConfigField("String", "SIGNAL_CDSI_URL", "\"https://cdsi.signal.org\"")
     buildConfigField("String", "SIGNAL_SERVICE_STATUS_URL", "\"uptime.signal.org\"")
-    buildConfigField("String", "SIGNAL_KEY_BACKUP_URL", "\"https://api.backup.signal.org\"")
     buildConfigField("String", "SIGNAL_SVR2_URL", "\"https://svr2.signal.org\"")
     buildConfigField("String", "SIGNAL_SFU_URL", "\"https://sfu.voip.signal.org\"")
     buildConfigField("String", "SIGNAL_STAGING_SFU_URL", "\"https://sfu.staging.voip.signal.org\"")
@@ -332,7 +331,6 @@ android {
       buildConfigField("String", "SIGNAL_CDN2_URL", "\"https://cdn2-staging.signal.org\"")
       buildConfigField("String", "SIGNAL_CDN3_URL", "\"https://cdn3-staging.signal.org\"")
       buildConfigField("String", "SIGNAL_CDSI_URL", "\"https://cdsi.staging.signal.org\"")
-      buildConfigField("String", "SIGNAL_KEY_BACKUP_URL", "\"https://api-staging.backup.signal.org\"")
       buildConfigField("String", "SIGNAL_SVR2_URL", "\"https://svr2.staging.signal.org\"")
       buildConfigField("String", "SVR2_MRENCLAVE", "\"acb1973aa0bbbd14b3b4e06f145497d948fd4a98efc500fcce363b3b743ec482\"")
       buildConfigField("String", "UNIDENTIFIED_SENDER_TRUST_ROOT", "\"BbqY1DzohE4NUZoVF+L18oUPrK3kILllLEJh2UnPSsEx\"")
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 f7d55cf983..59134e6eca 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
@@ -9,6 +9,7 @@ import android.Manifest
 import android.app.UiAutomation
 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
@@ -23,6 +24,7 @@ import org.thoughtcrime.securesms.backup.v2.proto.AccountData
 import org.thoughtcrime.securesms.backup.v2.proto.BackupInfo
 import org.thoughtcrime.securesms.backup.v2.proto.BodyRange
 import org.thoughtcrime.securesms.backup.v2.proto.Call
+import org.thoughtcrime.securesms.backup.v2.proto.CallChatUpdate
 import org.thoughtcrime.securesms.backup.v2.proto.Chat
 import org.thoughtcrime.securesms.backup.v2.proto.ChatItem
 import org.thoughtcrime.securesms.backup.v2.proto.ChatUpdateMessage
@@ -32,6 +34,8 @@ 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.Group
+import org.thoughtcrime.securesms.backup.v2.proto.GroupCallChatUpdate
+import org.thoughtcrime.securesms.backup.v2.proto.IndividualCallChatUpdate
 import org.thoughtcrime.securesms.backup.v2.proto.MessageAttachment
 import org.thoughtcrime.securesms.backup.v2.proto.ProfileChangeChatUpdate
 import org.thoughtcrime.securesms.backup.v2.proto.Quote
@@ -668,12 +672,62 @@ class ImportExportTest {
       )
     }
 
+    var sentTime = 0L
+    val individualCallChatItems = individualCalls.map { call ->
+      ChatItem(
+        chatId = 1,
+        authorId = selfRecipient.id,
+        dateSent = sentTime++,
+        sms = false,
+        incoming = ChatItem.IncomingMessageDetails(
+          dateReceived = sentTime + 1,
+          dateServerSent = sentTime,
+          read = true,
+          sealedSender = true
+        ),
+        updateMessage = ChatUpdateMessage(
+          callingMessage = CallChatUpdate(
+            callMessage = IndividualCallChatUpdate(
+              type = IndividualCallChatUpdate.Type.INCOMING_AUDIO_CALL
+            )
+          )
+        )
+      )
+    }.toTypedArray()
+
+    val startedAci = TestRecipientUtils.nextAci().toByteString()
+    val groupCallChatItems = groupCalls.map { call ->
+      ChatItem(
+        chatId = 1,
+        authorId = selfRecipient.id,
+        dateSent = sentTime++,
+        sms = false,
+        incoming = ChatItem.IncomingMessageDetails(
+          dateReceived = sentTime + 1,
+          dateServerSent = sentTime,
+          read = true,
+          sealedSender = true
+        ),
+        updateMessage = ChatUpdateMessage(
+          callingMessage = CallChatUpdate(
+            groupCall = GroupCallChatUpdate(
+              startedCallAci = startedAci,
+              startedCallTimestamp = 0,
+              endedCallTimestamp = 0,
+              localUserJoined = GroupCallChatUpdate.LocalUserJoined.JOINED,
+              inCallAcis = emptyList()
+            )
+          )
+        )
+      )
+    }.toTypedArray()
+
     importExport(
       *standardFrames,
       Recipient(
         id = 3,
         contact = Contact(
-          aci = TestRecipientUtils.nextAci().toByteString(),
+          aci = startedAci,
           pni = TestRecipientUtils.nextPni().toByteString(),
           username = "cool.01",
           e164 = 141255501234,
@@ -698,8 +752,21 @@ class ImportExportTest {
           name = "Cool test group"
         )
       ),
+      Chat(
+        id = 1,
+        recipientId = 3,
+        archived = true,
+        pinnedOrder = 1,
+        expirationTimerMs = 1.days.inWholeMilliseconds,
+        muteUntilMs = System.currentTimeMillis(),
+        markedUnread = true,
+        dontNotifyForMentionsIfMuted = true,
+        wallpaper = null
+      ),
       *individualCalls.toArray(),
-      *groupCalls.toArray()
+      *groupCalls.toArray(),
+      *individualCallChatItems,
+      *groupCallChatItems
     )
   }
 
@@ -1008,17 +1075,47 @@ class ImportExportTest {
                 attachmentLocator = FilePointer.AttachmentLocator(
                   cdnKey = "coolCdnKey",
                   cdnNumber = 2,
-                  uploadTimestamp = System.currentTimeMillis()
+                  uploadTimestamp = System.currentTimeMillis(),
+                  key = (1..32).map { it.toByte() }.toByteArray().toByteString(),
+                  size = 12345,
+                  digest = (1..32).map { it.toByte() }.toByteArray().toByteString()
                 ),
-                key = (1..32).map { it.toByte() }.toByteArray().toByteString(),
                 contentType = "image/png",
-                size = 12345,
                 fileName = "very_cool_picture.png",
                 width = 100,
                 height = 200,
                 caption = "Love this cool picture!",
                 incrementalMacChunkSize = 0
-              )
+              ),
+              wasDownloaded = true
+            ),
+            MessageAttachment(
+              pointer = FilePointer(
+                invalidAttachmentLocator = FilePointer.InvalidAttachmentLocator(),
+                contentType = "image/png",
+                width = 100,
+                height = 200,
+                caption = "Love this cool picture! Too bad u cant download it",
+                incrementalMacChunkSize = 0
+              ),
+              wasDownloaded = false
+            ),
+            MessageAttachment(
+              pointer = FilePointer(
+                backupLocator = FilePointer.BackupLocator(
+                  "digestherebutimlazy",
+                  cdnNumber = 3,
+                  key = (1..32).map { it.toByte() }.toByteArray().toByteString(),
+                  digest = (1..64).map { it.toByte() }.toByteArray().toByteString(),
+                  size = 12345
+                ),
+                contentType = "image/png",
+                width = 100,
+                height = 200,
+                caption = "Love this cool picture! Too bad u cant download it",
+                incrementalMacChunkSize = 0
+              ),
+              wasDownloaded = true
             )
           )
         )
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 16f6ca75af..2ea7db24ab 100644
--- a/app/src/androidTest/java/org/thoughtcrime/securesms/conversation/ConversationItemPreviewer.kt
+++ b/app/src/androidTest/java/org/thoughtcrime/securesms/conversation/ConversationItemPreviewer.kt
@@ -7,6 +7,7 @@ import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.signal.core.util.ThreadUtil
+import org.thoughtcrime.securesms.attachments.Cdn
 import org.thoughtcrime.securesms.attachments.PointerAttachment
 import org.thoughtcrime.securesms.conversation.v2.ConversationActivity
 import org.thoughtcrime.securesms.database.MessageType
@@ -15,7 +16,6 @@ import org.thoughtcrime.securesms.mms.IncomingMessage
 import org.thoughtcrime.securesms.mms.OutgoingMessage
 import org.thoughtcrime.securesms.profiles.ProfileName
 import org.thoughtcrime.securesms.recipients.Recipient
-import org.thoughtcrime.securesms.releasechannel.ReleaseChannel
 import org.thoughtcrime.securesms.testing.SignalActivityRule
 import org.whispersystems.signalservice.api.messages.SignalServiceAttachmentPointer
 import org.whispersystems.signalservice.api.messages.SignalServiceAttachmentRemoteId
@@ -137,7 +137,7 @@ class ConversationItemPreviewer {
 
   private fun attachment(): SignalServiceAttachmentPointer {
     return SignalServiceAttachmentPointer(
-      ReleaseChannel.CDN_NUMBER,
+      Cdn.CDN_3.cdnNumber,
       SignalServiceAttachmentRemoteId.from(""),
       "image/webp",
       null,
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 8e3937b20f..2280a45fea 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
@@ -324,5 +324,7 @@ class V2ConversationItemShapeTest {
     override fun onReportSpamLearnMoreClicked() = Unit
 
     override fun onMessageRequestAcceptOptionsClicked() = Unit
+
+    override fun onItemDoubleClick(item: MultiselectPart) = 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 54f1138ad3..d5f8015ce2 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
@@ -14,6 +14,7 @@ import org.junit.runner.RunWith
 import org.signal.core.util.Base64
 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.database.AttachmentTable.TransformProperties
 import org.thoughtcrime.securesms.keyvalue.SignalStore
@@ -742,7 +743,7 @@ class AttachmentTableTest_deduping {
       assertArrayEquals(lhsAttachment.remoteDigest, rhsAttachment.remoteDigest)
       assertArrayEquals(lhsAttachment.incrementalDigest, rhsAttachment.incrementalDigest)
       assertEquals(lhsAttachment.incrementalMacChunkSize, rhsAttachment.incrementalMacChunkSize)
-      assertEquals(lhsAttachment.cdnNumber, rhsAttachment.cdnNumber)
+      assertEquals(lhsAttachment.cdn.cdnNumber, rhsAttachment.cdn.cdnNumber)
     }
 
     fun assertDoesNotHaveRemoteFields(attachmentId: AttachmentId) {
@@ -751,7 +752,7 @@ class AttachmentTableTest_deduping {
       assertNull(databaseAttachment.remoteLocation)
       assertNull(databaseAttachment.remoteDigest)
       assertNull(databaseAttachment.remoteKey)
-      assertEquals(0, databaseAttachment.cdnNumber)
+      assertEquals(0, databaseAttachment.cdn.cdnNumber)
     }
 
     fun assertSkipTransform(attachmentId: AttachmentId, state: Boolean) {
@@ -776,7 +777,7 @@ class AttachmentTableTest_deduping {
         AttachmentTable.TRANSFER_PROGRESS_DONE,
         databaseAttachment.size, // size
         null,
-        3, // cdnNumber
+        Cdn.CDN_3, // cdnNumber
         location,
         key,
         digest,
diff --git a/app/src/androidTest/java/org/thoughtcrime/securesms/database/NameCollisionTablesTest.kt b/app/src/androidTest/java/org/thoughtcrime/securesms/database/NameCollisionTablesTest.kt
new file mode 100644
index 0000000000..ddb83494c5
--- /dev/null
+++ b/app/src/androidTest/java/org/thoughtcrime/securesms/database/NameCollisionTablesTest.kt
@@ -0,0 +1,239 @@
+/*
+ * Copyright 2024 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.thoughtcrime.securesms.database
+
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import org.junit.Before
+import org.junit.Rule
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.signal.storageservice.protos.groups.Member
+import org.signal.storageservice.protos.groups.local.DecryptedMember
+import org.thoughtcrime.securesms.mms.IncomingMessage
+import org.thoughtcrime.securesms.profiles.ProfileName
+import org.thoughtcrime.securesms.recipients.Recipient
+import org.thoughtcrime.securesms.recipients.RecipientId
+import org.thoughtcrime.securesms.testing.GroupTestingUtils
+import org.thoughtcrime.securesms.testing.SignalActivityRule
+import org.thoughtcrime.securesms.testing.assertIsSize
+
+@RunWith(AndroidJUnit4::class)
+class NameCollisionTablesTest {
+
+  @get:Rule
+  val harness = SignalActivityRule(createGroup = true)
+
+  private lateinit var alice: RecipientId
+  private lateinit var bob: RecipientId
+  private lateinit var charlie: RecipientId
+
+  @Before
+  fun setUp() {
+    alice = setUpRecipient(harness.others[0])
+    bob = setUpRecipient(harness.others[1])
+    charlie = setUpRecipient(harness.others[2])
+  }
+
+  @Test
+  fun givenAUserWithAThreadIdButNoConflicts_whenIGetCollisionsForThreadRecipient_thenIExpectNoCollisions() {
+    val threadRecipientId = alice
+    SignalDatabase.threads.getOrCreateThreadIdFor(Recipient.resolved(threadRecipientId))
+    val actual = SignalDatabase.nameCollisions.getCollisionsForThreadRecipientId(threadRecipientId)
+
+    actual assertIsSize 0
+  }
+
+  @Test
+  fun givenTwoUsers_whenOneChangesTheirProfileNameToMatchTheOther_thenIExpectANameCollision() {
+    setProfileName(alice, ProfileName.fromParts("Alice", "Android"))
+    setProfileName(bob, ProfileName.fromParts("Bob", "Android"))
+    setProfileName(alice, ProfileName.fromParts("Bob", "Android"))
+
+    val actualAlice = SignalDatabase.nameCollisions.getCollisionsForThreadRecipientId(alice)
+    val actualBob = SignalDatabase.nameCollisions.getCollisionsForThreadRecipientId(bob)
+
+    actualAlice assertIsSize 2
+    actualBob assertIsSize 2
+  }
+
+  @Test
+  fun givenTwoUsersWithANameCollisions_whenOneChangesToADifferentName_thenIExpectNoNameCollisions() {
+    setProfileName(alice, ProfileName.fromParts("Bob", "Android"))
+    setProfileName(bob, ProfileName.fromParts("Bob", "Android"))
+    setProfileName(alice, ProfileName.fromParts("Alice", "Android"))
+
+    val actualAlice = SignalDatabase.nameCollisions.getCollisionsForThreadRecipientId(alice)
+    val actualBob = SignalDatabase.nameCollisions.getCollisionsForThreadRecipientId(bob)
+
+    actualAlice assertIsSize 0
+    actualBob assertIsSize 0
+  }
+
+  @Test
+  fun givenThreeUsersWithANameCollisions_whenOneChangesToADifferentName_thenIExpectTwoNameCollisions() {
+    setProfileName(alice, ProfileName.fromParts("Bob", "Android"))
+    setProfileName(bob, ProfileName.fromParts("Bob", "Android"))
+    setProfileName(charlie, ProfileName.fromParts("Bob", "Android"))
+    setProfileName(alice, ProfileName.fromParts("Alice", "Android"))
+
+    val actualAlice = SignalDatabase.nameCollisions.getCollisionsForThreadRecipientId(alice)
+    val actualBob = SignalDatabase.nameCollisions.getCollisionsForThreadRecipientId(bob)
+    val actualCharlie = SignalDatabase.nameCollisions.getCollisionsForThreadRecipientId(charlie)
+
+    actualAlice assertIsSize 0
+    actualBob assertIsSize 2
+    actualCharlie assertIsSize 2
+  }
+
+  @Test
+  fun givenTwoUsersWithADismissedNameCollision_whenOneChangesToADifferentNameAndBack_thenIExpectANameCollision() {
+    setProfileName(alice, ProfileName.fromParts("Bob", "Android"))
+    setProfileName(bob, ProfileName.fromParts("Bob", "Android"))
+    SignalDatabase.nameCollisions.markCollisionsForThreadRecipientDismissed(alice)
+
+    setProfileName(alice, ProfileName.fromParts("Alice", "Android"))
+    setProfileName(alice, ProfileName.fromParts("Bob", "Android"))
+
+    val actualAlice = SignalDatabase.nameCollisions.getCollisionsForThreadRecipientId(alice)
+
+    actualAlice assertIsSize 2
+  }
+
+  @Test
+  fun givenADismissedNameCollisionForAlice_whenIGetNameCollisionsForAlice_thenIExpectNoNameCollisions() {
+    setProfileName(alice, ProfileName.fromParts("Bob", "Android"))
+    setProfileName(bob, ProfileName.fromParts("Bob", "Android"))
+    SignalDatabase.nameCollisions.markCollisionsForThreadRecipientDismissed(alice)
+
+    val actualCollisions = SignalDatabase.nameCollisions.getCollisionsForThreadRecipientId(alice)
+
+    actualCollisions assertIsSize 0
+  }
+
+  @Test
+  fun givenADismissedNameCollisionForAliceThatIUpdate_whenIGetNameCollisionsForAlice_thenIExpectNoNameCollisions() {
+    SignalDatabase.threads.getOrCreateThreadIdFor(Recipient.resolved(alice))
+
+    setProfileName(alice, ProfileName.fromParts("Bob", "Android"))
+    setProfileName(bob, ProfileName.fromParts("Bob", "Android"))
+    SignalDatabase.nameCollisions.markCollisionsForThreadRecipientDismissed(alice)
+    setProfileName(bob, ProfileName.fromParts("Bob", "Android"))
+
+    val actualCollisions = SignalDatabase.nameCollisions.getCollisionsForThreadRecipientId(alice)
+
+    actualCollisions assertIsSize 0
+  }
+
+  @Test
+  fun givenADismissedNameCollisionForAlice_whenIGetNameCollisionsForBob_thenIExpectANameCollisionWithTwoEntries() {
+    SignalDatabase.threads.getOrCreateThreadIdFor(Recipient.resolved(alice))
+
+    setProfileName(alice, ProfileName.fromParts("Bob", "Android"))
+    setProfileName(bob, ProfileName.fromParts("Bob", "Android"))
+    SignalDatabase.nameCollisions.markCollisionsForThreadRecipientDismissed(alice)
+
+    val actualCollisions = SignalDatabase.nameCollisions.getCollisionsForThreadRecipientId(bob)
+
+    actualCollisions assertIsSize 2
+  }
+
+  @Test
+  fun givenAGroupWithAliceAndBob_whenIInsertNameChangeMessageForAlice_thenIExpectAGroupNameCollision() {
+    val alice = Recipient.resolved(alice)
+    val bob = Recipient.resolved(bob)
+    val info = createGroup()
+
+    setProfileName(alice.id, ProfileName.fromParts("Bob", "Android"))
+    setProfileName(bob.id, ProfileName.fromParts("Bob", "Android"))
+
+    SignalDatabase.threads.getOrCreateThreadIdFor(Recipient.resolved(info.recipientId))
+    SignalDatabase.messages.insertProfileNameChangeMessages(alice, "Bob Android", "Alice Android")
+
+    val collisions = SignalDatabase.nameCollisions.getCollisionsForThreadRecipientId(info.recipientId)
+
+    collisions assertIsSize 2
+  }
+
+  @Test
+  fun givenAGroupWithAliceAndBobWithDismissedCollision_whenIInsertNameChangeMessageForAlice_thenIExpectAGroupNameCollision() {
+    val alice = Recipient.resolved(alice)
+    val bob = Recipient.resolved(bob)
+    val info = createGroup()
+
+    setProfileName(alice.id, ProfileName.fromParts("Bob", "Android"))
+    setProfileName(bob.id, ProfileName.fromParts("Bob", "Android"))
+
+    SignalDatabase.threads.getOrCreateThreadIdFor(Recipient.resolved(info.recipientId))
+    SignalDatabase.messages.insertProfileNameChangeMessages(alice, "Bob Android", "Alice Android")
+    SignalDatabase.nameCollisions.markCollisionsForThreadRecipientDismissed(info.recipientId)
+    SignalDatabase.messages.insertProfileNameChangeMessages(alice, "Bob Android", "Alice Android")
+
+    val collisions = SignalDatabase.nameCollisions.getCollisionsForThreadRecipientId(info.recipientId)
+
+    collisions assertIsSize 0
+  }
+
+  @Test
+  fun givenAGroupWithAliceAndBob_whenIInsertNameChangeMessageForAliceWithMismatch_thenIExpectNoGroupNameCollision() {
+    val alice = Recipient.resolved(alice)
+    val bob = Recipient.resolved(bob)
+    val info = createGroup()
+
+    setProfileName(alice.id, ProfileName.fromParts("Alice", "Android"))
+    setProfileName(bob.id, ProfileName.fromParts("Bob", "Android"))
+
+    SignalDatabase.threads.getOrCreateThreadIdFor(Recipient.resolved(info.recipientId))
+    SignalDatabase.messages.insertProfileNameChangeMessages(alice, "Alice Android", "Bob Android")
+
+    val collisions = SignalDatabase.nameCollisions.getCollisionsForThreadRecipientId(info.recipientId)
+
+    collisions assertIsSize 0
+  }
+
+  private fun setUpRecipient(recipientId: RecipientId): RecipientId {
+    SignalDatabase.recipients.setProfileSharing(recipientId, false)
+    val threadId = SignalDatabase.threads.getOrCreateThreadIdFor(recipientId, false)
+
+    MmsHelper.insert(
+      threadId = threadId,
+      message = IncomingMessage(
+        type = MessageType.NORMAL,
+        from = recipientId,
+        groupId = null,
+        body = "hi",
+        sentTimeMillis = 100L,
+        receivedTimeMillis = 200L,
+        serverTimeMillis = 100L,
+        isUnidentified = true
+      )
+    )
+
+    return recipientId
+  }
+
+  private fun setProfileName(recipientId: RecipientId, name: ProfileName) {
+    SignalDatabase.recipients.setProfileName(recipientId, name)
+    SignalDatabase.nameCollisions.handleIndividualNameCollision(recipientId)
+  }
+
+  private fun createGroup(): GroupTestingUtils.TestGroupInfo {
+    return GroupTestingUtils.insertGroup(
+      revision = 0,
+      DecryptedMember(
+        aciBytes = harness.self.requireAci().toByteString(),
+        role = Member.Role.ADMINISTRATOR
+      ),
+      DecryptedMember(
+        aciBytes = Recipient.resolved(alice).requireAci().toByteString(),
+        role = Member.Role.ADMINISTRATOR
+      ),
+      DecryptedMember(
+        aciBytes = Recipient.resolved(bob).requireAci().toByteString(),
+        role = Member.Role.ADMINISTRATOR
+      )
+    )
+  }
+}
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 41f1a6149c..3dfdd94d5e 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
@@ -292,6 +292,10 @@ class InternalConversationTestFragment : Fragment(R.layout.conversation_test_fra
       Toast.makeText(requireContext(), "Can't touch this.", Toast.LENGTH_SHORT).show()
     }
 
+    override fun onItemDoubleClick(item: MultiselectPart) {
+      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 634c01d7cb..da2b0cca2e 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -721,7 +721,7 @@
         android:exported="false"/>
 
     <activity
-        android:name=".backup.v2.ui.MessageBackupsFlowActivity"
+        android:name=".backup.v2.ui.subscription.MessageBackupsFlowActivity"
         android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"
         android:exported="false"
         android:theme="@style/Signal.DayNight.NoActionBar"
@@ -802,6 +802,20 @@
               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"
               android:exported="false"/>
 
+    <activity android:name=".registration.v2.ui.RegistrationV2Activity"
+              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=".restore.RestoreActivity"
+              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=".revealable.ViewOnceMessageActivity"
               android:launchMode="singleTask"
               android:theme="@style/TextSecure.FullScreenMedia"
@@ -917,7 +931,7 @@
               android:windowSoftInputMode="stateVisible|adjustResize"
               android:exported="false"/>
 
-    <activity android:name=".backup.v2.ui.MessageBackupsTestRestoreActivity"
+    <activity android:name=".backup.v2.ui.subscription.MessageBackupsTestRestoreActivity"
               android:theme="@style/TextSecure.LightRegistrationTheme"
               android:exported="false"/>
 
@@ -1049,6 +1063,12 @@
               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"
               android:exported="false"/>
 
+    <service
+        android:enabled="true"
+        android:name=".service.webrtc.WebRtcCallService"
+        android:foregroundServiceType="camera|microphone"
+        android:exported="false"/>
+
     <service
         android:enabled="true"
         android:exported="false"
@@ -1117,6 +1137,10 @@
         android:name=".service.AttachmentProgressService"
         android:exported="false"/>
 
+    <service
+        android:name=".service.BackupProgressService"
+        android:exported="false"/>
+
     <service
         android:name=".gcm.FcmFetchBackgroundService"
         android:exported="false"/>
diff --git a/app/src/main/baseline-prof.txt b/app/src/main/baseline-prof.txt
index ac7d08d66f..cf9d8b2cb9 100644
--- a/app/src/main/baseline-prof.txt
+++ b/app/src/main/baseline-prof.txt
@@ -1,126 +1,26 @@
 HPLandroidx/appcompat/widget/SearchView;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;I)V
+HPLandroidx/constraintlayout/core/ArrayRow;-><init>(Landroidx/constraintlayout/core/Cache;)V
 HPLandroidx/core/view/ViewGroupKt$descendants$1;->invokeSuspend(Ljava/lang/Object;)Ljava/lang/Object;
 HPLandroidx/customview/poolingcontainer/PoolingContainer;->callPoolingContainerOnRelease(Landroid/view/View;)V
-HPLandroidx/customview/poolingcontainer/PoolingContainer;->getPoolingContainerListenerHolder(Landroid/view/View;)Landroidx/customview/poolingcontainer/PoolingContainerListenerHolder;
-HPLandroidx/customview/poolingcontainer/PoolingContainerListenerHolder;-><init>()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/AsyncListDiffer$1$1;->areContentsTheSame(II)Z
 HPLandroidx/recyclerview/widget/BatchingListUpdateCallback;->onChanged(IILjava/lang/Object;)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/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;
-HPLandroidx/recyclerview/widget/RecyclerView$ItemAnimator;->buildAdapterChangeFlagsForAnimations(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;)I
-HPLandroidx/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
 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/savedstate/SavedStateRegistry;->performSave(Landroid/os/Bundle;)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
-HPLio/reactivex/rxjava3/internal/operators/observable/ObservableReplay$BoundedReplayBuffer;->removeFirst()V
-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;
-HPLkotlin/sequences/SequencesKt__SequenceBuilderKt;->sequence(Lkotlin/jvm/functions/Function2;)Lkotlin/sequences/Sequence;
-HPLnet/zetetic/database/sqlcipher/SQLiteProgram;->getSql()Ljava/lang/String;
-HPLokio/Buffer;->write(Lokio/Buffer;J)V
-HPLokio/OutputStreamSink;->write(Lokio/Buffer;J)V
-HPLorg/signal/core/util/concurrent/SignalExecutors$$ExternalSyntheticLambda0;->rejectedExecution(Ljava/lang/Runnable;Ljava/util/concurrent/ThreadPoolExecutor;)V
-HPLorg/signal/core/util/concurrent/SignalExecutors;->lambda$newCachedBoundedExecutor$1(Ljava/lang/Runnable;Ljava/util/concurrent/ThreadPoolExecutor;)V
-HPLorg/signal/core/util/tracing/DebugAnnotation$Builder;->build()Lorg/signal/core/util/tracing/DebugAnnotation;
-HPLorg/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
+HPLkotlin/collections/AbstractList$IteratorImpl;-><init>(Lkotlin/collections/AbstractList;)V
+HPLkotlin/jvm/internal/Intrinsics;->checkNotNull(Ljava/lang/Object;)V
+HPLkotlin/text/StringsKt__StringsKt;->getIndices(Ljava/lang/CharSequence;)Lkotlin/ranges/IntRange;
+HPLnet/zetetic/database/sqlcipher/SQLiteConnectionPool;->wakeConnectionWaitersLocked()V
+HPLnet/zetetic/database/sqlcipher/SQLiteDatabase;->inTransaction()Z
 HPLorg/signal/core/util/tracing/TracePacket$Builder;-><init>()V
+HPLorg/signal/core/util/tracing/TracePacket$Builder;->timestamp(Ljava/lang/Long;)Lorg/signal/core/util/tracing/TracePacket$Builder;
 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/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/ConversationItemThumbnail;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;)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/ScrollToPositionDelegate;->isListCommitted()Z
-HPLorg/thoughtcrime/securesms/components/ThumbnailView$$ExternalSyntheticBackport2;->m([Ljava/lang/Object;)Ljava/util/List;
-HPLorg/thoughtcrime/securesms/components/ThumbnailView;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;I)V
-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;->setPlayVideoClickListener(Lorg/thoughtcrime/securesms/mms/SlideClickListener;)V
-HPLorg/thoughtcrime/securesms/components/ThumbnailView;->setRadii(IIII)V
-HPLorg/thoughtcrime/securesms/components/ThumbnailView;->setStartTransferClickListener(Lorg/thoughtcrime/securesms/mms/SlidesClickedListener;)V
-HPLorg/thoughtcrime/securesms/components/ThumbnailView;->setThumbnailClickListener(Lorg/thoughtcrime/securesms/mms/SlideClickListener;)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/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/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/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;
@@ -130,39 +30,10 @@ HPLorg/thoughtcrime/securesms/conversation/v2/ConversationViewModel$13;->apply(L
 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/IdentityRecordsState;->equals(Ljava/lang/Object;)Z
-HPLorg/thoughtcrime/securesms/conversation/v2/InputReadyState;->equals(Ljava/lang/Object;)Z
-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;->setCorners([F)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;->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;->getFooterWidth()I
-HPLorg/thoughtcrime/securesms/conversation/v2/items/V2FooterPositionDelegate;->onPostMeasure()Z
-HPLorg/thoughtcrime/securesms/database/AttachmentTable$TransformProperties;-><init>(ZZJJIZ)V
-HPLorg/thoughtcrime/securesms/database/DatabaseObserver;->lambda$unregisterObserver$17(Lorg/thoughtcrime/securesms/database/DatabaseObserver$Observer;)V
-HPLorg/thoughtcrime/securesms/database/SQLiteDatabase;->trace(Ljava/lang/String;Ljava/lang/Runnable;)V
+HPLorg/thoughtcrime/securesms/conversation/v2/RequestReviewState;->equals(Ljava/lang/Object;)Z
 HPLorg/thoughtcrime/securesms/database/model/IdentityRecord;->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/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/mms/Slide;->equals(Ljava/lang/Object;)Z
-HPLorg/thoughtcrime/securesms/recipients/LiveRecipient$$ExternalSyntheticLambda6;-><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/util/BubbleUtil;->canBubble(Landroid/content/Context;Lorg/thoughtcrime/securesms/recipients/Recipient;Ljava/lang/Long;)Z
-HPLorg/thoughtcrime/securesms/util/Projection$Corners;-><init>(FFFF)V
-HPLorg/thoughtcrime/securesms/util/Projection$Corners;->toRadii()[F
-HPLorg/thoughtcrime/securesms/util/adapter/mapping/MappingDiffCallback;->areContentsTheSame(Ljava/lang/Object;Ljava/lang/Object;)Z
-HPLorg/thoughtcrime/securesms/util/adapter/mapping/MappingViewHolder;->setPayload(Ljava/util/List;)V
 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
@@ -533,7 +404,6 @@ HSPLandroidx/appcompat/view/menu/ActionMenuItemView;->setItemInvoker(Landroidx/a
 HSPLandroidx/appcompat/view/menu/ActionMenuItemView;->setPopupCallback(Landroidx/appcompat/view/menu/ActionMenuItemView$PopupCallback;)V
 HSPLandroidx/appcompat/view/menu/ActionMenuItemView;->setTitle(Ljava/lang/CharSequence;)V
 HSPLandroidx/appcompat/view/menu/ActionMenuItemView;->shouldAllowTextWithIcon()Z
-HSPLandroidx/appcompat/view/menu/ActionMenuItemView;->updateTextButtonVisibility()V
 HSPLandroidx/appcompat/view/menu/BaseMenuPresenter;-><init>(Landroid/content/Context;II)V
 HSPLandroidx/appcompat/view/menu/BaseMenuPresenter;->addItemView(Landroid/view/View;I)V
 HSPLandroidx/appcompat/view/menu/BaseMenuPresenter;->createItemView(Landroid/view/ViewGroup;)Landroidx/appcompat/view/menu/MenuView$ItemView;
@@ -541,7 +411,6 @@ HSPLandroidx/appcompat/view/menu/BaseMenuPresenter;->filterLeftoverView(Landroid
 HSPLandroidx/appcompat/view/menu/BaseMenuPresenter;->getItemView(Landroidx/appcompat/view/menu/MenuItemImpl;Landroid/view/View;Landroid/view/ViewGroup;)Landroid/view/View;
 HSPLandroidx/appcompat/view/menu/BaseMenuPresenter;->initForMenu(Landroid/content/Context;Landroidx/appcompat/view/menu/MenuBuilder;)V
 HSPLandroidx/appcompat/view/menu/BaseMenuPresenter;->setCallback(Landroidx/appcompat/view/menu/MenuPresenter$Callback;)V
-HSPLandroidx/appcompat/view/menu/BaseMenuPresenter;->updateMenuView(Z)V
 HSPLandroidx/appcompat/view/menu/MenuBuilder;-><clinit>()V
 HSPLandroidx/appcompat/view/menu/MenuBuilder;-><init>(Landroid/content/Context;)V
 HSPLandroidx/appcompat/view/menu/MenuBuilder;->add(IIILjava/lang/CharSequence;)Landroid/view/MenuItem;
@@ -624,7 +493,6 @@ HSPLandroidx/appcompat/widget/ActionMenuPresenter;->setExpandedActionViewsExclus
 HSPLandroidx/appcompat/widget/ActionMenuPresenter;->setMenuView(Landroidx/appcompat/widget/ActionMenuView;)V
 HSPLandroidx/appcompat/widget/ActionMenuPresenter;->setReserveOverflow(Z)V
 HSPLandroidx/appcompat/widget/ActionMenuPresenter;->shouldIncludeItem(ILandroidx/appcompat/view/menu/MenuItemImpl;)Z
-HSPLandroidx/appcompat/widget/ActionMenuPresenter;->updateMenuView(Z)V
 HSPLandroidx/appcompat/widget/ActionMenuView$ActionMenuPresenterCallback;-><init>()V
 HSPLandroidx/appcompat/widget/ActionMenuView$LayoutParams;-><init>(II)V
 HSPLandroidx/appcompat/widget/ActionMenuView$LayoutParams;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
@@ -649,6 +517,7 @@ HSPLandroidx/appcompat/widget/ActionMenuView;->setOverflowReserved(Z)V
 HSPLandroidx/appcompat/widget/ActionMenuView;->setPopupTheme(I)V
 HSPLandroidx/appcompat/widget/AppCompatBackgroundHelper;-><init>(Landroid/view/View;)V
 HSPLandroidx/appcompat/widget/AppCompatBackgroundHelper;->applySupportBackgroundTint()V
+HSPLandroidx/appcompat/widget/AppCompatBackgroundHelper;->loadFromAttributes(Landroid/util/AttributeSet;I)V
 HSPLandroidx/appcompat/widget/AppCompatBackgroundHelper;->onSetBackgroundDrawable(Landroid/graphics/drawable/Drawable;)V
 HSPLandroidx/appcompat/widget/AppCompatBackgroundHelper;->onSetBackgroundResource(I)V
 HSPLandroidx/appcompat/widget/AppCompatBackgroundHelper;->setInternalBackgroundTint(Landroid/content/res/ColorStateList;)V
@@ -707,6 +576,7 @@ HSPLandroidx/appcompat/widget/AppCompatEmojiTextHelper;-><init>(Landroid/widget/
 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
@@ -756,8 +626,10 @@ 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
 HSPLandroidx/appcompat/widget/AppCompatTextView;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
+HSPLandroidx/appcompat/widget/AppCompatTextView;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;I)V
 HSPLandroidx/appcompat/widget/AppCompatTextView;->consumeTextFutureAndSetBlocking()V
 HSPLandroidx/appcompat/widget/AppCompatTextView;->drawableStateChanged()V
 HSPLandroidx/appcompat/widget/AppCompatTextView;->getEmojiTextViewHelper()Landroidx/appcompat/widget/AppCompatEmojiTextHelper;
@@ -785,6 +657,7 @@ HSPLandroidx/appcompat/widget/AppCompatTextViewAutoSizeHelper$Impl;-><init>()V
 HSPLandroidx/appcompat/widget/AppCompatTextViewAutoSizeHelper;-><clinit>()V
 HSPLandroidx/appcompat/widget/AppCompatTextViewAutoSizeHelper;-><init>(Landroid/widget/TextView;)V
 HSPLandroidx/appcompat/widget/AppCompatTextViewAutoSizeHelper;->getAutoSizeTextType()I
+HSPLandroidx/appcompat/widget/AppCompatTextViewAutoSizeHelper;->loadFromAttributes(Landroid/util/AttributeSet;I)V
 HSPLandroidx/appcompat/widget/AppCompatTextViewAutoSizeHelper;->supportsAutoSizeText()Z
 HSPLandroidx/appcompat/widget/ContentFrameLayout;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
 HSPLandroidx/appcompat/widget/ContentFrameLayout;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;I)V
@@ -1207,7 +1080,6 @@ HSPLandroidx/compose/ui/text/platform/extensions/LocaleListHelperMethods$$Extern
 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
-HSPLandroidx/constraintlayout/core/ArrayLinkedVariables;->add(Landroidx/constraintlayout/core/SolverVariable;FZ)V
 HSPLandroidx/constraintlayout/core/ArrayLinkedVariables;->clear()V
 HSPLandroidx/constraintlayout/core/ArrayLinkedVariables;->contains(Landroidx/constraintlayout/core/SolverVariable;)Z
 HSPLandroidx/constraintlayout/core/ArrayLinkedVariables;->divideByAmount(F)V
@@ -1216,7 +1088,7 @@ 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/ArrayRow;-><init>(Landroidx/constraintlayout/core/Cache;)V
+HSPLandroidx/constraintlayout/core/ArrayLinkedVariables;->remove(Landroidx/constraintlayout/core/SolverVariable;Z)F
 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;
 HSPLandroidx/constraintlayout/core/ArrayRow;->chooseSubject(Landroidx/constraintlayout/core/LinearSystem;)Z
@@ -1230,11 +1102,13 @@ HSPLandroidx/constraintlayout/core/ArrayRow;->createRowLowerThan(Landroidx/const
 HSPLandroidx/constraintlayout/core/ArrayRow;->ensurePositiveConstant()V
 HSPLandroidx/constraintlayout/core/ArrayRow;->getKey()Landroidx/constraintlayout/core/SolverVariable;
 HSPLandroidx/constraintlayout/core/ArrayRow;->hasKeyVariable()Z
+HSPLandroidx/constraintlayout/core/ArrayRow;->hasVariable(Landroidx/constraintlayout/core/SolverVariable;)Z
 HSPLandroidx/constraintlayout/core/ArrayRow;->isEmpty()Z
 HSPLandroidx/constraintlayout/core/ArrayRow;->isNew(Landroidx/constraintlayout/core/SolverVariable;Landroidx/constraintlayout/core/LinearSystem;)Z
 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
@@ -1250,6 +1124,7 @@ HSPLandroidx/constraintlayout/core/LinearSystem;->addLowerThan(Landroidx/constra
 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;
@@ -1292,6 +1167,7 @@ HSPLandroidx/constraintlayout/core/SolverVariable;->removeFromRow(Landroidx/cons
 HSPLandroidx/constraintlayout/core/SolverVariable;->reset()V
 HSPLandroidx/constraintlayout/core/SolverVariable;->setFinalValue(Landroidx/constraintlayout/core/LinearSystem;F)V
 HSPLandroidx/constraintlayout/core/SolverVariable;->setType(Landroidx/constraintlayout/core/SolverVariable$Type;Ljava/lang/String;)V
+HSPLandroidx/constraintlayout/core/SolverVariable;->updateReferencesWithNewDefinition(Landroidx/constraintlayout/core/LinearSystem;Landroidx/constraintlayout/core/ArrayRow;)V
 HSPLandroidx/constraintlayout/core/state/WidgetFrame;-><clinit>()V
 HSPLandroidx/constraintlayout/core/state/WidgetFrame;-><init>(Landroidx/constraintlayout/core/widgets/ConstraintWidget;)V
 HSPLandroidx/constraintlayout/core/widgets/Barrier;-><init>()V
@@ -1378,6 +1254,7 @@ HSPLandroidx/constraintlayout/core/widgets/ConstraintWidget;->isVerticalSolvingP
 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
 HSPLandroidx/constraintlayout/core/widgets/ConstraintWidget;->setCompanionWidget(Ljava/lang/Object;)V
@@ -1492,6 +1369,7 @@ HSPLandroidx/constraintlayout/core/widgets/analyzer/Direct;->solveHorizontalMatc
 HSPLandroidx/constraintlayout/core/widgets/analyzer/Direct;->solveVerticalCenterConstraints(ILandroidx/constraintlayout/core/widgets/analyzer/BasicMeasure$Measurer;Landroidx/constraintlayout/core/widgets/ConstraintWidget;)V
 HSPLandroidx/constraintlayout/core/widgets/analyzer/Direct;->solveVerticalMatchConstraint(ILandroidx/constraintlayout/core/widgets/ConstraintWidget;Landroidx/constraintlayout/core/widgets/analyzer/BasicMeasure$Measurer;Landroidx/constraintlayout/core/widgets/ConstraintWidget;)V
 HSPLandroidx/constraintlayout/core/widgets/analyzer/Direct;->solvingPass(Landroidx/constraintlayout/core/widgets/ConstraintWidgetContainer;Landroidx/constraintlayout/core/widgets/analyzer/BasicMeasure$Measurer;)V
+HSPLandroidx/constraintlayout/core/widgets/analyzer/Direct;->verticalSolvingPass(ILandroidx/constraintlayout/core/widgets/ConstraintWidget;Landroidx/constraintlayout/core/widgets/analyzer/BasicMeasure$Measurer;)V
 HSPLandroidx/constraintlayout/widget/Barrier;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
 HSPLandroidx/constraintlayout/widget/Barrier;->init(Landroid/util/AttributeSet;)V
 HSPLandroidx/constraintlayout/widget/Barrier;->resolveRtl(Landroidx/constraintlayout/core/widgets/ConstraintWidget;Z)V
@@ -1516,6 +1394,7 @@ 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
 HSPLandroidx/constraintlayout/widget/ConstraintLayout$Measurer;->didMeasures()V
@@ -1691,7 +1570,6 @@ HSPLandroidx/core/app/NotificationManagerCompat;-><init>(Landroid/content/Contex
 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
@@ -1813,6 +1691,10 @@ 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
@@ -2139,6 +2021,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
@@ -2247,6 +2134,10 @@ 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
@@ -5147,6 +5038,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
@@ -5169,6 +5063,7 @@ HSPLandroidx/recyclerview/widget/LinearLayoutManager;->getExtraLayoutSpace(Landr
 HSPLandroidx/recyclerview/widget/LinearLayoutManager;->getReverseLayout()Z
 HSPLandroidx/recyclerview/widget/LinearLayoutManager;->isAutoMeasureEnabled()Z
 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;->onInitializeAccessibilityEvent(Landroid/view/accessibility/AccessibilityEvent;)V
@@ -5209,8 +5104,10 @@ HSPLandroidx/recyclerview/widget/OpReorderer;-><init>(Landroidx/recyclerview/wid
 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
@@ -5298,6 +5195,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
@@ -5326,14 +5228,17 @@ HSPLandroidx/recyclerview/widget/RecyclerView$LayoutManager;->getChildMeasureSpe
 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
@@ -5342,6 +5247,7 @@ 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
@@ -5763,11 +5669,13 @@ HSPLcom/airbnb/lottie/LottieCompositionFactory;->rawResCacheKey(Landroid/content
 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$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;-><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;
@@ -5785,6 +5693,7 @@ HSPLcom/airbnb/lottie/LottieDrawable;->getOpacity()I
 HSPLcom/airbnb/lottie/LottieDrawable;->getRenderMode()Lcom/airbnb/lottie/RenderMode;
 HSPLcom/airbnb/lottie/LottieDrawable;->invalidateSelf()V
 HSPLcom/airbnb/lottie/LottieDrawable;->isApplyingOpacityToLayersEnabled()Z
+HSPLcom/airbnb/lottie/LottieDrawable;->lambda$addValueCallback$14(Lcom/airbnb/lottie/model/KeyPath;Ljava/lang/Object;Lcom/airbnb/lottie/value/LottieValueCallback;Lcom/airbnb/lottie/LottieComposition;)V
 HSPLcom/airbnb/lottie/LottieDrawable;->lambda$setProgress$13(FLcom/airbnb/lottie/LottieComposition;)V
 HSPLcom/airbnb/lottie/LottieDrawable;->pauseAnimation()V
 HSPLcom/airbnb/lottie/LottieDrawable;->resolveKeyPath(Lcom/airbnb/lottie/model/KeyPath;)Ljava/util/List;
@@ -6178,21 +6087,19 @@ HSPLcom/airbnb/lottie/parser/moshi/JsonUtf8Reader;-><init>(Lokio/BufferedSource;
 HSPLcom/airbnb/lottie/parser/moshi/JsonUtf8Reader;->beginArray()V
 HSPLcom/airbnb/lottie/parser/moshi/JsonUtf8Reader;->beginObject()V
 HSPLcom/airbnb/lottie/parser/moshi/JsonUtf8Reader;->close()V
-HSPLcom/airbnb/lottie/parser/moshi/JsonUtf8Reader;->doPeek()I
 HSPLcom/airbnb/lottie/parser/moshi/JsonUtf8Reader;->endArray()V
 HSPLcom/airbnb/lottie/parser/moshi/JsonUtf8Reader;->endObject()V
 HSPLcom/airbnb/lottie/parser/moshi/JsonUtf8Reader;->findName(Ljava/lang/String;Lcom/airbnb/lottie/parser/moshi/JsonReader$Options;)I
 HSPLcom/airbnb/lottie/parser/moshi/JsonUtf8Reader;->hasNext()Z
 HSPLcom/airbnb/lottie/parser/moshi/JsonUtf8Reader;->isLiteral(I)Z
 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
@@ -6346,6 +6253,8 @@ 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
@@ -6372,6 +6281,9 @@ 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;
@@ -7435,13 +7347,13 @@ HSPLcom/fasterxml/jackson/core/base/GeneratorBase;->isEnabled(Lcom/fasterxml/jac
 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
 HSPLcom/fasterxml/jackson/core/base/ParserBase;->_validJsonTokenList()Ljava/lang/String;
 HSPLcom/fasterxml/jackson/core/base/ParserBase;->_validJsonValueList()Ljava/lang/String;
 HSPLcom/fasterxml/jackson/core/base/ParserBase;->close()V
 HSPLcom/fasterxml/jackson/core/base/ParserBase;->convertNumberToLong()V
-HSPLcom/fasterxml/jackson/core/base/ParserBase;->getCurrentName()Ljava/lang/String;
 HSPLcom/fasterxml/jackson/core/base/ParserBase;->getIntValue()I
 HSPLcom/fasterxml/jackson/core/base/ParserBase;->getLongValue()J
 HSPLcom/fasterxml/jackson/core/base/ParserBase;->getNumberType()Lcom/fasterxml/jackson/core/JsonParser$NumberType;
@@ -7450,7 +7362,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;Ljava/lang/Object;Ljava/lang/Object;)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;
@@ -7541,6 +7453,7 @@ HSPLcom/fasterxml/jackson/core/json/ReaderBasedJsonParser;-><clinit>()V
 HSPLcom/fasterxml/jackson/core/json/ReaderBasedJsonParser;-><init>(Lcom/fasterxml/jackson/core/io/IOContext;ILjava/io/Reader;Lcom/fasterxml/jackson/core/ObjectCodec;Lcom/fasterxml/jackson/core/sym/CharsToNameCanonicalizer;)V
 HSPLcom/fasterxml/jackson/core/json/ReaderBasedJsonParser;-><init>(Lcom/fasterxml/jackson/core/io/IOContext;ILjava/io/Reader;Lcom/fasterxml/jackson/core/ObjectCodec;Lcom/fasterxml/jackson/core/sym/CharsToNameCanonicalizer;[CIIZ)V
 HSPLcom/fasterxml/jackson/core/json/ReaderBasedJsonParser;->_closeInput()V
+HSPLcom/fasterxml/jackson/core/json/ReaderBasedJsonParser;->_finishString()V
 HSPLcom/fasterxml/jackson/core/json/ReaderBasedJsonParser;->_finishString2()V
 HSPLcom/fasterxml/jackson/core/json/ReaderBasedJsonParser;->_loadMore()Z
 HSPLcom/fasterxml/jackson/core/json/ReaderBasedJsonParser;->_matchFalse()V
@@ -7582,6 +7495,7 @@ HSPLcom/fasterxml/jackson/core/json/UTF8JsonGenerator;->writeString(Ljava/lang/S
 HSPLcom/fasterxml/jackson/core/json/UTF8JsonGenerator;->writeString([CII)V
 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;->_closeArrayScope()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
@@ -7590,10 +7504,12 @@ HSPLcom/fasterxml/jackson/core/json/UTF8StreamJsonParser;->_handleUnexpectedValu
 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;
+HSPLcom/fasterxml/jackson/core/json/UTF8StreamJsonParser;->_nextTokenNotInObject(I)Lcom/fasterxml/jackson/core/JsonToken;
 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;->_reportInvalidToken(Ljava/lang/String;Ljava/lang/String;)V
 HSPLcom/fasterxml/jackson/core/json/UTF8StreamJsonParser;->_skipColon()I
 HSPLcom/fasterxml/jackson/core/json/UTF8StreamJsonParser;->_skipWS()I
@@ -7607,6 +7523,7 @@ HSPLcom/fasterxml/jackson/core/json/UTF8StreamJsonParser;->findName(IIII)Ljava/l
 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;->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;
@@ -7648,7 +7565,6 @@ HSPLcom/fasterxml/jackson/core/sym/ByteQuadsCanonicalizer;->_calcTertiaryShift(I
 HSPLcom/fasterxml/jackson/core/sym/ByteQuadsCanonicalizer;->_checkNeedForRehash()Z
 HSPLcom/fasterxml/jackson/core/sym/ByteQuadsCanonicalizer;->_findOffsetForAdd(I)I
 HSPLcom/fasterxml/jackson/core/sym/ByteQuadsCanonicalizer;->_findSecondary(III)Ljava/lang/String;
-HSPLcom/fasterxml/jackson/core/sym/ByteQuadsCanonicalizer;->_findSecondary(II[II)Ljava/lang/String;
 HSPLcom/fasterxml/jackson/core/sym/ByteQuadsCanonicalizer;->_resizeAndFindOffsetForAdd(I)I
 HSPLcom/fasterxml/jackson/core/sym/ByteQuadsCanonicalizer;->_spilloverStart()I
 HSPLcom/fasterxml/jackson/core/sym/ByteQuadsCanonicalizer;->_verifyLongName([III)Z
@@ -8205,7 +8121,6 @@ HSPLcom/fasterxml/jackson/databind/deser/BeanDeserializer;->_deserializeWithErro
 HSPLcom/fasterxml/jackson/databind/deser/BeanDeserializer;->deserialize(Lcom/fasterxml/jackson/core/JsonParser;Lcom/fasterxml/jackson/databind/DeserializationContext;)Ljava/lang/Object;
 HSPLcom/fasterxml/jackson/databind/deser/BeanDeserializer;->deserialize(Lcom/fasterxml/jackson/core/JsonParser;Lcom/fasterxml/jackson/databind/DeserializationContext;Ljava/lang/Object;)Ljava/lang/Object;
 HSPLcom/fasterxml/jackson/databind/deser/BeanDeserializer;->deserializeFromObject(Lcom/fasterxml/jackson/core/JsonParser;Lcom/fasterxml/jackson/databind/DeserializationContext;)Ljava/lang/Object;
-HSPLcom/fasterxml/jackson/databind/deser/BeanDeserializer;->vanillaDeserialize(Lcom/fasterxml/jackson/core/JsonParser;Lcom/fasterxml/jackson/databind/DeserializationContext;Lcom/fasterxml/jackson/core/JsonToken;)Ljava/lang/Object;
 HSPLcom/fasterxml/jackson/databind/deser/BeanDeserializerBase;-><clinit>()V
 HSPLcom/fasterxml/jackson/databind/deser/BeanDeserializerBase;-><init>(Lcom/fasterxml/jackson/databind/deser/BeanDeserializerBuilder;Lcom/fasterxml/jackson/databind/BeanDescription;Lcom/fasterxml/jackson/databind/deser/impl/BeanPropertyMap;Ljava/util/Map;Ljava/util/Set;ZLjava/util/Set;Z)V
 HSPLcom/fasterxml/jackson/databind/deser/BeanDeserializerBase;->_delegateDeserializer()Lcom/fasterxml/jackson/databind/JsonDeserializer;
@@ -8364,6 +8279,7 @@ HSPLcom/fasterxml/jackson/databind/deser/impl/FailingDeserializer;-><init>(Ljava
 HSPLcom/fasterxml/jackson/databind/deser/impl/FailingDeserializer;-><init>(Ljava/lang/String;)V
 HSPLcom/fasterxml/jackson/databind/deser/impl/FieldProperty;-><init>(Lcom/fasterxml/jackson/databind/deser/impl/FieldProperty;Lcom/fasterxml/jackson/databind/JsonDeserializer;Lcom/fasterxml/jackson/databind/deser/NullValueProvider;)V
 HSPLcom/fasterxml/jackson/databind/deser/impl/FieldProperty;-><init>(Lcom/fasterxml/jackson/databind/introspect/BeanPropertyDefinition;Lcom/fasterxml/jackson/databind/JavaType;Lcom/fasterxml/jackson/databind/jsontype/TypeDeserializer;Lcom/fasterxml/jackson/databind/util/Annotations;Lcom/fasterxml/jackson/databind/introspect/AnnotatedField;)V
+HSPLcom/fasterxml/jackson/databind/deser/impl/FieldProperty;->deserializeAndSet(Lcom/fasterxml/jackson/core/JsonParser;Lcom/fasterxml/jackson/databind/DeserializationContext;Ljava/lang/Object;)V
 HSPLcom/fasterxml/jackson/databind/deser/impl/FieldProperty;->fixAccess(Lcom/fasterxml/jackson/databind/DeserializationConfig;)V
 HSPLcom/fasterxml/jackson/databind/deser/impl/FieldProperty;->getMember()Lcom/fasterxml/jackson/databind/introspect/AnnotatedMember;
 HSPLcom/fasterxml/jackson/databind/deser/impl/FieldProperty;->withValueDeserializer(Lcom/fasterxml/jackson/databind/JsonDeserializer;)Lcom/fasterxml/jackson/databind/deser/SettableBeanProperty;
@@ -9199,14 +9115,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$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
@@ -10884,6 +10798,10 @@ 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
@@ -11636,7 +11554,6 @@ 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;
@@ -11796,6 +11713,7 @@ 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
@@ -12108,6 +12026,7 @@ 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
@@ -12188,7 +12107,9 @@ 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;
@@ -12687,6 +12608,10 @@ 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
@@ -12865,7 +12790,7 @@ 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;->s(Lj$/util/function/Consumer;)Z
+HSPLj$/util/S;->p(Lj$/util/function/Consumer;)Z
 HSPLj$/util/U;-><init>()V
 HSPLj$/util/V;-><init>()V
 HSPLj$/util/W;-><init>()V
@@ -12875,7 +12800,7 @@ 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;->s(Lj$/util/function/Consumer;)Z
+HSPLj$/util/Z;->p(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;
@@ -12884,7 +12809,6 @@ 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;->clear()V
 HSPLj$/util/concurrent/ConcurrentHashMap;->comparableClassFor(Ljava/lang/Object;)Ljava/lang/Class;
@@ -12944,27 +12868,36 @@ 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/C2;->m()V
-HSPLj$/util/stream/C2;->n(J)V
+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;->m()V
-HSPLj$/util/stream/G1;->n(J)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;
@@ -12975,12 +12908,13 @@ 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;->m()V
-HSPLj$/util/stream/N;->n(J)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;->n(J)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/S2;->a(Lj$/util/stream/T2;)V
 HSPLj$/util/stream/T2;-><clinit>()V
@@ -13000,8 +12934,8 @@ HSPLj$/util/stream/U2;->j(Lj$/util/stream/T2;)Lj$/util/stream/S2;
 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;->m()V
-HSPLj$/util/stream/U;->n(J)V
+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
@@ -13032,7 +12966,7 @@ HSPLj$/util/stream/Z0;-><init>()V
 HSPLj$/util/stream/b;-><init>(I)V
 HSPLj$/util/stream/b;->get()Ljava/lang/Object;
 HSPLj$/util/stream/c2;-><init>(Lj$/util/stream/g2;)V
-HSPLj$/util/stream/c2;->m()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
@@ -13044,6 +12978,12 @@ 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/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
@@ -13131,14 +13071,12 @@ HSPLkotlin/UnsafeLazyImpl;-><init>(Lkotlin/jvm/functions/Function0;)V
 HSPLkotlin/UnsafeLazyImpl;->getValue()Ljava/lang/Object;
 HSPLkotlin/collections/AbstractCollection$toString$1;-><init>(Lkotlin/collections/AbstractCollection;)V
 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
 HSPLkotlin/collections/AbstractList$Companion;->checkElementIndex$kotlin_stdlib(II)V
-HSPLkotlin/collections/AbstractList$IteratorImpl;-><init>(Lkotlin/collections/AbstractList;)V
 HSPLkotlin/collections/AbstractList;-><clinit>()V
 HSPLkotlin/collections/AbstractList;-><init>()V
 HSPLkotlin/collections/AbstractList;->iterator()Ljava/util/Iterator;
@@ -13321,7 +13259,6 @@ HSPLkotlin/collections/CollectionsKt___CollectionsKt;->firstOrNull(Ljava/lang/It
 HSPLkotlin/collections/CollectionsKt___CollectionsKt;->firstOrNull(Ljava/util/List;)Ljava/lang/Object;
 HSPLkotlin/collections/CollectionsKt___CollectionsKt;->getOrNull(Ljava/util/List;I)Ljava/lang/Object;
 HSPLkotlin/collections/CollectionsKt___CollectionsKt;->joinTo$default(Ljava/lang/Iterable;Ljava/lang/Appendable;Ljava/lang/CharSequence;Ljava/lang/CharSequence;Ljava/lang/CharSequence;ILjava/lang/CharSequence;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Ljava/lang/Appendable;
-HSPLkotlin/collections/CollectionsKt___CollectionsKt;->joinTo(Ljava/lang/Iterable;Ljava/lang/Appendable;Ljava/lang/CharSequence;Ljava/lang/CharSequence;Ljava/lang/CharSequence;ILjava/lang/CharSequence;Lkotlin/jvm/functions/Function1;)Ljava/lang/Appendable;
 HSPLkotlin/collections/CollectionsKt___CollectionsKt;->joinToString$default(Ljava/lang/Iterable;Ljava/lang/CharSequence;Ljava/lang/CharSequence;Ljava/lang/CharSequence;ILjava/lang/CharSequence;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Ljava/lang/String;
 HSPLkotlin/collections/CollectionsKt___CollectionsKt;->joinToString(Ljava/lang/Iterable;Ljava/lang/CharSequence;Ljava/lang/CharSequence;Ljava/lang/CharSequence;ILjava/lang/CharSequence;Lkotlin/jvm/functions/Function1;)Ljava/lang/String;
 HSPLkotlin/collections/CollectionsKt___CollectionsKt;->last(Ljava/util/List;)Ljava/lang/Object;
@@ -13329,6 +13266,7 @@ 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;
@@ -13338,6 +13276,7 @@ HSPLkotlin/collections/CollectionsKt___CollectionsKt;->sortedWith(Ljava/lang/Ite
 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
+HSPLkotlin/collections/CollectionsKt___CollectionsKt;->toList(Ljava/lang/Iterable;)Ljava/util/List;
 HSPLkotlin/collections/CollectionsKt___CollectionsKt;->toMutableList(Ljava/lang/Iterable;)Ljava/util/List;
 HSPLkotlin/collections/CollectionsKt___CollectionsKt;->toMutableList(Ljava/util/Collection;)Ljava/util/List;
 HSPLkotlin/collections/CollectionsKt___CollectionsKt;->toMutableSet(Ljava/lang/Iterable;)Ljava/util/Set;
@@ -13398,7 +13337,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;
@@ -13411,7 +13349,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;
@@ -13527,7 +13464,6 @@ HSPLkotlin/jvm/internal/FunctionReference;-><init>(ILjava/lang/Object;Ljava/lang
 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
@@ -13897,8 +13833,6 @@ HSPLkotlin/reflect/jvm/internal/KTypeImpl;->getJavaType()Ljava/lang/reflect/Type
 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$LazySoftVal;->invoke()Ljava/lang/Object;
 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
@@ -15084,6 +15018,7 @@ HSPLkotlin/reflect/jvm/internal/impl/metadata/ProtoBuf$Annotation$Builder;->merg
 HSPLkotlin/reflect/jvm/internal/impl/metadata/ProtoBuf$Annotation$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$Annotation$Builder;->setId(I)Lkotlin/reflect/jvm/internal/impl/metadata/ProtoBuf$Annotation$Builder;
 HSPLkotlin/reflect/jvm/internal/impl/metadata/ProtoBuf$Annotation;-><clinit>()V
+HSPLkotlin/reflect/jvm/internal/impl/metadata/ProtoBuf$Annotation;-><init>(Lkotlin/reflect/jvm/internal/impl/protobuf/CodedInputStream;Lkotlin/reflect/jvm/internal/impl/protobuf/ExtensionRegistryLite;)V
 HSPLkotlin/reflect/jvm/internal/impl/metadata/ProtoBuf$Annotation;-><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$Annotation;-><init>(Lkotlin/reflect/jvm/internal/impl/protobuf/GeneratedMessageLite$Builder;)V
 HSPLkotlin/reflect/jvm/internal/impl/metadata/ProtoBuf$Annotation;-><init>(Lkotlin/reflect/jvm/internal/impl/protobuf/GeneratedMessageLite$Builder;Lkotlin/reflect/jvm/internal/impl/metadata/ProtoBuf$1;)V
@@ -15276,7 +15211,6 @@ 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;-><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>(Z)V
 HSPLkotlin/reflect/jvm/internal/impl/metadata/ProtoBuf$Property;->getContextReceiverTypeCount()I
@@ -15367,6 +15301,7 @@ HSPLkotlin/reflect/jvm/internal/impl/metadata/ProtoBuf$Type$Argument;->initField
 HSPLkotlin/reflect/jvm/internal/impl/metadata/ProtoBuf$Type$Argument;->isInitialized()Z
 HSPLkotlin/reflect/jvm/internal/impl/metadata/ProtoBuf$Type$Argument;->writeTo(Lkotlin/reflect/jvm/internal/impl/protobuf/CodedOutputStream;)V
 HSPLkotlin/reflect/jvm/internal/impl/metadata/ProtoBuf$Type;-><clinit>()V
+HSPLkotlin/reflect/jvm/internal/impl/metadata/ProtoBuf$Type;-><init>(Lkotlin/reflect/jvm/internal/impl/protobuf/CodedInputStream;Lkotlin/reflect/jvm/internal/impl/protobuf/ExtensionRegistryLite;)V
 HSPLkotlin/reflect/jvm/internal/impl/metadata/ProtoBuf$Type;-><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$Type;-><init>(Z)V
 HSPLkotlin/reflect/jvm/internal/impl/metadata/ProtoBuf$Type;->getArgument(I)Lkotlin/reflect/jvm/internal/impl/metadata/ProtoBuf$Type$Argument;
@@ -15379,7 +15314,6 @@ HSPLkotlin/reflect/jvm/internal/impl/metadata/ProtoBuf$Type;->getDefaultInstance
 HSPLkotlin/reflect/jvm/internal/impl/metadata/ProtoBuf$Type;->getFlags()I
 HSPLkotlin/reflect/jvm/internal/impl/metadata/ProtoBuf$Type;->getNullable()Z
 HSPLkotlin/reflect/jvm/internal/impl/metadata/ProtoBuf$Type;->getOuterType()Lkotlin/reflect/jvm/internal/impl/metadata/ProtoBuf$Type;
-HSPLkotlin/reflect/jvm/internal/impl/metadata/ProtoBuf$Type;->getSerializedSize()I
 HSPLkotlin/reflect/jvm/internal/impl/metadata/ProtoBuf$Type;->hasAbbreviatedType()Z
 HSPLkotlin/reflect/jvm/internal/impl/metadata/ProtoBuf$Type;->hasAbbreviatedTypeId()Z
 HSPLkotlin/reflect/jvm/internal/impl/metadata/ProtoBuf$Type;->hasClassName()Z
@@ -15688,7 +15622,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
@@ -15866,6 +15799,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
@@ -15916,8 +15850,8 @@ HSPLkotlin/reflect/jvm/internal/impl/protobuf/FieldSet;->getField(Lkotlin/reflec
 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(Ljava/util/Map$Entry;)Z
 HSPLkotlin/reflect/jvm/internal/impl/protobuf/FieldSet;->iterator()Ljava/util/Iterator;
+HSPLkotlin/reflect/jvm/internal/impl/protobuf/FieldSet;->makeImmutable()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
@@ -15938,7 +15872,6 @@ HSPLkotlin/reflect/jvm/internal/impl/protobuf/GeneratedMessageLite$ExtendableMes
 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
@@ -16007,7 +15940,6 @@ HSPLkotlin/reflect/jvm/internal/impl/protobuf/SmallSortedMap;->binarySearchInArr
 HSPLkotlin/reflect/jvm/internal/impl/protobuf/SmallSortedMap;->checkMutable()V
 HSPLkotlin/reflect/jvm/internal/impl/protobuf/SmallSortedMap;->ensureEntryArrayMutable()V
 HSPLkotlin/reflect/jvm/internal/impl/protobuf/SmallSortedMap;->entrySet()Ljava/util/Set;
-HSPLkotlin/reflect/jvm/internal/impl/protobuf/SmallSortedMap;->get(Ljava/lang/Object;)Ljava/lang/Object;
 HSPLkotlin/reflect/jvm/internal/impl/protobuf/SmallSortedMap;->getArrayEntryAt(I)Ljava/util/Map$Entry;
 HSPLkotlin/reflect/jvm/internal/impl/protobuf/SmallSortedMap;->getNumArrayEntries()I
 HSPLkotlin/reflect/jvm/internal/impl/protobuf/SmallSortedMap;->getOverflowEntries()Ljava/lang/Iterable;
@@ -16443,6 +16375,7 @@ HSPLkotlin/reflect/jvm/internal/impl/serialization/deserialization/Deserializati
 HSPLkotlin/reflect/jvm/internal/impl/serialization/deserialization/DeserializationConfiguration$Default;->getSkipMetadataVersionCheck()Z
 HSPLkotlin/reflect/jvm/internal/impl/serialization/deserialization/DeserializationConfiguration$Default;->getSkipPrereleaseCheck()Z
 HSPLkotlin/reflect/jvm/internal/impl/serialization/deserialization/DeserializationConfiguration$Default;->getTypeAliasesAllowed()Z
+HSPLkotlin/reflect/jvm/internal/impl/serialization/deserialization/DeserializationContext;-><init>(Lkotlin/reflect/jvm/internal/impl/serialization/deserialization/DeserializationComponents;Lkotlin/reflect/jvm/internal/impl/metadata/deserialization/NameResolver;Lkotlin/reflect/jvm/internal/impl/descriptors/DeclarationDescriptor;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/TypeDeserializer;Ljava/util/List;)V
 HSPLkotlin/reflect/jvm/internal/impl/serialization/deserialization/DeserializationContext;->childContext$default(Lkotlin/reflect/jvm/internal/impl/serialization/deserialization/DeserializationContext;Lkotlin/reflect/jvm/internal/impl/descriptors/DeclarationDescriptor;Ljava/util/List;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;ILjava/lang/Object;)Lkotlin/reflect/jvm/internal/impl/serialization/deserialization/DeserializationContext;
 HSPLkotlin/reflect/jvm/internal/impl/serialization/deserialization/DeserializationContext;->childContext(Lkotlin/reflect/jvm/internal/impl/descriptors/DeclarationDescriptor;Ljava/util/List;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/DeserializationContext;
 HSPLkotlin/reflect/jvm/internal/impl/serialization/deserialization/DeserializationContext;->getComponents()Lkotlin/reflect/jvm/internal/impl/serialization/deserialization/DeserializationComponents;
@@ -16496,9 +16429,10 @@ 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;
-HSPLkotlin/reflect/jvm/internal/impl/serialization/deserialization/NameResolverUtilKt;->getClassId(Lkotlin/reflect/jvm/internal/impl/metadata/deserialization/NameResolver;I)Lkotlin/reflect/jvm/internal/impl/name/ClassId;
 HSPLkotlin/reflect/jvm/internal/impl/serialization/deserialization/NameResolverUtilKt;->getName(Lkotlin/reflect/jvm/internal/impl/metadata/deserialization/NameResolver;I)Lkotlin/reflect/jvm/internal/impl/name/Name;
 HSPLkotlin/reflect/jvm/internal/impl/serialization/deserialization/ProtoBasedClassDataFinder;-><init>(Lkotlin/reflect/jvm/internal/impl/metadata/ProtoBuf$PackageFragment;Lkotlin/reflect/jvm/internal/impl/metadata/deserialization/NameResolver;Lkotlin/reflect/jvm/internal/impl/metadata/deserialization/BinaryVersion;Lkotlin/jvm/functions/Function1;)V
 HSPLkotlin/reflect/jvm/internal/impl/serialization/deserialization/ProtoBasedClassDataFinder;->findClassData(Lkotlin/reflect/jvm/internal/impl/name/ClassId;)Lkotlin/reflect/jvm/internal/impl/serialization/deserialization/ClassData;
@@ -17241,7 +17175,6 @@ HSPLkotlin/text/StringsKt__StringNumberConversionsKt;->toLongOrNull(Ljava/lang/S
 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;
 HSPLkotlin/text/StringsKt__StringsJVMKt;->replace$default(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ZILjava/lang/Object;)Ljava/lang/String;
@@ -17260,7 +17193,6 @@ HSPLkotlin/text/StringsKt__StringsKt;->contains$default(Ljava/lang/CharSequence;
 HSPLkotlin/text/StringsKt__StringsKt;->contains$default(Ljava/lang/CharSequence;Ljava/lang/CharSequence;ZILjava/lang/Object;)Z
 HSPLkotlin/text/StringsKt__StringsKt;->contains(Ljava/lang/CharSequence;CZ)Z
 HSPLkotlin/text/StringsKt__StringsKt;->contains(Ljava/lang/CharSequence;Ljava/lang/CharSequence;Z)Z
-HSPLkotlin/text/StringsKt__StringsKt;->getIndices(Ljava/lang/CharSequence;)Lkotlin/ranges/IntRange;
 HSPLkotlin/text/StringsKt__StringsKt;->getLastIndex(Ljava/lang/CharSequence;)I
 HSPLkotlin/text/StringsKt__StringsKt;->indexOf$default(Ljava/lang/CharSequence;CIZILjava/lang/Object;)I
 HSPLkotlin/text/StringsKt__StringsKt;->indexOf$default(Ljava/lang/CharSequence;Ljava/lang/String;IZILjava/lang/Object;)I
@@ -17417,8 +17349,6 @@ HSPLnet/zetetic/database/sqlcipher/CloseGuard;->get()Lnet/zetetic/database/sqlci
 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
@@ -17444,10 +17374,6 @@ HSPLnet/zetetic/database/sqlcipher/SQLiteConnection;->attachCancellationSignal(L
 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
@@ -17492,17 +17418,12 @@ HSPLnet/zetetic/database/sqlcipher/SQLiteConnectionPool;->recycleConnectionWaite
 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
 HSPLnet/zetetic/database/sqlcipher/SQLiteCursor$$ExternalSyntheticApiModelOutline0;->m(Ljava/lang/String;J)Landroid/database/CursorWindow;
 HSPLnet/zetetic/database/sqlcipher/SQLiteCursor$$ExternalSyntheticApiModelOutline1;->m()V
 HSPLnet/zetetic/database/sqlcipher/SQLiteCursor;-><clinit>()V
-HSPLnet/zetetic/database/sqlcipher/SQLiteCursor;-><init>(Lnet/zetetic/database/sqlcipher/SQLiteCursorDriver;Ljava/lang/String;Lnet/zetetic/database/sqlcipher/SQLiteQuery;)V
-HSPLnet/zetetic/database/sqlcipher/SQLiteCursor;->awc_clearOrCreateWindow(Ljava/lang/String;)V
 HSPLnet/zetetic/database/sqlcipher/SQLiteCursor;->close()V
-HSPLnet/zetetic/database/sqlcipher/SQLiteCursor;->fillWindow(I)V
 HSPLnet/zetetic/database/sqlcipher/SQLiteCursor;->finalize()V
 HSPLnet/zetetic/database/sqlcipher/SQLiteCursor;->getColumnIndex(Ljava/lang/String;)I
 HSPLnet/zetetic/database/sqlcipher/SQLiteCursor;->getColumnNames()[Ljava/lang/String;
@@ -17529,12 +17450,10 @@ 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;->insertWithOnConflict(Ljava/lang/String;Ljava/lang/String;Landroid/content/ContentValues;I)J
+HSPLnet/zetetic/database/sqlcipher/SQLiteDatabase;->insert(Ljava/lang/String;Ljava/lang/String;Landroid/content/ContentValues;)J
 HSPLnet/zetetic/database/sqlcipher/SQLiteDatabase;->isMainThread()Z
 HSPLnet/zetetic/database/sqlcipher/SQLiteDatabase;->isOpen()Z
 HSPLnet/zetetic/database/sqlcipher/SQLiteDatabase;->isReadOnly()Z
@@ -17570,7 +17489,6 @@ HSPLnet/zetetic/database/sqlcipher/SQLiteDebug;-><clinit>()V
 HSPLnet/zetetic/database/sqlcipher/SQLiteDirectCursorDriver;-><init>(Lnet/zetetic/database/sqlcipher/SQLiteDatabase;Ljava/lang/String;Ljava/lang/String;Landroid/os/CancellationSignal;)V
 HSPLnet/zetetic/database/sqlcipher/SQLiteDirectCursorDriver;->cursorClosed()V
 HSPLnet/zetetic/database/sqlcipher/SQLiteDirectCursorDriver;->query(Lnet/zetetic/database/sqlcipher/SQLiteDatabase$CursorFactory;[Ljava/lang/Object;)Landroid/database/Cursor;
-HSPLnet/zetetic/database/sqlcipher/SQLiteDirectCursorDriver;->query(Lnet/zetetic/database/sqlcipher/SQLiteDatabase$CursorFactory;[Ljava/lang/String;)Landroid/database/Cursor;
 HSPLnet/zetetic/database/sqlcipher/SQLiteGlobal;-><clinit>()V
 HSPLnet/zetetic/database/sqlcipher/SQLiteGlobal;->getJournalSizeLimit()I
 HSPLnet/zetetic/database/sqlcipher/SQLiteGlobal;->getWALAutoCheckpoint()I
@@ -17584,7 +17502,6 @@ HSPLnet/zetetic/database/sqlcipher/SQLiteOpenHelper;->getReadableDatabase()Lnet/
 HSPLnet/zetetic/database/sqlcipher/SQLiteOpenHelper;->getWritableDatabase()Lnet/zetetic/database/sqlcipher/SQLiteDatabase;
 HSPLnet/zetetic/database/sqlcipher/SQLiteOpenHelper;->onConfigure(Lnet/zetetic/database/sqlcipher/SQLiteDatabase;)V
 HSPLnet/zetetic/database/sqlcipher/SQLiteProgram;-><clinit>()V
-HSPLnet/zetetic/database/sqlcipher/SQLiteProgram;-><init>(Lnet/zetetic/database/sqlcipher/SQLiteDatabase;Ljava/lang/String;[Ljava/lang/Object;Landroid/os/CancellationSignal;)V
 HSPLnet/zetetic/database/sqlcipher/SQLiteProgram;->bind(ILjava/lang/Object;)V
 HSPLnet/zetetic/database/sqlcipher/SQLiteProgram;->bindAllArgs([Ljava/lang/Object;)V
 HSPLnet/zetetic/database/sqlcipher/SQLiteProgram;->bindAllArgsAsStrings([Ljava/lang/String;)V
@@ -17595,7 +17512,7 @@ HSPLnet/zetetic/database/sqlcipher/SQLiteProgram;->getColumnNames()[Ljava/lang/S
 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;->onAllReferencesReleased()V
+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/SQLiteQueryBuilder;-><clinit>()V
 HSPLnet/zetetic/database/sqlcipher/SQLiteQueryBuilder;->appendClause(Ljava/lang/StringBuilder;Ljava/lang/String;Ljava/lang/String;)V
@@ -17605,7 +17522,6 @@ HSPLnet/zetetic/database/sqlcipher/SQLiteSession$Transaction;-><init>()V
 HSPLnet/zetetic/database/sqlcipher/SQLiteSession$Transaction;-><init>(Lnet/zetetic/database/sqlcipher/SQLiteSession$1;)V
 HSPLnet/zetetic/database/sqlcipher/SQLiteSession;-><clinit>()V
 HSPLnet/zetetic/database/sqlcipher/SQLiteSession;-><init>(Lnet/zetetic/database/sqlcipher/SQLiteConnectionPool;)V
-HSPLnet/zetetic/database/sqlcipher/SQLiteSession;->acquireConnection(Ljava/lang/String;ILandroid/os/CancellationSignal;)V
 HSPLnet/zetetic/database/sqlcipher/SQLiteSession;->beginTransaction(ILnet/zetetic/database/sqlcipher/SQLiteTransactionListener;ILandroid/os/CancellationSignal;)V
 HSPLnet/zetetic/database/sqlcipher/SQLiteSession;->beginTransactionUnchecked(ILnet/zetetic/database/sqlcipher/SQLiteTransactionListener;ILandroid/os/CancellationSignal;)V
 HSPLnet/zetetic/database/sqlcipher/SQLiteSession;->endTransaction(Landroid/os/CancellationSignal;)V
@@ -17617,7 +17533,6 @@ HSPLnet/zetetic/database/sqlcipher/SQLiteSession;->executeForLong(Ljava/lang/Str
 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;->prepare(Ljava/lang/String;ILandroid/os/CancellationSignal;Lnet/zetetic/database/sqlcipher/SQLiteStatementInfo;)V
 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
@@ -17871,8 +17786,6 @@ HSPLokhttp3/RealCall$AsyncCall;-><clinit>()V
 HSPLokhttp3/RealCall$AsyncCall;-><init>(Lokhttp3/RealCall;Lokhttp3/Callback;)V
 HSPLokhttp3/RealCall$AsyncCall;->execute()V
 HSPLokhttp3/RealCall$AsyncCall;->executeOn(Ljava/util/concurrent/ExecutorService;)V
-HSPLokhttp3/RealCall$AsyncCall;->get()Lokhttp3/RealCall;
-HSPLokhttp3/RealCall$AsyncCall;->host()Ljava/lang/String;
 HSPLokhttp3/RealCall;-><init>(Lokhttp3/OkHttpClient;Lokhttp3/Request;Z)V
 HSPLokhttp3/RealCall;->captureCallStackTrace()V
 HSPLokhttp3/RealCall;->enqueue(Lokhttp3/Callback;)V
@@ -18199,10 +18112,10 @@ 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
+HSPLokio/Buffer;->indexOfElement(Lokio/ByteString;J)J
 HSPLokio/Buffer;->read(Lokio/Buffer;J)J
 HSPLokio/Buffer;->read([BII)I
 HSPLokio/Buffer;->readByte()B
@@ -18285,7 +18198,6 @@ 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;
@@ -18339,6 +18251,7 @@ 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
 HSPLokio/RealBufferedSource;->readIntLe()I
@@ -18356,7 +18269,6 @@ HSPLokio/Segment$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarke
 HSPLokio/Segment;-><clinit>()V
 HSPLokio/Segment;-><init>()V
 HSPLokio/Segment;-><init>([BIIZZ)V
-HSPLokio/Segment;->compact()V
 HSPLokio/Segment;->pop()Lokio/Segment;
 HSPLokio/Segment;->push(Lokio/Segment;)Lokio/Segment;
 HSPLokio/Segment;->sharedCopy()Lokio/Segment;
@@ -18542,7 +18454,6 @@ HSPLorg/conscrypt/ConscryptEngineSocket$SSLInputStream;-><init>(Lorg/conscrypt/C
 HSPLorg/conscrypt/ConscryptEngineSocket$SSLInputStream;->access$100(Lorg/conscrypt/ConscryptEngineSocket$SSLInputStream;[BII)I
 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
@@ -18650,7 +18561,6 @@ HSPLorg/conscrypt/NativeSsl$BioWrapper;-><init>(Lorg/conscrypt/NativeSsl;)V
 HSPLorg/conscrypt/NativeSsl$BioWrapper;-><init>(Lorg/conscrypt/NativeSsl;Lorg/conscrypt/NativeSsl$1;)V
 HSPLorg/conscrypt/NativeSsl$BioWrapper;->getPendingWrittenBytes()I
 HSPLorg/conscrypt/NativeSsl$BioWrapper;->readDirectByteBuffer(JI)I
-HSPLorg/conscrypt/NativeSsl$BioWrapper;->writeDirectByteBuffer(JI)I
 HSPLorg/conscrypt/NativeSsl;-><init>(JLorg/conscrypt/SSLParametersImpl;Lorg/conscrypt/NativeCrypto$SSLHandshakeCallbacks;Lorg/conscrypt/SSLParametersImpl$AliasChooser;Lorg/conscrypt/SSLParametersImpl$PSKCallbacks;)V
 HSPLorg/conscrypt/NativeSsl;->access$100(Lorg/conscrypt/NativeSsl;)J
 HSPLorg/conscrypt/NativeSsl;->access$200(Lorg/conscrypt/NativeSsl;)Ljava/util/concurrent/locks/ReadWriteLock;
@@ -18816,6 +18726,7 @@ HSPLorg/conscrypt/OpenSSLX509CertPath;->getCertificates()Ljava/util/List;
 HSPLorg/conscrypt/OpenSSLX509Certificate;-><init>(J)V
 HSPLorg/conscrypt/OpenSSLX509Certificate;->alternativeNameArrayToList([[Ljava/lang/Object;)Ljava/util/Collection;
 HSPLorg/conscrypt/OpenSSLX509Certificate;->checkValidity(Ljava/util/Date;)V
+HSPLorg/conscrypt/OpenSSLX509Certificate;->equals(Ljava/lang/Object;)Z
 HSPLorg/conscrypt/OpenSSLX509Certificate;->finalize()V
 HSPLorg/conscrypt/OpenSSLX509Certificate;->fromX509DerInputStream(Ljava/io/InputStream;)Lorg/conscrypt/OpenSSLX509Certificate;
 HSPLorg/conscrypt/OpenSSLX509Certificate;->getCriticalExtensionOIDs()Ljava/util/Set;
@@ -19061,6 +18972,7 @@ HSPLorg/signal/core/util/CursorExtensionsKt;->requireBoolean(Landroid/database/C
 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
 HSPLorg/signal/core/util/CursorUtil;->getBlob(Landroid/database/Cursor;Ljava/lang/String;)Lj$/util/Optional;
@@ -19280,6 +19192,7 @@ 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
@@ -19292,9 +19205,11 @@ 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;-><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;
@@ -19385,6 +19300,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;
@@ -19405,10 +19321,9 @@ HSPLorg/signal/core/util/tracing/DebugAnnotation$Companion$ADAPTER$1;-><init>(Lc
 HSPLorg/signal/core/util/tracing/DebugAnnotation$Companion;-><init>()V
 HSPLorg/signal/core/util/tracing/DebugAnnotation$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 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;->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;
 HSPLorg/signal/core/util/tracing/TracePacket$Builder;->track_event(Lorg/signal/core/util/tracing/TrackEvent;)Lorg/signal/core/util/tracing/TracePacket$Builder;
 HSPLorg/signal/core/util/tracing/TracePacket$Builder;->trusted_packet_sequence_id(Ljava/lang/Integer;)Lorg/signal/core/util/tracing/TracePacket$Builder;
@@ -19422,7 +19337,6 @@ 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;->debugAnnotation(Ljava/lang/String;Ljava/lang/String;)Lorg/signal/core/util/tracing/DebugAnnotation;
 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;->forSynchronization(J)Lorg/signal/core/util/tracing/TracePacket;
@@ -19431,7 +19345,6 @@ HSPLorg/signal/core/util/tracing/Tracer;->forTrackId(J)Lorg/signal/core/util/tra
 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
@@ -19445,7 +19358,6 @@ HSPLorg/signal/core/util/tracing/TrackDescriptor$Companion;-><init>(Lkotlin/jvm/
 HSPLorg/signal/core/util/tracing/TrackDescriptor;-><clinit>()V
 HSPLorg/signal/core/util/tracing/TrackDescriptor;-><init>(Ljava/lang/Long;Ljava/lang/Long;Ljava/lang/String;Lorg/signal/core/util/tracing/ThreadDescriptor;Lorg/signal/core/util/tracing/CounterDescriptor;Lokio/ByteString;)V
 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;
@@ -19472,6 +19384,8 @@ HSPLorg/signal/libsignal/internal/FilterExceptions;->filterExceptions(Lorg/signa
 HSPLorg/signal/libsignal/internal/FilterExceptions;->filterExceptions(Lorg/signal/libsignal/internal/FilterExceptions$ThrowingNativeOperation;)Ljava/lang/Object;
 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
@@ -19593,14 +19507,14 @@ 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$$ExternalSyntheticLambda1;-><init>(Lorg/signal/libsignal/internal/NativeHandleGuard;)V
-HSPLorg/signal/libsignal/protocol/state/SignedPreKeyRecord$$ExternalSyntheticLambda1;->run()Ljava/lang/Object;
 HSPLorg/signal/libsignal/protocol/state/SignedPreKeyRecord$$ExternalSyntheticLambda2;-><init>(Lorg/signal/libsignal/internal/NativeHandleGuard;)V
-HSPLorg/signal/libsignal/protocol/state/SignedPreKeyRecord$$ExternalSyntheticLambda2;->run()I
+HSPLorg/signal/libsignal/protocol/state/SignedPreKeyRecord$$ExternalSyntheticLambda2;->run()Ljava/lang/Object;
 HSPLorg/signal/libsignal/protocol/state/SignedPreKeyRecord$$ExternalSyntheticLambda3;-><init>(Lorg/signal/libsignal/internal/NativeHandleGuard;)V
-HSPLorg/signal/libsignal/protocol/state/SignedPreKeyRecord$$ExternalSyntheticLambda3;->run()J
+HSPLorg/signal/libsignal/protocol/state/SignedPreKeyRecord$$ExternalSyntheticLambda3;->run()I
 HSPLorg/signal/libsignal/protocol/state/SignedPreKeyRecord$$ExternalSyntheticLambda4;-><init>(Lorg/signal/libsignal/internal/NativeHandleGuard;)V
-HSPLorg/signal/libsignal/protocol/state/SignedPreKeyRecord$$ExternalSyntheticLambda4;->run()Ljava/lang/Object;
+HSPLorg/signal/libsignal/protocol/state/SignedPreKeyRecord$$ExternalSyntheticLambda4;->run()J
+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;
@@ -19623,10 +19537,11 @@ HSPLorg/signal/libsignal/protocol/util/Pair;-><init>(Ljava/lang/Object;Ljava/lan
 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()V
-HSPLorg/signal/libsignal/zkgroup/ServerPublicParams;->$r8$lambda$R936UR66SIUnVcbjr9dIro_sBME([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;-><init>([B)V
-HSPLorg/signal/libsignal/zkgroup/ServerPublicParams;->lambda$new$0([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
@@ -19650,14 +19565,19 @@ 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;-><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
@@ -19668,21 +19588,27 @@ 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;-><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;->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;
@@ -19711,6 +19637,7 @@ 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
@@ -20042,7 +19969,7 @@ HSPLorg/thoughtcrime/securesms/animation/AnimationCompleteListener;->onAnimation
 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;ILjava/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;-><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;->isSticker()Z
@@ -20053,22 +19980,36 @@ HSPLorg/thoughtcrime/securesms/attachments/AttachmentId;-><clinit>()V
 HSPLorg/thoughtcrime/securesms/attachments/AttachmentId;-><init>(J)V
 HSPLorg/thoughtcrime/securesms/attachments/AttachmentId;->hashCode()I
 HSPLorg/thoughtcrime/securesms/attachments/AttachmentId;->toString()Ljava/lang/String;
+HSPLorg/thoughtcrime/securesms/attachments/Cdn$Serializer;-><init>()V
+HSPLorg/thoughtcrime/securesms/attachments/Cdn$Serializer;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+HSPLorg/thoughtcrime/securesms/attachments/Cdn$Serializer;->deserialize(I)Lorg/thoughtcrime/securesms/attachments/Cdn;
+HSPLorg/thoughtcrime/securesms/attachments/Cdn$Serializer;->deserialize(Ljava/lang/Object;)Ljava/lang/Object;
+HSPLorg/thoughtcrime/securesms/attachments/Cdn$Serializer;->fromCdnNumber(I)Lorg/thoughtcrime/securesms/attachments/Cdn;
+HSPLorg/thoughtcrime/securesms/attachments/Cdn$Serializer;->serialize(Lorg/thoughtcrime/securesms/attachments/Cdn;)Ljava/lang/Integer;
+HSPLorg/thoughtcrime/securesms/attachments/Cdn$WhenMappings;-><clinit>()V
+HSPLorg/thoughtcrime/securesms/attachments/Cdn;->$values()[Lorg/thoughtcrime/securesms/attachments/Cdn;
+HSPLorg/thoughtcrime/securesms/attachments/Cdn;-><clinit>()V
+HSPLorg/thoughtcrime/securesms/attachments/Cdn;-><init>(Ljava/lang/String;II)V
+HSPLorg/thoughtcrime/securesms/attachments/Cdn;->access$getValue$p(Lorg/thoughtcrime/securesms/attachments/Cdn;)I
+HSPLorg/thoughtcrime/securesms/attachments/Cdn;->getCdnNumber()I
+HSPLorg/thoughtcrime/securesms/attachments/Cdn;->serialize()I
+HSPLorg/thoughtcrime/securesms/attachments/Cdn;->values()[Lorg/thoughtcrime/securesms/attachments/Cdn;
 HSPLorg/thoughtcrime/securesms/attachments/DatabaseAttachment$DisplayOrderComparator;-><clinit>()V
 HSPLorg/thoughtcrime/securesms/attachments/DatabaseAttachment$DisplayOrderComparator;-><init>()V
 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;ILjava/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;)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;->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;ILjava/lang/Object;)Lj$/util/Optional;
-HSPLorg/thoughtcrime/securesms/attachments/PointerAttachment$Companion;->forPointer(Lj$/util/Optional;Lorg/thoughtcrime/securesms/stickers/StickerLocator;Ljava/lang/String;)Lj$/util/Optional;
+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;ILjava/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;-><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;
 HSPLorg/thoughtcrime/securesms/avatar/Avatar$Companion;-><init>()V
 HSPLorg/thoughtcrime/securesms/avatar/Avatar$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
@@ -20139,6 +20080,15 @@ HSPLorg/thoughtcrime/securesms/avatar/view/AvatarView;-><init>(Landroid/content/
 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;
+HSPLorg/thoughtcrime/securesms/backup/RestoreState$Serializer;-><clinit>()V
+HSPLorg/thoughtcrime/securesms/backup/RestoreState$Serializer;-><init>()V
+HSPLorg/thoughtcrime/securesms/backup/RestoreState;->$values()[Lorg/thoughtcrime/securesms/backup/RestoreState;
+HSPLorg/thoughtcrime/securesms/backup/RestoreState;-><clinit>()V
+HSPLorg/thoughtcrime/securesms/backup/RestoreState;-><init>(Ljava/lang/String;IIZ)V
+HSPLorg/thoughtcrime/securesms/backup/RestoreState;->access$getSerializer$cp()Lorg/signal/core/util/LongSerializer;
 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
@@ -20169,6 +20119,26 @@ 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
@@ -20221,16 +20191,19 @@ HSPLorg/thoughtcrime/securesms/components/AvatarImageView;->setAvatarClickHandle
 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
+HSPLorg/thoughtcrime/securesms/components/ComposeText;->canFilter(Landroid/text/Editable;)Z
 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;->enoughToFilter(Landroid/text/Editable;Z)Z
+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;->findQueryStart(Ljava/lang/CharSequence;IZ)Lorg/thoughtcrime/securesms/components/ComposeText$QueryStart;
 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;
@@ -20269,6 +20242,51 @@ HSPLorg/thoughtcrime/securesms/components/ConversationItemFooter;->setOnlyShowSe
 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
@@ -20297,6 +20315,7 @@ HSPLorg/thoughtcrime/securesms/components/FromTextView;->setText(Lorg/thoughtcri
 HSPLorg/thoughtcrime/securesms/components/FromTextView;->setText(Lorg/thoughtcrime/securesms/recipients/Recipient;Ljava/lang/CharSequence;)V
 HSPLorg/thoughtcrime/securesms/components/FromTextView;->setText(Lorg/thoughtcrime/securesms/recipients/Recipient;Ljava/lang/CharSequence;Ljava/lang/CharSequence;)V
 HSPLorg/thoughtcrime/securesms/components/FromTextView;->setText(Lorg/thoughtcrime/securesms/recipients/Recipient;Ljava/lang/CharSequence;Ljava/lang/CharSequence;Z)V
+HSPLorg/thoughtcrime/securesms/components/FromTextView;->setText(Lorg/thoughtcrime/securesms/recipients/Recipient;Ljava/lang/CharSequence;Ljava/lang/CharSequence;ZZ)V
 HSPLorg/thoughtcrime/securesms/components/HidingLinearLayout;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
 HSPLorg/thoughtcrime/securesms/components/InputAwareConstraintLayout;-><clinit>()V
 HSPLorg/thoughtcrime/securesms/components/InputAwareConstraintLayout;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
@@ -20313,6 +20332,7 @@ HSPLorg/thoughtcrime/securesms/components/InputPanel$RecordTime;-><init>(Landroi
 HSPLorg/thoughtcrime/securesms/components/InputPanel$SlideToCancel;-><init>(Landroid/view/View;)V
 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
@@ -20402,9 +20422,17 @@ HSPLorg/thoughtcrime/securesms/components/QuoteView;->setMessageType(Lorg/though
 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
@@ -20412,6 +20440,7 @@ 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;
@@ -20423,6 +20452,35 @@ HSPLorg/thoughtcrime/securesms/components/ScrollToPositionDelegate;-><init>(Land
 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
@@ -20481,6 +20539,9 @@ HSPLorg/thoughtcrime/securesms/components/emoji/EmojiProvider;->getEmojiDrawable
 HSPLorg/thoughtcrime/securesms/components/emoji/EmojiSpan;-><init>(Landroid/graphics/drawable/Drawable;Landroid/widget/TextView;)V
 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
@@ -20509,6 +20570,7 @@ 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
@@ -20578,6 +20640,9 @@ 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
@@ -20692,6 +20757,82 @@ 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
@@ -20731,6 +20872,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$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
@@ -20964,6 +21106,20 @@ 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;
@@ -20998,10 +21154,14 @@ HSPLorg/thoughtcrime/securesms/conversation/ConversationIntents;->getIntentData(
 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$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
 HSPLorg/thoughtcrime/securesms/conversation/ConversationItem$ClickListener;-><init>(Lorg/thoughtcrime/securesms/conversation/ConversationItem;Landroid/view/View$OnClickListener;)V
+HSPLorg/thoughtcrime/securesms/conversation/ConversationItem$DoubleTapEditTouchListener$1;-><init>(Lorg/thoughtcrime/securesms/conversation/ConversationItem$DoubleTapEditTouchListener;)V
+HSPLorg/thoughtcrime/securesms/conversation/ConversationItem$DoubleTapEditTouchListener;-><init>(Lorg/thoughtcrime/securesms/conversation/ConversationItem;)V
+HSPLorg/thoughtcrime/securesms/conversation/ConversationItem$DoubleTapEditTouchListener;-><init>(Lorg/thoughtcrime/securesms/conversation/ConversationItem;Lorg/thoughtcrime/securesms/conversation/ConversationItem$DoubleTapEditTouchListener-IA;)V
 HSPLorg/thoughtcrime/securesms/conversation/ConversationItem$GiftMessageViewCallback;-><init>(Lorg/thoughtcrime/securesms/conversation/ConversationItem;)V
 HSPLorg/thoughtcrime/securesms/conversation/ConversationItem$GiftMessageViewCallback;-><init>(Lorg/thoughtcrime/securesms/conversation/ConversationItem;Lorg/thoughtcrime/securesms/conversation/ConversationItem$GiftMessageViewCallback-IA;)V
 HSPLorg/thoughtcrime/securesms/conversation/ConversationItem$LinkPreviewClickListener;-><init>(Lorg/thoughtcrime/securesms/conversation/ConversationItem;)V
@@ -21020,12 +21180,15 @@ 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
 HSPLorg/thoughtcrime/securesms/conversation/ConversationItem$UrlClickListener;-><init>(Lorg/thoughtcrime/securesms/conversation/ConversationItem;Lorg/thoughtcrime/securesms/conversation/ConversationItem$UrlClickListener-IA;)V
 HSPLorg/thoughtcrime/securesms/conversation/ConversationItem$ViewOnceMessageClickListener;-><init>(Lorg/thoughtcrime/securesms/conversation/ConversationItem;)V
 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;->-$$Nest$fgetcontext(Lorg/thoughtcrime/securesms/conversation/ConversationItem;)Landroid/content/Context;
 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
@@ -21109,6 +21272,16 @@ HSPLorg/thoughtcrime/securesms/conversation/ConversationItemBodyBubble;->setOutl
 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
@@ -21172,6 +21345,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;
@@ -21216,6 +21392,7 @@ HSPLorg/thoughtcrime/securesms/conversation/VoiceNoteDraftView;-><clinit>()V
 HSPLorg/thoughtcrime/securesms/conversation/VoiceNoteDraftView;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
 HSPLorg/thoughtcrime/securesms/conversation/VoiceNoteDraftView;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;I)V
 HSPLorg/thoughtcrime/securesms/conversation/VoiceNoteDraftView;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;IILkotlin/jvm/internal/DefaultConstructorMarker;)V
+HSPLorg/thoughtcrime/securesms/conversation/VoiceNoteDraftView;->getDraft()Lorg/thoughtcrime/securesms/database/DraftTable$Draft;
 HSPLorg/thoughtcrime/securesms/conversation/clicklisteners/AttachmentCancelClickListener$Companion;-><init>()V
 HSPLorg/thoughtcrime/securesms/conversation/clicklisteners/AttachmentCancelClickListener$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 HSPLorg/thoughtcrime/securesms/conversation/clicklisteners/AttachmentCancelClickListener;-><clinit>()V
@@ -21257,6 +21434,8 @@ 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
@@ -21300,6 +21479,7 @@ HSPLorg/thoughtcrime/securesms/conversation/colors/RecyclerViewColorizer;->acces
 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
@@ -21321,6 +21501,11 @@ HSPLorg/thoughtcrime/securesms/conversation/mutiselect/MultiselectCollection$Sin
 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
@@ -21436,7 +21621,25 @@ HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationAdapterV2$$ExternalSy
 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;-><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
@@ -21494,6 +21697,11 @@ HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment$Conversation
 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
@@ -21564,6 +21772,7 @@ HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment$observeConve
 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
@@ -21682,6 +21891,11 @@ HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment;->presentSto
 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
@@ -21729,10 +21943,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$$ExternalSyntheticLambda11;-><init>(Lorg/thoughtcrime/securesms/database/model/GroupRecord;Lorg/thoughtcrime/securesms/recipients/Recipient;)V
-HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationRepository$$ExternalSyntheticLambda11;->call()Ljava/lang/Object;
-HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationRepository$$ExternalSyntheticLambda7;-><init>(JLorg/thoughtcrime/securesms/conversation/v2/ConversationRepository;I)V
-HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationRepository$$ExternalSyntheticLambda7;->call()Ljava/lang/Object;
+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$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
@@ -21844,6 +22058,8 @@ 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;
@@ -21865,6 +22081,9 @@ 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;
@@ -21902,6 +22121,7 @@ HSPLorg/thoughtcrime/securesms/conversation/v2/IdentityRecordsState;-><init>(Lor
 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;->equals(Ljava/lang/Object;)Z
 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;
@@ -21927,9 +22147,15 @@ 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;
@@ -22027,21 +22253,17 @@ HSPLorg/thoughtcrime/securesms/conversation/v2/groups/ConversationGroupCallViewM
 HSPLorg/thoughtcrime/securesms/conversation/v2/groups/ConversationGroupCallViewModel;->access$getStore$p(Lorg/thoughtcrime/securesms/conversation/v2/groups/ConversationGroupCallViewModel;)Lorg/thoughtcrime/securesms/util/rx/RxStore;
 HSPLorg/thoughtcrime/securesms/conversation/v2/groups/ConversationGroupCallViewModel;->getHasOngoingGroupCallSnapshot()Z
 HSPLorg/thoughtcrime/securesms/conversation/v2/groups/ConversationGroupCallViewModel;->peekGroupCall()V
-HSPLorg/thoughtcrime/securesms/conversation/v2/groups/ConversationGroupViewModel$1;-><clinit>()V
-HSPLorg/thoughtcrime/securesms/conversation/v2/groups/ConversationGroupViewModel$1;-><init>()V
-HSPLorg/thoughtcrime/securesms/conversation/v2/groups/ConversationGroupViewModel$1;->test(Lj$/util/Optional;)Z
-HSPLorg/thoughtcrime/securesms/conversation/v2/groups/ConversationGroupViewModel$1;->test(Ljava/lang/Object;)Z
-HSPLorg/thoughtcrime/securesms/conversation/v2/groups/ConversationGroupViewModel$2;-><clinit>()V
-HSPLorg/thoughtcrime/securesms/conversation/v2/groups/ConversationGroupViewModel$2;-><init>()V
-HSPLorg/thoughtcrime/securesms/conversation/v2/groups/ConversationGroupViewModel$3;-><clinit>()V
-HSPLorg/thoughtcrime/securesms/conversation/v2/groups/ConversationGroupViewModel$3;-><init>()V
-HSPLorg/thoughtcrime/securesms/conversation/v2/groups/ConversationGroupViewModel$4;-><init>(Lorg/thoughtcrime/securesms/conversation/v2/groups/ConversationGroupViewModel;)V
+HSPLorg/thoughtcrime/securesms/conversation/v2/groups/ConversationGroupViewModel$1;-><init>(Lorg/thoughtcrime/securesms/conversation/v2/groups/ConversationGroupViewModel;)V
 HSPLorg/thoughtcrime/securesms/conversation/v2/groups/ConversationGroupViewModel$Factory;-><clinit>()V
-HSPLorg/thoughtcrime/securesms/conversation/v2/groups/ConversationGroupViewModel$Factory;-><init>(JLorg/thoughtcrime/securesms/conversation/v2/ConversationRecipientRepository;)V
+HSPLorg/thoughtcrime/securesms/conversation/v2/groups/ConversationGroupViewModel$Factory;-><init>(Lorg/thoughtcrime/securesms/conversation/v2/ConversationRecipientRepository;)V
 HSPLorg/thoughtcrime/securesms/conversation/v2/groups/ConversationGroupViewModel$Factory;->create(Ljava/lang/Class;)Landroidx/lifecycle/ViewModel;
 HSPLorg/thoughtcrime/securesms/conversation/v2/groups/ConversationGroupViewModel$Factory;->create(Ljava/lang/Class;Landroidx/lifecycle/viewmodel/CreationExtras;)Landroidx/lifecycle/ViewModel;
-HSPLorg/thoughtcrime/securesms/conversation/v2/groups/ConversationGroupViewModel$duplicates$1;-><clinit>()V
-HSPLorg/thoughtcrime/securesms/conversation/v2/groups/ConversationGroupViewModel$duplicates$1;-><init>()V
+HSPLorg/thoughtcrime/securesms/conversation/v2/groups/ConversationGroupViewModel$_groupRecord$1;-><clinit>()V
+HSPLorg/thoughtcrime/securesms/conversation/v2/groups/ConversationGroupViewModel$_groupRecord$1;-><init>()V
+HSPLorg/thoughtcrime/securesms/conversation/v2/groups/ConversationGroupViewModel$_groupRecord$1;->test(Lj$/util/Optional;)Z
+HSPLorg/thoughtcrime/securesms/conversation/v2/groups/ConversationGroupViewModel$_groupRecord$1;->test(Ljava/lang/Object;)Z
+HSPLorg/thoughtcrime/securesms/conversation/v2/groups/ConversationGroupViewModel$_groupRecord$2;-><clinit>()V
+HSPLorg/thoughtcrime/securesms/conversation/v2/groups/ConversationGroupViewModel$_groupRecord$2;-><init>()V
 HSPLorg/thoughtcrime/securesms/conversation/v2/groups/ConversationGroupViewModel$updateGroupStateIfNeeded$1;-><clinit>()V
 HSPLorg/thoughtcrime/securesms/conversation/v2/groups/ConversationGroupViewModel$updateGroupStateIfNeeded$1;-><init>()V
 HSPLorg/thoughtcrime/securesms/conversation/v2/groups/ConversationGroupViewModel$updateGroupStateIfNeeded$1;->test(Ljava/lang/Object;)Z
@@ -22049,8 +22271,8 @@ HSPLorg/thoughtcrime/securesms/conversation/v2/groups/ConversationGroupViewModel
 HSPLorg/thoughtcrime/securesms/conversation/v2/groups/ConversationGroupViewModel$updateGroupStateIfNeeded$2;-><clinit>()V
 HSPLorg/thoughtcrime/securesms/conversation/v2/groups/ConversationGroupViewModel$updateGroupStateIfNeeded$2;-><init>()V
 HSPLorg/thoughtcrime/securesms/conversation/v2/groups/ConversationGroupViewModel;-><clinit>()V
-HSPLorg/thoughtcrime/securesms/conversation/v2/groups/ConversationGroupViewModel;-><init>(JLorg/thoughtcrime/securesms/groups/v2/GroupManagementRepository;Lorg/thoughtcrime/securesms/conversation/v2/ConversationRecipientRepository;)V
-HSPLorg/thoughtcrime/securesms/conversation/v2/groups/ConversationGroupViewModel;-><init>(JLorg/thoughtcrime/securesms/groups/v2/GroupManagementRepository;Lorg/thoughtcrime/securesms/conversation/v2/ConversationRecipientRepository;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+HSPLorg/thoughtcrime/securesms/conversation/v2/groups/ConversationGroupViewModel;-><init>(Lorg/thoughtcrime/securesms/groups/v2/GroupManagementRepository;Lorg/thoughtcrime/securesms/conversation/v2/ConversationRecipientRepository;)V
+HSPLorg/thoughtcrime/securesms/conversation/v2/groups/ConversationGroupViewModel;-><init>(Lorg/thoughtcrime/securesms/groups/v2/GroupManagementRepository;Lorg/thoughtcrime/securesms/conversation/v2/ConversationRecipientRepository;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 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
@@ -22066,6 +22288,17 @@ HSPLorg/thoughtcrime/securesms/conversation/v2/items/ChatColorsDrawable$ChatColo
 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
@@ -22076,6 +22309,129 @@ HSPLorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemLayout;->
 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>()V
+HSPLorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTextOnlyViewHolder$$ExternalSyntheticLambda8;-><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
@@ -22641,6 +22997,12 @@ HSPLorg/thoughtcrime/securesms/crypto/storage/TextSecurePreKeyStore;->storeSigne
 HSPLorg/thoughtcrime/securesms/crypto/storage/TextSecureSessionStore;-><clinit>()V
 HSPLorg/thoughtcrime/securesms/crypto/storage/TextSecureSessionStore;-><init>(Lorg/whispersystems/signalservice/api/push/ServiceId;)V
 HSPLorg/thoughtcrime/securesms/crypto/storage/TextSecureSessionStore;->archiveAllSessions()V
+HSPLorg/thoughtcrime/securesms/database/AttachmentTable$ArchiveTransferState$Companion;-><init>()V
+HSPLorg/thoughtcrime/securesms/database/AttachmentTable$ArchiveTransferState$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+HSPLorg/thoughtcrime/securesms/database/AttachmentTable$ArchiveTransferState;->$values()[Lorg/thoughtcrime/securesms/database/AttachmentTable$ArchiveTransferState;
+HSPLorg/thoughtcrime/securesms/database/AttachmentTable$ArchiveTransferState;-><clinit>()V
+HSPLorg/thoughtcrime/securesms/database/AttachmentTable$ArchiveTransferState;-><init>(Ljava/lang/String;II)V
+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$TransformProperties$Companion;-><init>()V
@@ -22649,6 +23011,7 @@ HSPLorg/thoughtcrime/securesms/database/AttachmentTable$TransformProperties$Comp
 HSPLorg/thoughtcrime/securesms/database/AttachmentTable$TransformProperties$Companion;->parse(Ljava/lang/String;)Lorg/thoughtcrime/securesms/database/AttachmentTable$TransformProperties;
 HSPLorg/thoughtcrime/securesms/database/AttachmentTable$TransformProperties$Creator;-><init>()V
 HSPLorg/thoughtcrime/securesms/database/AttachmentTable$TransformProperties;-><clinit>()V
+HSPLorg/thoughtcrime/securesms/database/AttachmentTable$TransformProperties;-><init>(ZZJJIZ)V
 HSPLorg/thoughtcrime/securesms/database/AttachmentTable$TransformProperties;->access$getDEFAULT_MEDIA_QUALITY$cp()I
 HSPLorg/thoughtcrime/securesms/database/AttachmentTable$insertUndownloadedAttachment$attachmentId$1;-><init>(JLorg/thoughtcrime/securesms/attachments/Attachment;Z)V
 HSPLorg/thoughtcrime/securesms/database/AttachmentTable$insertUndownloadedAttachment$attachmentId$1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
@@ -22692,6 +23055,10 @@ HSPLorg/thoughtcrime/securesms/database/CallTable$ReadState;->$values()[Lorg/tho
 HSPLorg/thoughtcrime/securesms/database/CallTable$ReadState;-><clinit>()V
 HSPLorg/thoughtcrime/securesms/database/CallTable$ReadState;-><init>(Ljava/lang/String;II)V
 HSPLorg/thoughtcrime/securesms/database/CallTable$ReadState;->access$getCode$p(Lorg/thoughtcrime/securesms/database/CallTable$ReadState;)I
+HSPLorg/thoughtcrime/securesms/database/CallTable$markRingingCallsAsMissed$1;-><clinit>()V
+HSPLorg/thoughtcrime/securesms/database/CallTable$markRingingCallsAsMissed$1;-><init>()V
+HSPLorg/thoughtcrime/securesms/database/CallTable$markRingingCallsAsMissed$1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
+HSPLorg/thoughtcrime/securesms/database/CallTable$markRingingCallsAsMissed$1;->invoke(Lorg/thoughtcrime/securesms/database/SQLiteDatabase;)V
 HSPLorg/thoughtcrime/securesms/database/CallTable;-><clinit>()V
 HSPLorg/thoughtcrime/securesms/database/CallTable;-><init>(Landroid/content/Context;Lorg/thoughtcrime/securesms/database/SignalDatabase;)V
 HSPLorg/thoughtcrime/securesms/database/CallTable;->getCalls(Ljava/util/Collection;)Ljava/util/Map;
@@ -22719,8 +23086,12 @@ HSPLorg/thoughtcrime/securesms/database/DatabaseObserver$$ExternalSyntheticLambd
 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$$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
@@ -22743,11 +23114,13 @@ HSPLorg/thoughtcrime/securesms/database/DatabaseObserver$$ExternalSyntheticLambd
 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$dh6RWMfCAixhY74q-duAcBwIwmU(Lorg/thoughtcrime/securesms/database/DatabaseObserver;)V
@@ -22766,6 +23139,7 @@ HSPLorg/thoughtcrime/securesms/database/DatabaseObserver;->lambda$notifyRecipien
 HSPLorg/thoughtcrime/securesms/database/DatabaseObserver;->lambda$notifyStickerObservers$26()V
 HSPLorg/thoughtcrime/securesms/database/DatabaseObserver;->lambda$notifyStickerPackObservers$27()V
 HSPLorg/thoughtcrime/securesms/database/DatabaseObserver;->lambda$notifyStoryObservers$35(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
 HSPLorg/thoughtcrime/securesms/database/DatabaseObserver;->lambda$registerMessageInsertObserver$11(JLorg/thoughtcrime/securesms/database/DatabaseObserver$MessageObserver;)V
@@ -22774,6 +23148,7 @@ HSPLorg/thoughtcrime/securesms/database/DatabaseObserver;->lambda$registerNotifi
 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;->notifyAttachmentObservers()V
 HSPLorg/thoughtcrime/securesms/database/DatabaseObserver;->notifyConversationListListeners()V
 HSPLorg/thoughtcrime/securesms/database/DatabaseObserver;->notifyConversationListeners(J)V
@@ -22783,6 +23158,7 @@ HSPLorg/thoughtcrime/securesms/database/DatabaseObserver;->notifySet(Ljava/util/
 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
 HSPLorg/thoughtcrime/securesms/database/DatabaseObserver;->registerConversationObserver(JLorg/thoughtcrime/securesms/database/DatabaseObserver$Observer;)V
 HSPLorg/thoughtcrime/securesms/database/DatabaseObserver;->registerMapped(Ljava/util/Map;Ljava/lang/Object;Ljava/lang/Object;)V
@@ -22792,6 +23168,8 @@ 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;
@@ -23115,6 +23493,9 @@ HSPLorg/thoughtcrime/securesms/database/MessageTable$QuoteDescriptor;->hashCode(
 HSPLorg/thoughtcrime/securesms/database/MessageTable$SyncMessageId;-><clinit>()V
 HSPLorg/thoughtcrime/securesms/database/MessageTable$SyncMessageId;-><init>(Lorg/thoughtcrime/securesms/recipients/RecipientId;J)V
 HSPLorg/thoughtcrime/securesms/database/MessageTable$WhenMappings;-><clinit>()V
+HSPLorg/thoughtcrime/securesms/database/MessageTable$clearIsRingingOnLocalDeviceFlag$1;-><init>(Ljava/util/Collection;)V
+HSPLorg/thoughtcrime/securesms/database/MessageTable$clearIsRingingOnLocalDeviceFlag$1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
+HSPLorg/thoughtcrime/securesms/database/MessageTable$clearIsRingingOnLocalDeviceFlag$1;->invoke(Lorg/thoughtcrime/securesms/database/SQLiteDatabase;)V
 HSPLorg/thoughtcrime/securesms/database/MessageTable$getConversationSnippet$1;-><clinit>()V
 HSPLorg/thoughtcrime/securesms/database/MessageTable$getConversationSnippet$1;-><init>()V
 HSPLorg/thoughtcrime/securesms/database/MessageTable$getConversationSnippet$1;->invoke(Landroid/database/Cursor;)Lorg/thoughtcrime/securesms/database/model/MessageRecord;
@@ -23130,6 +23511,7 @@ HSPLorg/thoughtcrime/securesms/database/MessageTable;->access$getOutgoingTypeCla
 HSPLorg/thoughtcrime/securesms/database/MessageTable;->access$getSerializedLinkPreviews(Lorg/thoughtcrime/securesms/database/MessageTable;Ljava/util/Map;Ljava/util/List;)Ljava/lang/String;
 HSPLorg/thoughtcrime/securesms/database/MessageTable;->access$getSerializedSharedContacts(Lorg/thoughtcrime/securesms/database/MessageTable;Ljava/util/Map;Ljava/util/List;)Ljava/lang/String;
 HSPLorg/thoughtcrime/securesms/database/MessageTable;->buildMeaningfulMessagesQuery(J)Lorg/signal/core/util/SqlUtil$Query;
+HSPLorg/thoughtcrime/securesms/database/MessageTable;->clearIsRingingOnLocalDeviceFlag(Ljava/util/Collection;)V
 HSPLorg/thoughtcrime/securesms/database/MessageTable;->getAllRateLimitedMessageIds()Ljava/util/Set;
 HSPLorg/thoughtcrime/securesms/database/MessageTable;->getAllStoriesFor(Lorg/thoughtcrime/securesms/recipients/RecipientId;I)Lorg/thoughtcrime/securesms/database/MessageTable$Reader;
 HSPLorg/thoughtcrime/securesms/database/MessageTable;->getConversation(JJJ)Landroid/database/Cursor;
@@ -23219,6 +23601,10 @@ HSPLorg/thoughtcrime/securesms/database/MessageTypes$-CC;->isStoryReaction(J)Z
 HSPLorg/thoughtcrime/securesms/database/MessageTypes$-CC;->isThreadMergeType(J)Z
 HSPLorg/thoughtcrime/securesms/database/MessageTypes$-CC;->isUnsupportedMessageType(J)Z
 HSPLorg/thoughtcrime/securesms/database/MessageTypes;-><clinit>()V
+HSPLorg/thoughtcrime/securesms/database/NameCollisionTables$Companion;-><init>()V
+HSPLorg/thoughtcrime/securesms/database/NameCollisionTables$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+HSPLorg/thoughtcrime/securesms/database/NameCollisionTables;-><clinit>()V
+HSPLorg/thoughtcrime/securesms/database/NameCollisionTables;-><init>(Landroid/content/Context;Lorg/thoughtcrime/securesms/database/SignalDatabase;)V
 HSPLorg/thoughtcrime/securesms/database/NotificationProfileDatabase$Companion;-><init>()V
 HSPLorg/thoughtcrime/securesms/database/NotificationProfileDatabase$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 HSPLorg/thoughtcrime/securesms/database/NotificationProfileDatabase$NotificationProfileAllowedMembersTable;-><clinit>()V
@@ -23396,6 +23782,7 @@ HSPLorg/thoughtcrime/securesms/database/RecipientTable;->markRegistered(Lorg/tho
 HSPLorg/thoughtcrime/securesms/database/RecipientTable;->markRegisteredOrThrow(Lorg/thoughtcrime/securesms/recipients/RecipientId;Lorg/whispersystems/signalservice/api/push/ServiceId;)V
 HSPLorg/thoughtcrime/securesms/database/RecipientTable;->processPnpTuple(Ljava/lang/String;Lorg/whispersystems/signalservice/api/push/ServiceId$PNI;Lorg/whispersystems/signalservice/api/push/ServiceId$ACI;ZZ)Lorg/thoughtcrime/securesms/database/RecipientTable$ProcessPnpTupleResult;
 HSPLorg/thoughtcrime/securesms/database/RecipientTable;->processPnpTupleToChangeSet(Ljava/lang/String;Lorg/whispersystems/signalservice/api/push/ServiceId$PNI;Lorg/whispersystems/signalservice/api/push/ServiceId$ACI;ZZ)Lorg/thoughtcrime/securesms/database/PnpChangeSet;
+HSPLorg/thoughtcrime/securesms/database/RecipientTable;->rotateStorageId(Lorg/thoughtcrime/securesms/recipients/RecipientId;)V
 HSPLorg/thoughtcrime/securesms/database/RecipientTable;->setCapabilities(Lorg/thoughtcrime/securesms/recipients/RecipientId;Lorg/whispersystems/signalservice/api/profiles/SignalServiceProfile$Capabilities;)V
 HSPLorg/thoughtcrime/securesms/database/RecipientTable;->setMuted(Lorg/thoughtcrime/securesms/recipients/RecipientId;J)V
 HSPLorg/thoughtcrime/securesms/database/RecipientTable;->setProfileAvatar(Lorg/thoughtcrime/securesms/recipients/RecipientId;Ljava/lang/String;)V
@@ -23432,7 +23819,6 @@ 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;->getSyncExtras(Landroid/database/Cursor;)Lorg/thoughtcrime/securesms/database/model/RecipientRecord$SyncExtras;
 HSPLorg/thoughtcrime/securesms/database/RecipientTableCursorUtil;->parseBadgeList([B)Ljava/util/List;
@@ -23572,9 +23958,9 @@ HSPLorg/thoughtcrime/securesms/database/SQLiteDatabase;->replace(Ljava/lang/Stri
 HSPLorg/thoughtcrime/securesms/database/SQLiteDatabase;->runPostSuccessfulTransaction(Ljava/lang/Runnable;)V
 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;->traceLockEnd()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
@@ -23779,6 +24165,7 @@ 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
@@ -24104,10 +24491,13 @@ HSPLorg/thoughtcrime/securesms/database/model/StoryViewState$Companion$$External
 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;-><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;
@@ -24183,6 +24573,8 @@ 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;
@@ -24199,10 +24591,17 @@ HSPLorg/thoughtcrime/securesms/databinding/ConversationTitleViewBinding;->getRoo
 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/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/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
@@ -24244,7 +24643,7 @@ HSPLorg/thoughtcrime/securesms/dependencies/ApplicationDependencyProvider$$Exter
 HSPLorg/thoughtcrime/securesms/dependencies/ApplicationDependencyProvider$$ExternalSyntheticLambda0;->get()Ljava/lang/Object;
 HSPLorg/thoughtcrime/securesms/dependencies/ApplicationDependencyProvider$$ExternalSyntheticLambda1;-><init>()V
 HSPLorg/thoughtcrime/securesms/dependencies/ApplicationDependencyProvider$$ExternalSyntheticLambda1;->get()Ljava/lang/Object;
-HSPLorg/thoughtcrime/securesms/dependencies/ApplicationDependencyProvider$1;-><init>(Lorg/thoughtcrime/securesms/dependencies/ApplicationDependencyProvider;Lj$/util/function/Supplier;Lorg/thoughtcrime/securesms/net/SignalWebSocketHealthMonitor;)V
+HSPLorg/thoughtcrime/securesms/dependencies/ApplicationDependencyProvider$1;-><init>(Lorg/thoughtcrime/securesms/dependencies/ApplicationDependencyProvider;Lj$/util/function/Supplier;Lorg/thoughtcrime/securesms/net/SignalWebSocketHealthMonitor;Lj$/util/function/Supplier;)V
 HSPLorg/thoughtcrime/securesms/dependencies/ApplicationDependencyProvider$1;->createUnidentifiedWebSocket()Lorg/whispersystems/signalservice/internal/websocket/WebSocketConnection;
 HSPLorg/thoughtcrime/securesms/dependencies/ApplicationDependencyProvider$1;->createWebSocket()Lorg/whispersystems/signalservice/internal/websocket/WebSocketConnection;
 HSPLorg/thoughtcrime/securesms/dependencies/ApplicationDependencyProvider$DynamicCredentialsProvider;-><init>()V
@@ -24283,10 +24682,10 @@ HSPLorg/thoughtcrime/securesms/dependencies/ApplicationDependencyProvider;->prov
 HSPLorg/thoughtcrime/securesms/dependencies/ApplicationDependencyProvider;->provideSignalServiceAccountManager(Lorg/whispersystems/signalservice/internal/configuration/SignalServiceConfiguration;Lorg/whispersystems/signalservice/api/groupsv2/GroupsV2Operations;)Lorg/whispersystems/signalservice/api/SignalServiceAccountManager;
 HSPLorg/thoughtcrime/securesms/dependencies/ApplicationDependencyProvider;->provideSignalServiceMessageReceiver(Lorg/whispersystems/signalservice/internal/configuration/SignalServiceConfiguration;)Lorg/whispersystems/signalservice/api/SignalServiceMessageReceiver;
 HSPLorg/thoughtcrime/securesms/dependencies/ApplicationDependencyProvider;->provideSignalServiceNetworkAccess()Lorg/thoughtcrime/securesms/push/SignalServiceNetworkAccess;
-HSPLorg/thoughtcrime/securesms/dependencies/ApplicationDependencyProvider;->provideSignalWebSocket(Lj$/util/function/Supplier;)Lorg/whispersystems/signalservice/api/SignalWebSocket;
+HSPLorg/thoughtcrime/securesms/dependencies/ApplicationDependencyProvider;->provideSignalWebSocket(Lj$/util/function/Supplier;Lj$/util/function/Supplier;)Lorg/whispersystems/signalservice/api/SignalWebSocket;
 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;)Lorg/whispersystems/signalservice/api/websocket/WebSocketFactory;
+HSPLorg/thoughtcrime/securesms/dependencies/ApplicationDependencyProvider;->provideWebSocketFactory(Lj$/util/function/Supplier;Lorg/thoughtcrime/securesms/net/SignalWebSocketHealthMonitor;Lj$/util/function/Supplier;)Lorg/whispersystems/signalservice/api/websocket/WebSocketFactory;
 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;
@@ -24406,7 +24805,6 @@ 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;
 HSPLorg/thoughtcrime/securesms/emoji/EmojiJsonParser;->buildEmojiSourceFromNode(Lcom/fasterxml/jackson/databind/JsonNode;Lkotlin/jvm/functions/Function2;)Lorg/thoughtcrime/securesms/emoji/ParsedEmojiData;
-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;
@@ -24432,8 +24830,6 @@ HSPLorg/thoughtcrime/securesms/emoji/EmojiMetrics;-><init>(III)V
 HSPLorg/thoughtcrime/securesms/emoji/EmojiMetrics;->getPerRow()I
 HSPLorg/thoughtcrime/securesms/emoji/EmojiMetrics;->getRawHeight()I
 HSPLorg/thoughtcrime/securesms/emoji/EmojiMetrics;->getRawWidth()I
-HSPLorg/thoughtcrime/securesms/emoji/EmojiPage$Asset;-><clinit>()V
-HSPLorg/thoughtcrime/securesms/emoji/EmojiPage$Asset;-><init>(Landroid/net/Uri;)V
 HSPLorg/thoughtcrime/securesms/emoji/EmojiPage$Disk;-><clinit>()V
 HSPLorg/thoughtcrime/securesms/emoji/EmojiPage$Disk;-><init>(Landroid/net/Uri;)V
 HSPLorg/thoughtcrime/securesms/emoji/EmojiPage$Disk;->equals(Ljava/lang/Object;)Z
@@ -24479,8 +24875,6 @@ HSPLorg/thoughtcrime/securesms/emoji/EmojiRemote;->getObject(Lorg/thoughtcrime/s
 HSPLorg/thoughtcrime/securesms/emoji/EmojiRemote;->getVersion()I
 HSPLorg/thoughtcrime/securesms/emoji/EmojiSource$Companion$loadAssetBasedEmojis$1$1;-><clinit>()V
 HSPLorg/thoughtcrime/securesms/emoji/EmojiSource$Companion$loadAssetBasedEmojis$1$1;-><init>()V
-HSPLorg/thoughtcrime/securesms/emoji/EmojiSource$Companion$loadAssetBasedEmojis$1$1;->invoke(Landroid/net/Uri;)Lorg/thoughtcrime/securesms/emoji/EmojiPage;
-HSPLorg/thoughtcrime/securesms/emoji/EmojiSource$Companion$loadAssetBasedEmojis$1$1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
 HSPLorg/thoughtcrime/securesms/emoji/EmojiSource$Companion$loadAssetBasedEmojis$1$parsedData$1;-><clinit>()V
 HSPLorg/thoughtcrime/securesms/emoji/EmojiSource$Companion$loadAssetBasedEmojis$1$parsedData$1;-><init>()V
 HSPLorg/thoughtcrime/securesms/emoji/EmojiSource$Companion$loadAssetBasedEmojis$1$parsedData$1;->invoke(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
@@ -24499,6 +24893,7 @@ HSPLorg/thoughtcrime/securesms/emoji/EmojiSource$Companion;->refresh()V
 HSPLorg/thoughtcrime/securesms/emoji/EmojiSource$canonicalToVariations$2;-><init>(Lorg/thoughtcrime/securesms/emoji/EmojiSource;)V
 HSPLorg/thoughtcrime/securesms/emoji/EmojiSource$emojiTree$2;-><init>(Lorg/thoughtcrime/securesms/emoji/EmojiSource;)V
 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;
@@ -24555,7 +24950,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
@@ -24632,6 +25026,24 @@ 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
@@ -24668,6 +25080,7 @@ 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
@@ -24677,8 +25090,10 @@ 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
@@ -25163,13 +25578,21 @@ HSPLorg/thoughtcrime/securesms/jobs/AnalyzeDatabaseJob$Factory;-><clinit>()V
 HSPLorg/thoughtcrime/securesms/jobs/AnalyzeDatabaseJob$Factory;-><init>()V
 HSPLorg/thoughtcrime/securesms/jobs/ApkUpdateJob$Factory;-><clinit>()V
 HSPLorg/thoughtcrime/securesms/jobs/ApkUpdateJob$Factory;-><init>()V
+HSPLorg/thoughtcrime/securesms/jobs/ArchiveAttachmentBackfillJob$Factory;-><clinit>()V
+HSPLorg/thoughtcrime/securesms/jobs/ArchiveAttachmentBackfillJob$Factory;-><init>()V
+HSPLorg/thoughtcrime/securesms/jobs/ArchiveAttachmentJob$Factory;-><clinit>()V
+HSPLorg/thoughtcrime/securesms/jobs/ArchiveAttachmentJob$Factory;-><init>()V
 HSPLorg/thoughtcrime/securesms/jobs/AttachmentCompressionJob$Factory;-><init>()V
 HSPLorg/thoughtcrime/securesms/jobs/AttachmentCopyJob$Factory;-><init>()V
+HSPLorg/thoughtcrime/securesms/jobs/AttachmentDownloadJob$Companion;-><init>()V
+HSPLorg/thoughtcrime/securesms/jobs/AttachmentDownloadJob$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+HSPLorg/thoughtcrime/securesms/jobs/AttachmentDownloadJob$Companion;->constructQueueString(Lorg/thoughtcrime/securesms/attachments/AttachmentId;)Ljava/lang/String;
+HSPLorg/thoughtcrime/securesms/jobs/AttachmentDownloadJob$Factory;-><clinit>()V
 HSPLorg/thoughtcrime/securesms/jobs/AttachmentDownloadJob$Factory;-><init>()V
 HSPLorg/thoughtcrime/securesms/jobs/AttachmentDownloadJob;-><clinit>()V
-HSPLorg/thoughtcrime/securesms/jobs/AttachmentDownloadJob;-><init>(JLorg/thoughtcrime/securesms/attachments/AttachmentId;Z)V
-HSPLorg/thoughtcrime/securesms/jobs/AttachmentDownloadJob;-><init>(Lorg/thoughtcrime/securesms/jobmanager/Job$Parameters;JLorg/thoughtcrime/securesms/attachments/AttachmentId;Z)V
-HSPLorg/thoughtcrime/securesms/jobs/AttachmentDownloadJob;->constructQueueString(Lorg/thoughtcrime/securesms/attachments/AttachmentId;)Ljava/lang/String;
+HSPLorg/thoughtcrime/securesms/jobs/AttachmentDownloadJob;-><init>(JLorg/thoughtcrime/securesms/attachments/AttachmentId;ZZ)V
+HSPLorg/thoughtcrime/securesms/jobs/AttachmentDownloadJob;-><init>(JLorg/thoughtcrime/securesms/attachments/AttachmentId;ZZILkotlin/jvm/internal/DefaultConstructorMarker;)V
+HSPLorg/thoughtcrime/securesms/jobs/AttachmentDownloadJob;-><init>(Lorg/thoughtcrime/securesms/jobmanager/Job$Parameters;JLorg/thoughtcrime/securesms/attachments/AttachmentId;ZZ)V
 HSPLorg/thoughtcrime/securesms/jobs/AttachmentDownloadJob;->getFactoryKey()Ljava/lang/String;
 HSPLorg/thoughtcrime/securesms/jobs/AttachmentDownloadJob;->onAdded()V
 HSPLorg/thoughtcrime/securesms/jobs/AttachmentDownloadJob;->serialize()[B
@@ -25181,6 +25604,12 @@ HSPLorg/thoughtcrime/securesms/jobs/AttachmentUploadJob$Factory;-><init>()V
 HSPLorg/thoughtcrime/securesms/jobs/AutomaticSessionResetJob$Factory;-><init>()V
 HSPLorg/thoughtcrime/securesms/jobs/AvatarGroupsV1DownloadJob$Factory;-><init>()V
 HSPLorg/thoughtcrime/securesms/jobs/AvatarGroupsV2DownloadJob$Factory;-><init>()V
+HSPLorg/thoughtcrime/securesms/jobs/BackupMessagesJob$Factory;-><clinit>()V
+HSPLorg/thoughtcrime/securesms/jobs/BackupMessagesJob$Factory;-><init>()V
+HSPLorg/thoughtcrime/securesms/jobs/BackupRestoreJob$Factory;-><clinit>()V
+HSPLorg/thoughtcrime/securesms/jobs/BackupRestoreJob$Factory;-><init>()V
+HSPLorg/thoughtcrime/securesms/jobs/BackupRestoreMediaJob$Factory;-><clinit>()V
+HSPLorg/thoughtcrime/securesms/jobs/BackupRestoreMediaJob$Factory;-><init>()V
 HSPLorg/thoughtcrime/securesms/jobs/BaseJob;-><clinit>()V
 HSPLorg/thoughtcrime/securesms/jobs/BaseJob;-><init>(Lorg/thoughtcrime/securesms/jobmanager/Job$Parameters;)V
 HSPLorg/thoughtcrime/securesms/jobs/BaseJob;->getNextRunAttemptBackoff(ILjava/lang/Exception;)J
@@ -25320,6 +25749,7 @@ HSPLorg/thoughtcrime/securesms/jobs/FastJobStorage$deleteJobs$1;->invoke(Lorg/th
 HSPLorg/thoughtcrime/securesms/jobs/FastJobStorage$getPendingJobsWithNoDependenciesInCreatedOrder$$inlined$sortedBy$1;-><init>()V
 HSPLorg/thoughtcrime/securesms/jobs/FastJobStorage$getPendingJobsWithNoDependenciesInCreatedOrder$$inlined$sortedBy$1;->compare(Ljava/lang/Object;Ljava/lang/Object;)I
 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$getPendingJobsWithNoDependenciesInCreatedOrder$lambda$8$$inlined$sortedBy$1;->compare(Ljava/lang/Object;Ljava/lang/Object;)I
 HSPLorg/thoughtcrime/securesms/jobs/FastJobStorage;->$r8$lambda$Xu-rS-eV7EMHJJ0ct-GtD7_wnkc(Lkotlin/jvm/functions/Function1;Ljava/lang/Object;)Z
@@ -25333,6 +25763,7 @@ 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;
@@ -25552,6 +25983,8 @@ HSPLorg/thoughtcrime/securesms/jobs/RequestGroupV2InfoWorkerJob$Factory;-><init>
 HSPLorg/thoughtcrime/securesms/jobs/ResendMessageJob$Factory;-><init>()V
 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/ResumableUploadSpecJob$Factory;-><init>()V
 HSPLorg/thoughtcrime/securesms/jobs/RetrieveProfileAvatarJob$Factory;-><init>()V
 HSPLorg/thoughtcrime/securesms/jobs/RetrieveProfileJob$Companion;-><init>()V
@@ -25644,6 +26077,8 @@ 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
+HSPLorg/thoughtcrime/securesms/jobs/SyncArchivedMediaJob$Factory;-><clinit>()V
+HSPLorg/thoughtcrime/securesms/jobs/SyncArchivedMediaJob$Factory;-><init>()V
 HSPLorg/thoughtcrime/securesms/jobs/SyncSystemContactLinksJob$Factory;-><clinit>()V
 HSPLorg/thoughtcrime/securesms/jobs/SyncSystemContactLinksJob$Factory;-><init>()V
 HSPLorg/thoughtcrime/securesms/jobs/ThreadUpdateJob$$ExternalSyntheticLambda0;-><init>(J)V
@@ -25819,6 +26254,7 @@ HSPLorg/thoughtcrime/securesms/keyvalue/IntValue;->setValue$Signal_Android_playP
 HSPLorg/thoughtcrime/securesms/keyvalue/IntValue;->setValue$Signal_Android_playProdBenchmark(Lorg/thoughtcrime/securesms/keyvalue/KeyValueStore;Ljava/lang/Object;)V
 HSPLorg/thoughtcrime/securesms/keyvalue/InternalValues;-><init>(Lorg/thoughtcrime/securesms/keyvalue/KeyValueStore;)V
 HSPLorg/thoughtcrime/securesms/keyvalue/InternalValues;->callingDisableLBRed()Z
+HSPLorg/thoughtcrime/securesms/keyvalue/InternalValues;->enterRestoreV2Flow()Z
 HSPLorg/thoughtcrime/securesms/keyvalue/InternalValues;->forceBuiltInEmoji()Z
 HSPLorg/thoughtcrime/securesms/keyvalue/InternalValues;->isWebsocketModeForced()Z
 HSPLorg/thoughtcrime/securesms/keyvalue/InternalValues;->shakeToReport()Z
@@ -25845,6 +26281,7 @@ HSPLorg/thoughtcrime/securesms/keyvalue/KeyValueDataSet;->putLong(Ljava/lang/Str
 HSPLorg/thoughtcrime/securesms/keyvalue/KeyValueDataSet;->putString(Ljava/lang/String;Ljava/lang/String;)V
 HSPLorg/thoughtcrime/securesms/keyvalue/KeyValueDataSet;->readValueAsType(Ljava/lang/String;Ljava/lang/Class;Z)Ljava/lang/Object;
 HSPLorg/thoughtcrime/securesms/keyvalue/KeyValueDataSet;->removeAll(Ljava/util/Collection;)V
+HSPLorg/thoughtcrime/securesms/keyvalue/KeyValueEnumValue;-><init>(Ljava/lang/String;Ljava/lang/Object;Lorg/signal/core/util/LongSerializer;Lorg/thoughtcrime/securesms/keyvalue/KeyValueStore;)V
 HSPLorg/thoughtcrime/securesms/keyvalue/KeyValueProtoValue;-><init>(Ljava/lang/String;Lcom/squareup/wire/ProtoAdapter;Lorg/thoughtcrime/securesms/keyvalue/KeyValueStore;)V
 HSPLorg/thoughtcrime/securesms/keyvalue/KeyValueProtoValue;->getValue$Signal_Android_playProdBenchmark(Lorg/thoughtcrime/securesms/keyvalue/KeyValueStore;)Ljava/lang/Object;
 HSPLorg/thoughtcrime/securesms/keyvalue/KeyValueStore$$ExternalSyntheticLambda0;-><init>(Lorg/thoughtcrime/securesms/keyvalue/KeyValueStore;Lorg/thoughtcrime/securesms/keyvalue/KeyValueDataSet;Ljava/util/Collection;)V
@@ -25984,6 +26421,7 @@ 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
@@ -26018,6 +26456,7 @@ HSPLorg/thoughtcrime/securesms/keyvalue/SignalStoreValueDelegate;->getValue(Ljav
 HSPLorg/thoughtcrime/securesms/keyvalue/SignalStoreValueDelegate;->setValue(Ljava/lang/Object;Lkotlin/reflect/KProperty;Ljava/lang/Object;)V
 HSPLorg/thoughtcrime/securesms/keyvalue/SignalStoreValueDelegatesKt;->blobValue(Lorg/thoughtcrime/securesms/keyvalue/SignalStoreValues;Ljava/lang/String;[B)Lorg/thoughtcrime/securesms/keyvalue/SignalStoreValueDelegate;
 HSPLorg/thoughtcrime/securesms/keyvalue/SignalStoreValueDelegatesKt;->booleanValue(Lorg/thoughtcrime/securesms/keyvalue/SignalStoreValues;Ljava/lang/String;Z)Lorg/thoughtcrime/securesms/keyvalue/SignalStoreValueDelegate;
+HSPLorg/thoughtcrime/securesms/keyvalue/SignalStoreValueDelegatesKt;->enumValue(Lorg/thoughtcrime/securesms/keyvalue/SignalStoreValues;Ljava/lang/String;Ljava/lang/Object;Lorg/signal/core/util/LongSerializer;)Lorg/thoughtcrime/securesms/keyvalue/SignalStoreValueDelegate;
 HSPLorg/thoughtcrime/securesms/keyvalue/SignalStoreValueDelegatesKt;->integerValue(Lorg/thoughtcrime/securesms/keyvalue/SignalStoreValues;Ljava/lang/String;I)Lorg/thoughtcrime/securesms/keyvalue/SignalStoreValueDelegate;
 HSPLorg/thoughtcrime/securesms/keyvalue/SignalStoreValueDelegatesKt;->longValue(Lorg/thoughtcrime/securesms/keyvalue/SignalStoreValues;Ljava/lang/String;J)Lorg/thoughtcrime/securesms/keyvalue/SignalStoreValueDelegate;
 HSPLorg/thoughtcrime/securesms/keyvalue/SignalStoreValueDelegatesKt;->nullableBlobValue(Lorg/thoughtcrime/securesms/keyvalue/SignalStoreValues;Ljava/lang/String;[B)Lorg/thoughtcrime/securesms/keyvalue/SignalStoreValueDelegate;
@@ -26098,16 +26537,13 @@ HSPLorg/thoughtcrime/securesms/logging/PersistentLogger$LogRequests;->blockForRe
 HSPLorg/thoughtcrime/securesms/logging/PersistentLogger$LogRequests;->notifyFlushed()V
 HSPLorg/thoughtcrime/securesms/logging/PersistentLogger$WriteThread;-><init>(Lorg/thoughtcrime/securesms/logging/PersistentLogger$LogRequests;Lorg/thoughtcrime/securesms/database/LogDatabase;)V
 HSPLorg/thoughtcrime/securesms/logging/PersistentLogger$WriteThread;->formatBody(Ljava/lang/String;Ljava/util/Date;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
-HSPLorg/thoughtcrime/securesms/logging/PersistentLogger$WriteThread;->requestToEntries(Lorg/thoughtcrime/securesms/logging/PersistentLogger$LogRequest;)Ljava/util/List;
 HSPLorg/thoughtcrime/securesms/logging/PersistentLogger$WriteThread;->run()V
 HSPLorg/thoughtcrime/securesms/logging/PersistentLogger;-><clinit>()V
 HSPLorg/thoughtcrime/securesms/logging/PersistentLogger;-><init>(Landroid/app/Application;)V
 HSPLorg/thoughtcrime/securesms/logging/PersistentLogger;->d(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;Z)V
 HSPLorg/thoughtcrime/securesms/logging/PersistentLogger;->flush()V
-HSPLorg/thoughtcrime/securesms/logging/PersistentLogger;->getThreadString()Ljava/lang/String;
 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
@@ -26378,6 +26814,7 @@ HSPLorg/thoughtcrime/securesms/messagerequests/MessageRequestState$State;-><init
 HSPLorg/thoughtcrime/securesms/messagerequests/MessageRequestState;-><clinit>()V
 HSPLorg/thoughtcrime/securesms/messagerequests/MessageRequestState;-><init>(Lorg/thoughtcrime/securesms/messagerequests/MessageRequestState$State;Z)V
 HSPLorg/thoughtcrime/securesms/messagerequests/MessageRequestState;-><init>(Lorg/thoughtcrime/securesms/messagerequests/MessageRequestState$State;ZILkotlin/jvm/internal/DefaultConstructorMarker;)V
+HSPLorg/thoughtcrime/securesms/messagerequests/MessageRequestState;->equals(Ljava/lang/Object;)Z
 HSPLorg/thoughtcrime/securesms/messagerequests/MessageRequestState;->isAccepted()Z
 HSPLorg/thoughtcrime/securesms/messages/IncomingMessageObserver$$ExternalSyntheticLambda0;-><init>(Lorg/thoughtcrime/securesms/messages/IncomingMessageObserver;)V
 HSPLorg/thoughtcrime/securesms/messages/IncomingMessageObserver$$ExternalSyntheticLambda0;->run()V
@@ -26595,6 +27032,8 @@ 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;
@@ -26768,6 +27207,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
@@ -26896,6 +27336,7 @@ 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$$ExternalSyntheticLambda3;-><init>()V
 HSPLorg/thoughtcrime/securesms/recipients/LiveRecipient$$ExternalSyntheticLambda3;->contentsMatch(Ljava/lang/Object;Ljava/lang/Object;)Z
@@ -26913,7 +27354,6 @@ HSPLorg/thoughtcrime/securesms/recipients/LiveRecipient;->lambda$new$2(Lorg/thou
 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
@@ -27055,7 +27495,6 @@ HSPLorg/thoughtcrime/securesms/recipients/RecipientCreator$create$2;-><clinit>()
 HSPLorg/thoughtcrime/securesms/recipients/RecipientCreator$create$2;-><init>()V
 HSPLorg/thoughtcrime/securesms/recipients/RecipientCreator;-><clinit>()V
 HSPLorg/thoughtcrime/securesms/recipients/RecipientCreator;-><init>()V
-HSPLorg/thoughtcrime/securesms/recipients/RecipientCreator;->create(ZLjava/lang/String;Ljava/lang/String;ZLorg/thoughtcrime/securesms/database/RecipientTable$RegisteredState;Lorg/thoughtcrime/securesms/database/model/RecipientRecord;Ljava/util/List;ZLorg/thoughtcrime/securesms/conversation/colors/AvatarColor;Lj$/util/Optional;)Lorg/thoughtcrime/securesms/recipients/Recipient;
 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;
@@ -27187,6 +27626,11 @@ HSPLorg/thoughtcrime/securesms/service/KeyCachingService;->isLocked(Landroid/con
 HSPLorg/thoughtcrime/securesms/service/KeyCachingService;->onAppForegrounded(Landroid/content/Context;)V
 HSPLorg/thoughtcrime/securesms/service/LocalBackupListener;-><clinit>()V
 HSPLorg/thoughtcrime/securesms/service/LocalBackupListener;->schedule(Landroid/content/Context;)V
+HSPLorg/thoughtcrime/securesms/service/MessageBackupListener$Companion;-><init>()V
+HSPLorg/thoughtcrime/securesms/service/MessageBackupListener$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+HSPLorg/thoughtcrime/securesms/service/MessageBackupListener$Companion;->schedule(Landroid/content/Context;)V
+HSPLorg/thoughtcrime/securesms/service/MessageBackupListener;-><clinit>()V
+HSPLorg/thoughtcrime/securesms/service/MessageBackupListener;->schedule(Landroid/content/Context;)V
 HSPLorg/thoughtcrime/securesms/service/PendingRetryReceiptManager;-><clinit>()V
 HSPLorg/thoughtcrime/securesms/service/PendingRetryReceiptManager;-><init>(Landroid/app/Application;)V
 HSPLorg/thoughtcrime/securesms/service/PendingRetryReceiptManager;->getNextClosestEvent()Ljava/lang/Object;
@@ -27535,10 +27979,13 @@ HSPLorg/thoughtcrime/securesms/util/FeatureFlags;->groupLimits()Lorg/thoughtcrim
 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;->mapToJson(Ljava/util/Map;)Ljava/lang/String;
+HSPLorg/thoughtcrime/securesms/util/FeatureFlags;->messageBackups()Z
 HSPLorg/thoughtcrime/securesms/util/FeatureFlags;->okHttpAutomaticRetry()Z
 HSPLorg/thoughtcrime/securesms/util/FeatureFlags;->parseStoredConfig(Ljava/lang/String;)Ljava/util/Map;
 HSPLorg/thoughtcrime/securesms/util/FeatureFlags;->refreshIfNecessary()V
+HSPLorg/thoughtcrime/securesms/util/FeatureFlags;->restoreAfterRegistration()Z
 HSPLorg/thoughtcrime/securesms/util/FeatureFlags;->retryReceipts()Z
 HSPLorg/thoughtcrime/securesms/util/FeatureFlags;->retryRespondMaxAge()J
 HSPLorg/thoughtcrime/securesms/util/FeatureFlags;->triggerFlagChangeListeners(Ljava/util/Map;)V
@@ -27625,6 +28072,11 @@ 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;
@@ -27705,17 +28157,23 @@ HSPLorg/thoughtcrime/securesms/util/ProfileUtil$$ExternalSyntheticLambda3;->call
 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$$ExternalSyntheticLambda5;-><init>(Lorg/thoughtcrime/securesms/recipients/Recipient;)V
-HSPLorg/thoughtcrime/securesms/util/ProfileUtil;->$r8$lambda$64DRPwLhDKidiYVBrJ1oGsaeSVY(Lorg/thoughtcrime/securesms/recipients/Recipient;Lorg/whispersystems/signalservice/internal/ServiceResponse;)Lorg/signal/libsignal/protocol/util/Pair;
-HSPLorg/thoughtcrime/securesms/util/ProfileUtil;->$r8$lambda$cqO5Ws54dRBOxkD_sPlVLlSYwIg(Landroid/content/Context;Lorg/thoughtcrime/securesms/recipients/Recipient;)Lorg/whispersystems/signalservice/api/push/SignalServiceAddress;
-HSPLorg/thoughtcrime/securesms/util/ProfileUtil;->$r8$lambda$dDuBqdOM1yCYB_18NZWtjJd7BlA(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;->$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;-><clinit>()V
 HSPLorg/thoughtcrime/securesms/util/ProfileUtil;->handleSelfProfileKeyChange()V
-HSPLorg/thoughtcrime/securesms/util/ProfileUtil;->lambda$retrieveProfile$0(Landroid/content/Context;Lorg/thoughtcrime/securesms/recipients/Recipient;)Lorg/whispersystems/signalservice/api/push/SignalServiceAddress;
-HSPLorg/thoughtcrime/securesms/util/ProfileUtil;->lambda$retrieveProfile$1(Lorg/thoughtcrime/securesms/recipients/Recipient;Lorg/whispersystems/signalservice/internal/ServiceResponse;)Lorg/signal/libsignal/protocol/util/Pair;
-HSPLorg/thoughtcrime/securesms/util/ProfileUtil;->lambda$retrieveProfile$2(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;->lambda$retrieveProfile$3(Landroid/content/Context;Lorg/thoughtcrime/securesms/recipients/Recipient;)Lorg/whispersystems/signalservice/api/push/SignalServiceAddress;
+HSPLorg/thoughtcrime/securesms/util/ProfileUtil;->lambda$retrieveProfile$4(Lorg/thoughtcrime/securesms/recipients/Recipient;Lorg/whispersystems/signalservice/internal/ServiceResponse;)Lorg/signal/libsignal/protocol/util/Pair;
+HSPLorg/thoughtcrime/securesms/util/ProfileUtil;->lambda$retrieveProfile$5(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;->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
@@ -27741,6 +28199,7 @@ 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;
@@ -27798,6 +28257,8 @@ 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
@@ -27839,6 +28300,7 @@ 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
@@ -27980,6 +28442,9 @@ HSPLorg/thoughtcrime/securesms/util/adapter/mapping/MappingAdapter;->registerFac
 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
@@ -27999,6 +28464,8 @@ HSPLorg/thoughtcrime/securesms/util/concurrent/SerialExecutor;->execute(Ljava/la
 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
@@ -28224,9 +28691,15 @@ HSPLorg/whispersystems/signalservice/api/messages/SignalServiceAttachmentPointer
 HSPLorg/whispersystems/signalservice/api/messages/SignalServiceAttachmentPointer;->isBorderless()Z
 HSPLorg/whispersystems/signalservice/api/messages/SignalServiceAttachmentPointer;->isGif()Z
 HSPLorg/whispersystems/signalservice/api/messages/SignalServiceAttachmentPointer;->isPointer()Z
-HSPLorg/whispersystems/signalservice/api/messages/SignalServiceAttachmentRemoteId;-><init>(Ljava/lang/String;)V
-HSPLorg/whispersystems/signalservice/api/messages/SignalServiceAttachmentRemoteId;->from(Ljava/lang/String;)Lorg/whispersystems/signalservice/api/messages/SignalServiceAttachmentRemoteId;
-HSPLorg/whispersystems/signalservice/api/messages/SignalServiceAttachmentRemoteId;->toString()Ljava/lang/String;
+HSPLorg/whispersystems/signalservice/api/messages/SignalServiceAttachmentRemoteId$Companion;-><clinit>()V
+HSPLorg/whispersystems/signalservice/api/messages/SignalServiceAttachmentRemoteId$Companion;-><init>()V
+HSPLorg/whispersystems/signalservice/api/messages/SignalServiceAttachmentRemoteId$Companion;->from(Ljava/lang/String;)Lorg/whispersystems/signalservice/api/messages/SignalServiceAttachmentRemoteId;
+HSPLorg/whispersystems/signalservice/api/messages/SignalServiceAttachmentRemoteId$S3;-><clinit>()V
+HSPLorg/whispersystems/signalservice/api/messages/SignalServiceAttachmentRemoteId$S3;-><init>()V
+HSPLorg/whispersystems/signalservice/api/messages/SignalServiceAttachmentRemoteId$S3;->toString()Ljava/lang/String;
+HSPLorg/whispersystems/signalservice/api/messages/SignalServiceAttachmentRemoteId$V4;-><init>(Ljava/lang/String;)V
+HSPLorg/whispersystems/signalservice/api/messages/SignalServiceAttachmentRemoteId$V4;->toString()Ljava/lang/String;
+HSPLorg/whispersystems/signalservice/api/messages/SignalServiceAttachmentRemoteId;-><clinit>()V
 HSPLorg/whispersystems/signalservice/api/payments/Currency$CryptoCurrency;-><init>(Ljava/lang/String;I)V
 HSPLorg/whispersystems/signalservice/api/payments/Currency;-><init>()V
 HSPLorg/whispersystems/signalservice/api/payments/Currency;-><init>(Lorg/whispersystems/signalservice/api/payments/Currency-IA;)V
@@ -28393,6 +28866,8 @@ HSPLorg/whispersystems/signalservice/internal/push/PushServiceSocket$EmptyRespon
 HSPLorg/whispersystems/signalservice/internal/push/PushServiceSocket$EmptyResponseCodeHandler;->handle(ILokhttp3/ResponseBody;)V
 HSPLorg/whispersystems/signalservice/internal/push/PushServiceSocket$ServiceConnectionHolder;-><init>(Lokhttp3/OkHttpClient;Lokhttp3/OkHttpClient;Ljava/lang/String;Lj$/util/Optional;)V
 HSPLorg/whispersystems/signalservice/internal/push/PushServiceSocket$ServiceConnectionHolder;-><init>(Lokhttp3/OkHttpClient;Lokhttp3/OkHttpClient;Ljava/lang/String;Lj$/util/Optional;Lorg/whispersystems/signalservice/internal/push/PushServiceSocket$ServiceConnectionHolder-IA;)V
+HSPLorg/whispersystems/signalservice/internal/push/PushServiceSocket$UnopinionatedResponseCodeHandler;-><init>()V
+HSPLorg/whispersystems/signalservice/internal/push/PushServiceSocket$UnopinionatedResponseCodeHandler;-><init>(Lorg/whispersystems/signalservice/internal/push/PushServiceSocket$UnopinionatedResponseCodeHandler-IA;)V
 HSPLorg/whispersystems/signalservice/internal/push/PushServiceSocket;->-$$Nest$mvalidateServiceResponse(Lorg/whispersystems/signalservice/internal/push/PushServiceSocket;Lokhttp3/Response;)Lokhttp3/Response;
 HSPLorg/whispersystems/signalservice/internal/push/PushServiceSocket;-><clinit>()V
 HSPLorg/whispersystems/signalservice/internal/push/PushServiceSocket;-><init>(Lorg/whispersystems/signalservice/internal/configuration/SignalServiceConfiguration;Lorg/whispersystems/signalservice/api/util/CredentialsProvider;Ljava/lang/String;Lorg/signal/libsignal/zkgroup/profiles/ClientZkProfileOperations;Z)V
@@ -28402,7 +28877,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/lang/String;JLorg/whispersystems/signalservice/api/messages/SignalServiceAttachment$ProgressListener;)V
+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;
@@ -28454,20 +28929,20 @@ HSPLorg/whispersystems/signalservice/internal/websocket/DefaultResponseMapper$Bu
 HSPLorg/whispersystems/signalservice/internal/websocket/DefaultResponseMapper;-><init>(Ljava/lang/Class;Lorg/whispersystems/signalservice/internal/websocket/DefaultResponseMapper$CustomResponseMapper;Lorg/whispersystems/signalservice/internal/websocket/ErrorMapper;)V
 HSPLorg/whispersystems/signalservice/internal/websocket/DefaultResponseMapper;-><init>(Ljava/lang/Class;Lorg/whispersystems/signalservice/internal/websocket/DefaultResponseMapper$CustomResponseMapper;Lorg/whispersystems/signalservice/internal/websocket/ErrorMapper;Lorg/whispersystems/signalservice/internal/websocket/DefaultResponseMapper-IA;)V
 HSPLorg/whispersystems/signalservice/internal/websocket/DefaultResponseMapper;->extend(Ljava/lang/Class;)Lorg/whispersystems/signalservice/internal/websocket/DefaultResponseMapper$Builder;
-HSPLorg/whispersystems/signalservice/internal/websocket/WebSocketConnection;-><clinit>()V
-HSPLorg/whispersystems/signalservice/internal/websocket/WebSocketConnection;-><init>(Ljava/lang/String;Lorg/whispersystems/signalservice/internal/configuration/SignalServiceConfiguration;Lj$/util/Optional;Ljava/lang/String;Lorg/whispersystems/signalservice/api/websocket/HealthMonitor;Ljava/lang/String;Z)V
-HSPLorg/whispersystems/signalservice/internal/websocket/WebSocketConnection;-><init>(Ljava/lang/String;Lorg/whispersystems/signalservice/internal/configuration/SignalServiceConfiguration;Lj$/util/Optional;Ljava/lang/String;Lorg/whispersystems/signalservice/api/websocket/HealthMonitor;Z)V
-HSPLorg/whispersystems/signalservice/internal/websocket/WebSocketConnection;->cleanupAfterShutdown()V
-HSPLorg/whispersystems/signalservice/internal/websocket/WebSocketConnection;->connect()Lio/reactivex/rxjava3/core/Observable;
-HSPLorg/whispersystems/signalservice/internal/websocket/WebSocketConnection;->createTlsSocketFactory(Lorg/whispersystems/signalservice/api/push/TrustStore;)Lorg/signal/libsignal/protocol/util/Pair;
-HSPLorg/whispersystems/signalservice/internal/websocket/WebSocketConnection;->disconnect()V
-HSPLorg/whispersystems/signalservice/internal/websocket/WebSocketConnection;->elapsedTime(J)J
-HSPLorg/whispersystems/signalservice/internal/websocket/WebSocketConnection;->getConnectionInfo()Lorg/signal/libsignal/protocol/util/Pair;
-HSPLorg/whispersystems/signalservice/internal/websocket/WebSocketConnection;->isDead()Z
-HSPLorg/whispersystems/signalservice/internal/websocket/WebSocketConnection;->log(Ljava/lang/String;)V
-HSPLorg/whispersystems/signalservice/internal/websocket/WebSocketConnection;->onFailure(Lokhttp3/WebSocket;Ljava/lang/Throwable;Lokhttp3/Response;)V
-HSPLorg/whispersystems/signalservice/internal/websocket/WebSocketConnection;->readRequest(J)Lorg/whispersystems/signalservice/internal/websocket/WebSocketRequestMessage;
-HSPLorg/whispersystems/signalservice/internal/websocket/WebSocketConnection;->warn(Ljava/lang/String;Ljava/lang/Throwable;)V
+HSPLorg/whispersystems/signalservice/internal/websocket/OkHttpWebSocketConnection;-><clinit>()V
+HSPLorg/whispersystems/signalservice/internal/websocket/OkHttpWebSocketConnection;-><init>(Ljava/lang/String;Lorg/whispersystems/signalservice/internal/configuration/SignalServiceConfiguration;Lj$/util/Optional;Ljava/lang/String;Lorg/whispersystems/signalservice/api/websocket/HealthMonitor;Ljava/lang/String;Z)V
+HSPLorg/whispersystems/signalservice/internal/websocket/OkHttpWebSocketConnection;-><init>(Ljava/lang/String;Lorg/whispersystems/signalservice/internal/configuration/SignalServiceConfiguration;Lj$/util/Optional;Ljava/lang/String;Lorg/whispersystems/signalservice/api/websocket/HealthMonitor;Z)V
+HSPLorg/whispersystems/signalservice/internal/websocket/OkHttpWebSocketConnection;->cleanupAfterShutdown()V
+HSPLorg/whispersystems/signalservice/internal/websocket/OkHttpWebSocketConnection;->connect()Lio/reactivex/rxjava3/core/Observable;
+HSPLorg/whispersystems/signalservice/internal/websocket/OkHttpWebSocketConnection;->createTlsSocketFactory(Lorg/whispersystems/signalservice/api/push/TrustStore;)Lorg/signal/libsignal/protocol/util/Pair;
+HSPLorg/whispersystems/signalservice/internal/websocket/OkHttpWebSocketConnection;->disconnect()V
+HSPLorg/whispersystems/signalservice/internal/websocket/OkHttpWebSocketConnection;->elapsedTime(J)J
+HSPLorg/whispersystems/signalservice/internal/websocket/OkHttpWebSocketConnection;->getConnectionInfo()Lorg/signal/libsignal/protocol/util/Pair;
+HSPLorg/whispersystems/signalservice/internal/websocket/OkHttpWebSocketConnection;->isDead()Z
+HSPLorg/whispersystems/signalservice/internal/websocket/OkHttpWebSocketConnection;->log(Ljava/lang/String;)V
+HSPLorg/whispersystems/signalservice/internal/websocket/OkHttpWebSocketConnection;->onFailure(Lokhttp3/WebSocket;Ljava/lang/Throwable;Lokhttp3/Response;)V
+HSPLorg/whispersystems/signalservice/internal/websocket/OkHttpWebSocketConnection;->readRequest(J)Lorg/whispersystems/signalservice/internal/websocket/WebSocketRequestMessage;
+HSPLorg/whispersystems/signalservice/internal/websocket/OkHttpWebSocketConnection;->warn(Ljava/lang/String;Ljava/lang/Throwable;)V
 HSPLorg/whispersystems/signalservice/internal/websocket/WebSocketRequestMessage$Builder;-><init>()V
 HSPLorg/whispersystems/signalservice/internal/websocket/WebSocketRequestMessage$Builder;->build()Lorg/whispersystems/signalservice/internal/websocket/WebSocketRequestMessage;
 HSPLorg/whispersystems/signalservice/internal/websocket/WebSocketRequestMessage$Builder;->headers(Ljava/util/List;)Lorg/whispersystems/signalservice/internal/websocket/WebSocketRequestMessage$Builder;
@@ -28724,6 +29199,7 @@ 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;
@@ -28851,8 +29327,10 @@ 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;
 Landroidx/constraintlayout/core/PriorityGoalRow$GoalVariableAccessor;
 Landroidx/constraintlayout/core/PriorityGoalRow;
 Landroidx/constraintlayout/core/SolverVariable$Type;
@@ -28901,9 +29379,11 @@ 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;
@@ -28987,6 +29467,8 @@ 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;
@@ -29127,6 +29609,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;
@@ -29178,6 +29665,8 @@ 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;
@@ -30262,6 +30751,7 @@ Lcom/airbnb/lottie/value/LottieFrameInfo;
 Lcom/airbnb/lottie/value/LottieValueCallback;
 Lcom/airbnb/lottie/value/ScaleXY;
 Lcom/airbnb/lottie/value/SimpleLottieValueCallback;
+Lcom/android/tools/r8/RecordTag;
 Lcom/annimon/stream/Collector;
 Lcom/annimon/stream/Collectors$10;
 Lcom/annimon/stream/Collectors$11;
@@ -30286,6 +30776,9 @@ 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;
@@ -30303,6 +30796,7 @@ 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;
@@ -31012,7 +31506,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;
@@ -31412,6 +31905,8 @@ 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;
@@ -31997,10 +32492,12 @@ 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/e;
@@ -32113,6 +32610,7 @@ Lj$/util/function/BinaryOperator;
 Lj$/util/function/Consumer;
 Lj$/util/function/Function;
 Lj$/util/function/IntFunction;
+Lj$/util/function/LongFunction;
 Lj$/util/function/N;
 Lj$/util/function/Predicate;
 Lj$/util/function/S;
@@ -32120,16 +32618,17 @@ Lj$/util/function/Supplier;
 Lj$/util/function/ToDoubleFunction;
 Lj$/util/function/ToIntFunction;
 Lj$/util/function/ToLongFunction;
-Lj$/util/function/Z;
-Lj$/util/function/g0;
+Lj$/util/function/b;
+Lj$/util/function/e0;
+Lj$/util/function/h0;
 Lj$/util/function/h;
-Lj$/util/function/j0;
-Lj$/util/function/m0;
+Lj$/util/function/k0;
+Lj$/util/function/n0;
 Lj$/util/function/o;
-Lj$/util/function/p0;
 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/C0;
@@ -32139,6 +32638,7 @@ 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;
@@ -32173,6 +32673,8 @@ 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/n;
@@ -33995,6 +34497,7 @@ Lorg/signal/glide/Log$Provider;
 Lorg/signal/glide/SignalGlideCodecs;
 Lorg/signal/glide/apng/decode/APNGDecoder;
 Lorg/signal/glide/common/decode/FrameSeqDecoder;
+Lorg/signal/libsignal/attest/AttestationFailedException;
 Lorg/signal/libsignal/internal/FilterExceptions$ThrowingNativeIntOperation;
 Lorg/signal/libsignal/internal/FilterExceptions$ThrowingNativeLongOperation;
 Lorg/signal/libsignal/internal/FilterExceptions$ThrowingNativeOperation;
@@ -34002,10 +34505,21 @@ Lorg/signal/libsignal/internal/FilterExceptions$ThrowingNativeVoidOperation;
 Lorg/signal/libsignal/internal/FilterExceptions;
 Lorg/signal/libsignal/internal/Native;
 Lorg/signal/libsignal/internal/NativeHandleGuard$Owner;
+Lorg/signal/libsignal/internal/NativeHandleGuard$SimpleOwner;
 Lorg/signal/libsignal/internal/NativeHandleGuard;
+Lorg/signal/libsignal/net/CdsiInvalidTokenException;
 Lorg/signal/libsignal/net/CdsiLookupResponse$Entry;
 Lorg/signal/libsignal/net/CdsiLookupResponse;
+Lorg/signal/libsignal/net/CdsiProtocolException;
+Lorg/signal/libsignal/net/ChatService$DebugInfo;
+Lorg/signal/libsignal/net/ChatService$Response;
+Lorg/signal/libsignal/net/ChatService$ResponseAndDebugInfo;
+Lorg/signal/libsignal/net/ChatService;
+Lorg/signal/libsignal/net/ChatServiceException;
+Lorg/signal/libsignal/net/ChatServiceInactiveException;
 Lorg/signal/libsignal/net/Network$Environment;
+Lorg/signal/libsignal/net/NetworkException;
+Lorg/signal/libsignal/net/RetryLaterException;
 Lorg/signal/libsignal/protocol/IdentityKey;
 Lorg/signal/libsignal/protocol/IdentityKeyPair;
 Lorg/signal/libsignal/protocol/InvalidKeyException;
@@ -34044,16 +34558,20 @@ 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$$ExternalSyntheticLambda1;
 Lorg/signal/libsignal/protocol/state/SignedPreKeyRecord$$ExternalSyntheticLambda2;
 Lorg/signal/libsignal/protocol/state/SignedPreKeyRecord$$ExternalSyntheticLambda3;
 Lorg/signal/libsignal/protocol/state/SignedPreKeyRecord$$ExternalSyntheticLambda4;
+Lorg/signal/libsignal/protocol/state/SignedPreKeyRecord$$ExternalSyntheticLambda5;
 Lorg/signal/libsignal/protocol/state/SignedPreKeyRecord;
 Lorg/signal/libsignal/protocol/state/SignedPreKeyStore;
 Lorg/signal/libsignal/protocol/util/ByteUtil;
 Lorg/signal/libsignal/protocol/util/KeyHelper;
 Lorg/signal/libsignal/protocol/util/Medium;
 Lorg/signal/libsignal/protocol/util/Pair;
+Lorg/signal/libsignal/sgxsession/SgxCommunicationFailureException;
+Lorg/signal/libsignal/svr/DataMissingException;
+Lorg/signal/libsignal/svr/RestoreFailedException;
+Lorg/signal/libsignal/svr/SvrException;
 Lorg/signal/libsignal/usernames/BaseUsernameException;
 Lorg/signal/libsignal/zkgroup/InvalidInputException;
 Lorg/signal/libsignal/zkgroup/ServerPublicParams$$ExternalSyntheticLambda0;
@@ -34071,11 +34589,13 @@ 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;
@@ -34188,11 +34708,15 @@ Lorg/thoughtcrime/securesms/PassphraseRequiredActivity;
 Lorg/thoughtcrime/securesms/R$styleable;
 Lorg/thoughtcrime/securesms/Unbindable;
 Lorg/thoughtcrime/securesms/animation/AnimationCompleteListener;
+Lorg/thoughtcrime/securesms/attachments/ArchivedAttachment;
 Lorg/thoughtcrime/securesms/attachments/Attachment$Companion;
 Lorg/thoughtcrime/securesms/attachments/Attachment;
 Lorg/thoughtcrime/securesms/attachments/AttachmentCreator;
 Lorg/thoughtcrime/securesms/attachments/AttachmentId$Creator;
 Lorg/thoughtcrime/securesms/attachments/AttachmentId;
+Lorg/thoughtcrime/securesms/attachments/Cdn$Serializer;
+Lorg/thoughtcrime/securesms/attachments/Cdn$WhenMappings;
+Lorg/thoughtcrime/securesms/attachments/Cdn;
 Lorg/thoughtcrime/securesms/attachments/DatabaseAttachment$DisplayOrderComparator;
 Lorg/thoughtcrime/securesms/attachments/DatabaseAttachment;
 Lorg/thoughtcrime/securesms/attachments/PointerAttachment$Companion;
@@ -34217,6 +34741,9 @@ 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/badges/BadgeImageView;
 Lorg/thoughtcrime/securesms/badges/gifts/GiftMessageView$Callback;
 Lorg/thoughtcrime/securesms/badges/gifts/OpenableGift;
@@ -34233,6 +34760,11 @@ 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;
@@ -34249,6 +34781,7 @@ 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;
@@ -34258,6 +34791,14 @@ Lorg/thoughtcrime/securesms/components/ConversationItemFooter$$ExternalSynthetic
 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;
@@ -34308,6 +34849,7 @@ 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;
@@ -34320,6 +34862,13 @@ 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;
@@ -34340,6 +34889,8 @@ Lorg/thoughtcrime/securesms/components/emoji/EmojiProvider$1;
 Lorg/thoughtcrime/securesms/components/emoji/EmojiProvider$EmojiDrawable;
 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;
@@ -34359,6 +34910,8 @@ 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;
@@ -34403,6 +34956,22 @@ 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;
@@ -34414,6 +34983,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$KeyClearedReceiver$1;
 Lorg/thoughtcrime/securesms/components/voice/VoiceNotePlaybackService$KeyClearedReceiver;
 Lorg/thoughtcrime/securesms/components/voice/VoiceNotePlaybackService$MediaSessionServiceListener;
@@ -34525,14 +35095,20 @@ 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$1;
 Lorg/thoughtcrime/securesms/conversation/ConversationItem$AttachmentDownloadClickListener;
 Lorg/thoughtcrime/securesms/conversation/ConversationItem$ClickListener;
+Lorg/thoughtcrime/securesms/conversation/ConversationItem$DoubleTapEditTouchListener$1;
+Lorg/thoughtcrime/securesms/conversation/ConversationItem$DoubleTapEditTouchListener;
 Lorg/thoughtcrime/securesms/conversation/ConversationItem$GiftMessageViewCallback;
 Lorg/thoughtcrime/securesms/conversation/ConversationItem$LinkPreviewClickListener;
 Lorg/thoughtcrime/securesms/conversation/ConversationItem$PassthroughClickListener;
@@ -34542,6 +35118,7 @@ Lorg/thoughtcrime/securesms/conversation/ConversationItem$ScheduledIndicatorClic
 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;
@@ -34549,6 +35126,11 @@ 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;
@@ -34573,6 +35155,9 @@ 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;
@@ -34603,6 +35188,7 @@ 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;
@@ -34611,18 +35197,22 @@ 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;
@@ -34680,7 +35270,13 @@ 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;
+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;
@@ -34702,6 +35298,8 @@ 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;
@@ -34733,6 +35331,7 @@ Lorg/thoughtcrime/securesms/conversation/v2/ConversationFragment$observeConversa
 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;
@@ -34763,6 +35362,7 @@ 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;
@@ -34775,8 +35375,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$$ExternalSyntheticLambda11;
-Lorg/thoughtcrime/securesms/conversation/v2/ConversationRepository$$ExternalSyntheticLambda7;
+Lorg/thoughtcrime/securesms/conversation/v2/ConversationRepository$$ExternalSyntheticLambda12;
+Lorg/thoughtcrime/securesms/conversation/v2/ConversationRepository$$ExternalSyntheticLambda8;
 Lorg/thoughtcrime/securesms/conversation/v2/ConversationRepository$Companion;
 Lorg/thoughtcrime/securesms/conversation/v2/ConversationRepository$MessageCounts;
 Lorg/thoughtcrime/securesms/conversation/v2/ConversationRepository$getMessageCounts$1;
@@ -34794,6 +35394,7 @@ 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;
@@ -34824,10 +35425,12 @@ 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;
 Lorg/thoughtcrime/securesms/conversation/v2/DisabledInputView;
+Lorg/thoughtcrime/securesms/conversation/v2/DoubleTapEditEducationSheet$Callback;
 Lorg/thoughtcrime/securesms/conversation/v2/IdentityRecordsState;
 Lorg/thoughtcrime/securesms/conversation/v2/InputReadyState;
 Lorg/thoughtcrime/securesms/conversation/v2/MessageRequestViewModel;
@@ -34840,6 +35443,7 @@ 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;
@@ -34871,11 +35475,9 @@ Lorg/thoughtcrime/securesms/conversation/v2/groups/ConversationGroupCallViewMode
 Lorg/thoughtcrime/securesms/conversation/v2/groups/ConversationGroupCallViewModel$filteredState$2;
 Lorg/thoughtcrime/securesms/conversation/v2/groups/ConversationGroupCallViewModel;
 Lorg/thoughtcrime/securesms/conversation/v2/groups/ConversationGroupViewModel$1;
-Lorg/thoughtcrime/securesms/conversation/v2/groups/ConversationGroupViewModel$2;
-Lorg/thoughtcrime/securesms/conversation/v2/groups/ConversationGroupViewModel$3;
-Lorg/thoughtcrime/securesms/conversation/v2/groups/ConversationGroupViewModel$4;
 Lorg/thoughtcrime/securesms/conversation/v2/groups/ConversationGroupViewModel$Factory;
-Lorg/thoughtcrime/securesms/conversation/v2/groups/ConversationGroupViewModel$duplicates$1;
+Lorg/thoughtcrime/securesms/conversation/v2/groups/ConversationGroupViewModel$_groupRecord$1;
+Lorg/thoughtcrime/securesms/conversation/v2/groups/ConversationGroupViewModel$_groupRecord$2;
 Lorg/thoughtcrime/securesms/conversation/v2/groups/ConversationGroupViewModel$updateGroupStateIfNeeded$1;
 Lorg/thoughtcrime/securesms/conversation/v2/groups/ConversationGroupViewModel$updateGroupStateIfNeeded$2;
 Lorg/thoughtcrime/securesms/conversation/v2/groups/ConversationGroupViewModel;
@@ -34884,10 +35486,44 @@ 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$$ExternalSyntheticLambda8;
+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;
@@ -35056,6 +35692,8 @@ Lorg/thoughtcrime/securesms/crypto/storage/SignalServiceAccountDataStoreImpl;
 Lorg/thoughtcrime/securesms/crypto/storage/SignalServiceDataStoreImpl;
 Lorg/thoughtcrime/securesms/crypto/storage/TextSecurePreKeyStore;
 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$TransformProperties$Companion;
 Lorg/thoughtcrime/securesms/database/AttachmentTable$TransformProperties$Creator;
@@ -35072,6 +35710,7 @@ Lorg/thoughtcrime/securesms/database/CallTable$Event$Serializer;
 Lorg/thoughtcrime/securesms/database/CallTable$Event;
 Lorg/thoughtcrime/securesms/database/CallTable$ReadState$Serializer;
 Lorg/thoughtcrime/securesms/database/CallTable$ReadState;
+Lorg/thoughtcrime/securesms/database/CallTable$markRingingCallsAsMissed$1;
 Lorg/thoughtcrime/securesms/database/CallTable;
 Lorg/thoughtcrime/securesms/database/CdsTable$Companion;
 Lorg/thoughtcrime/securesms/database/CdsTable;
@@ -35081,7 +35720,9 @@ 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$$ExternalSyntheticLambda22;
 Lorg/thoughtcrime/securesms/database/DatabaseObserver$$ExternalSyntheticLambda23;
 Lorg/thoughtcrime/securesms/database/DatabaseObserver$$ExternalSyntheticLambda24;
 Lorg/thoughtcrime/securesms/database/DatabaseObserver$$ExternalSyntheticLambda28;
@@ -35182,6 +35823,7 @@ Lorg/thoughtcrime/securesms/database/MessageTable$QuoteDescriptor;
 Lorg/thoughtcrime/securesms/database/MessageTable$Reader;
 Lorg/thoughtcrime/securesms/database/MessageTable$SyncMessageId;
 Lorg/thoughtcrime/securesms/database/MessageTable$WhenMappings;
+Lorg/thoughtcrime/securesms/database/MessageTable$clearIsRingingOnLocalDeviceFlag$1;
 Lorg/thoughtcrime/securesms/database/MessageTable$getConversationSnippet$1;
 Lorg/thoughtcrime/securesms/database/MessageTable$getOldestStorySendTimestamp$1;
 Lorg/thoughtcrime/securesms/database/MessageTable$insertMediaMessage$3;
@@ -35189,6 +35831,8 @@ Lorg/thoughtcrime/securesms/database/MessageTable;
 Lorg/thoughtcrime/securesms/database/MessageType;
 Lorg/thoughtcrime/securesms/database/MessageTypes$-CC;
 Lorg/thoughtcrime/securesms/database/MessageTypes;
+Lorg/thoughtcrime/securesms/database/NameCollisionTables$Companion;
+Lorg/thoughtcrime/securesms/database/NameCollisionTables;
 Lorg/thoughtcrime/securesms/database/NoExternalStorageException;
 Lorg/thoughtcrime/securesms/database/NoSuchMessageException;
 Lorg/thoughtcrime/securesms/database/NotificationProfileDatabase$Companion;
@@ -35406,14 +36050,18 @@ 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/OnboardingMegaphoneCardBinding;
+Lorg/thoughtcrime/securesms/databinding/TransferControlsViewBinding;
 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/ApplicationDependencyProvider$$ExternalSyntheticLambda0;
@@ -35476,7 +36124,6 @@ Lorg/thoughtcrime/securesms/emoji/EmojiSourceKt;
 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;
@@ -35500,6 +36147,11 @@ 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;
@@ -35671,8 +36323,11 @@ Lorg/thoughtcrime/securesms/jobs/AccountConsistencyWorkerJob$Factory;
 Lorg/thoughtcrime/securesms/jobs/AccountConsistencyWorkerJob;
 Lorg/thoughtcrime/securesms/jobs/AnalyzeDatabaseJob$Factory;
 Lorg/thoughtcrime/securesms/jobs/ApkUpdateJob$Factory;
+Lorg/thoughtcrime/securesms/jobs/ArchiveAttachmentBackfillJob$Factory;
+Lorg/thoughtcrime/securesms/jobs/ArchiveAttachmentJob$Factory;
 Lorg/thoughtcrime/securesms/jobs/AttachmentCompressionJob$Factory;
 Lorg/thoughtcrime/securesms/jobs/AttachmentCopyJob$Factory;
+Lorg/thoughtcrime/securesms/jobs/AttachmentDownloadJob$Companion;
 Lorg/thoughtcrime/securesms/jobs/AttachmentDownloadJob$Factory;
 Lorg/thoughtcrime/securesms/jobs/AttachmentDownloadJob$InvalidPartException;
 Lorg/thoughtcrime/securesms/jobs/AttachmentDownloadJob;
@@ -35682,6 +36337,9 @@ Lorg/thoughtcrime/securesms/jobs/AttachmentUploadJob$Factory;
 Lorg/thoughtcrime/securesms/jobs/AutomaticSessionResetJob$Factory;
 Lorg/thoughtcrime/securesms/jobs/AvatarGroupsV1DownloadJob$Factory;
 Lorg/thoughtcrime/securesms/jobs/AvatarGroupsV2DownloadJob$Factory;
+Lorg/thoughtcrime/securesms/jobs/BackupMessagesJob$Factory;
+Lorg/thoughtcrime/securesms/jobs/BackupRestoreJob$Factory;
+Lorg/thoughtcrime/securesms/jobs/BackupRestoreMediaJob$Factory;
 Lorg/thoughtcrime/securesms/jobs/BaseJob;
 Lorg/thoughtcrime/securesms/jobs/BoostReceiptRequestResponseJob$Factory;
 Lorg/thoughtcrime/securesms/jobs/CallLinkPeekJob$Factory;
@@ -35821,6 +36479,7 @@ Lorg/thoughtcrime/securesms/jobs/RequestGroupV2InfoJob$Factory;
 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/ResumableUploadSpecJob$Factory;
 Lorg/thoughtcrime/securesms/jobs/RetrieveProfileAvatarJob$Factory;
 Lorg/thoughtcrime/securesms/jobs/RetrieveProfileJob$Companion;
@@ -35856,6 +36515,7 @@ 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;
 Lorg/thoughtcrime/securesms/jobs/SyncSystemContactLinksJob$Factory;
 Lorg/thoughtcrime/securesms/jobs/ThreadUpdateJob$$ExternalSyntheticLambda0;
 Lorg/thoughtcrime/securesms/jobs/ThreadUpdateJob$Factory;
@@ -35905,6 +36565,7 @@ Lorg/thoughtcrime/securesms/keyvalue/IntValue;
 Lorg/thoughtcrime/securesms/keyvalue/InternalValues;
 Lorg/thoughtcrime/securesms/keyvalue/KeepMessagesDuration;
 Lorg/thoughtcrime/securesms/keyvalue/KeyValueDataSet;
+Lorg/thoughtcrime/securesms/keyvalue/KeyValueEnumValue;
 Lorg/thoughtcrime/securesms/keyvalue/KeyValuePersistentStorage;
 Lorg/thoughtcrime/securesms/keyvalue/KeyValueProtoValue;
 Lorg/thoughtcrime/securesms/keyvalue/KeyValueReader;
@@ -36137,6 +36798,7 @@ 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;
@@ -36231,6 +36893,7 @@ Lorg/thoughtcrime/securesms/ratelimit/RecaptchaRequiredEvent;
 Lorg/thoughtcrime/securesms/reactions/ReactionsBottomSheetDialogFragment$Callback;
 Lorg/thoughtcrime/securesms/reactions/ReactionsConversationView;
 Lorg/thoughtcrime/securesms/reactions/any/ReactWithAnyEmojiBottomSheetDialogFragment$Callback;
+Lorg/thoughtcrime/securesms/recipients/LiveRecipient$$ExternalSyntheticLambda0;
 Lorg/thoughtcrime/securesms/recipients/LiveRecipient$$ExternalSyntheticLambda2;
 Lorg/thoughtcrime/securesms/recipients/LiveRecipient$$ExternalSyntheticLambda3;
 Lorg/thoughtcrime/securesms/recipients/LiveRecipient$$ExternalSyntheticLambda4;
@@ -36297,6 +36960,8 @@ Lorg/thoughtcrime/securesms/service/ExpiringStoriesManager$Companion;
 Lorg/thoughtcrime/securesms/service/ExpiringStoriesManager;
 Lorg/thoughtcrime/securesms/service/KeyCachingService;
 Lorg/thoughtcrime/securesms/service/LocalBackupListener;
+Lorg/thoughtcrime/securesms/service/MessageBackupListener$Companion;
+Lorg/thoughtcrime/securesms/service/MessageBackupListener;
 Lorg/thoughtcrime/securesms/service/PendingRetryReceiptManager;
 Lorg/thoughtcrime/securesms/service/PersistentAlarmManagerListener;
 Lorg/thoughtcrime/securesms/service/RotateSenderCertificateListener;
@@ -36435,6 +37100,9 @@ Lorg/thoughtcrime/securesms/util/LocalMetrics$$ExternalSyntheticLambda5;
 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;
@@ -36454,6 +37122,7 @@ 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;
@@ -36465,6 +37134,7 @@ 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;
@@ -36480,6 +37150,7 @@ 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;
@@ -36511,6 +37182,7 @@ 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;
@@ -36520,6 +37192,7 @@ 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;
@@ -36602,6 +37275,9 @@ Lorg/whispersystems/signalservice/api/groupsv2/GroupsV2Operations;
 Lorg/whispersystems/signalservice/api/kbs/MasterKey;
 Lorg/whispersystems/signalservice/api/messages/SignalServiceAttachment;
 Lorg/whispersystems/signalservice/api/messages/SignalServiceAttachmentPointer;
+Lorg/whispersystems/signalservice/api/messages/SignalServiceAttachmentRemoteId$Companion;
+Lorg/whispersystems/signalservice/api/messages/SignalServiceAttachmentRemoteId$S3;
+Lorg/whispersystems/signalservice/api/messages/SignalServiceAttachmentRemoteId$V4;
 Lorg/whispersystems/signalservice/api/messages/SignalServiceAttachmentRemoteId;
 Lorg/whispersystems/signalservice/api/payments/Currency$CryptoCurrency;
 Lorg/whispersystems/signalservice/api/payments/Currency;
@@ -36622,6 +37298,7 @@ Lorg/whispersystems/signalservice/api/push/ServiceId;
 Lorg/whispersystems/signalservice/api/push/ServiceIdType;
 Lorg/whispersystems/signalservice/api/push/SignalServiceAddress;
 Lorg/whispersystems/signalservice/api/push/TrustStore;
+Lorg/whispersystems/signalservice/api/push/exceptions/AuthorizationFailedException;
 Lorg/whispersystems/signalservice/api/push/exceptions/ConflictException;
 Lorg/whispersystems/signalservice/api/push/exceptions/ContactManifestMismatchException;
 Lorg/whispersystems/signalservice/api/push/exceptions/MalformedResponseException;
@@ -36676,6 +37353,7 @@ Lorg/whispersystems/signalservice/internal/push/PushServiceSocket$ConnectionHold
 Lorg/whispersystems/signalservice/internal/push/PushServiceSocket$EmptyResponseCodeHandler;
 Lorg/whispersystems/signalservice/internal/push/PushServiceSocket$ResponseCodeHandler;
 Lorg/whispersystems/signalservice/internal/push/PushServiceSocket$ServiceConnectionHolder;
+Lorg/whispersystems/signalservice/internal/push/PushServiceSocket$UnopinionatedResponseCodeHandler;
 Lorg/whispersystems/signalservice/internal/push/PushServiceSocket;
 Lorg/whispersystems/signalservice/internal/push/VerifyAccountResponse;
 Lorg/whispersystems/signalservice/internal/push/exceptions/GroupPatchNotAcceptedException;
@@ -36691,6 +37369,7 @@ Lorg/whispersystems/signalservice/internal/websocket/DefaultResponseMapper$Build
 Lorg/whispersystems/signalservice/internal/websocket/DefaultResponseMapper$CustomResponseMapper;
 Lorg/whispersystems/signalservice/internal/websocket/DefaultResponseMapper;
 Lorg/whispersystems/signalservice/internal/websocket/ErrorMapper;
+Lorg/whispersystems/signalservice/internal/websocket/OkHttpWebSocketConnection;
 Lorg/whispersystems/signalservice/internal/websocket/ResponseMapper;
 Lorg/whispersystems/signalservice/internal/websocket/WebSocketConnection;
 Lorg/whispersystems/signalservice/internal/websocket/WebSocketRequestMessage$Builder;
@@ -36772,7 +37451,6 @@ 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/AppCompatHintHelper;->onCreateInputConnection(Landroid/view/inputmethod/InputConnection;Landroid/view/inputmethod/EditorInfo;Landroid/view/View;)Landroid/view/inputmethod/InputConnection;
 PLandroidx/appcompat/widget/ForwardingListener;->onViewDetachedFromWindow(Landroid/view/View;)V
 PLandroidx/appcompat/widget/ResourceManagerInternal;->addTintListToCache(Landroid/content/Context;ILandroid/content/res/ColorStateList;)V
 PLandroidx/appcompat/widget/ResourceManagerInternal;->getTintMode(I)Landroid/graphics/PorterDuff$Mode;
@@ -36848,10 +37526,6 @@ 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
@@ -36866,12 +37540,9 @@ PLandroidx/core/view/accessibility/AccessibilityEventCompat$Api19Impl;->getConte
 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;->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/poolingcontainer/PoolingContainerListenerHolder;->onRelease()V
 PLandroidx/customview/view/AbsSavedState$1;-><init>()V
 PLandroidx/customview/view/AbsSavedState$2;-><init>()V
@@ -36881,10 +37552,6 @@ 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/SpannableBuilder;->getSpanEnd(Ljava/lang/Object;)I
-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
@@ -36936,6 +37603,7 @@ PLandroidx/fragment/app/FragmentState;->writeToParcel(Landroid/os/Parcel;I)V
 PLandroidx/fragment/app/FragmentStateManager;->destroy()V
 PLandroidx/fragment/app/FragmentStateManager;->destroyFragmentView()V
 PLandroidx/fragment/app/FragmentStateManager;->detach()V
+PLandroidx/fragment/app/FragmentStateManager;->saveState()Landroid/os/Bundle;
 PLandroidx/fragment/app/FragmentStateManager;->saveViewState()V
 PLandroidx/fragment/app/FragmentStateManager;->stop()V
 PLandroidx/fragment/app/FragmentStore;->getAllSavedState()Ljava/util/HashMap;
@@ -37078,7 +37746,7 @@ PLandroidx/profileinstaller/ProfileVerifier;->setCompilationStatus(IZZ)Landroidx
 PLandroidx/profileinstaller/ProfileVerifier;->writeProfileVerification(Landroid/content/Context;Z)Landroidx/profileinstaller/ProfileVerifier$CompilationStatus;
 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/ChildHelper;->removeViewAt(I)V
 PLandroidx/recyclerview/widget/ConcatAdapter;->onDetachedFromRecyclerView(Landroidx/recyclerview/widget/RecyclerView;)V
@@ -37095,6 +37763,8 @@ PLandroidx/recyclerview/widget/DiffUtil$Snake;-><init>()V
 PLandroidx/recyclerview/widget/DiffUtil$Snake;->diagonalSize()I
 PLandroidx/recyclerview/widget/DiffUtil$Snake;->hasAdditionOrRemoval()Z
 PLandroidx/recyclerview/widget/DiffUtil$Snake;->toDiagonal()Landroidx/recyclerview/widget/DiffUtil$Diagonal;
+PLandroidx/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;
+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
@@ -37109,7 +37779,6 @@ PLandroidx/recyclerview/widget/LinearLayoutManager;->getChildClosestToEnd()Landr
 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/OrientationHelper$1;->getDecoratedStart(Landroid/view/View;)I
 PLandroidx/recyclerview/widget/OrientationHelper;->getTotalSpaceChange()I
 PLandroidx/recyclerview/widget/RecyclerView$5;->removeViewAt(I)V
 PLandroidx/recyclerview/widget/RecyclerView$6;->markViewHoldersUpdated(IILjava/lang/Object;)V
@@ -37117,12 +37786,11 @@ PLandroidx/recyclerview/widget/RecyclerView$Adapter;->notifyDataSetChanged()V
 PLandroidx/recyclerview/widget/RecyclerView$Adapter;->onDetachedFromRecyclerView(Landroidx/recyclerview/widget/RecyclerView;)V
 PLandroidx/recyclerview/widget/RecyclerView$Adapter;->onViewDetachedFromWindow(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;)V
 PLandroidx/recyclerview/widget/RecyclerView$AdapterDataObservable;->notifyChanged()V
+PLandroidx/recyclerview/widget/RecyclerView$ItemAnimator;->buildAdapterChangeFlagsForAnimations(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;)I
 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;->dispatchDetachedFromWindow(Landroidx/recyclerview/widget/RecyclerView;Landroidx/recyclerview/widget/RecyclerView$Recycler;)V
-PLandroidx/recyclerview/widget/RecyclerView$LayoutManager;->getDecoratedLeft(Landroid/view/View;)I
-PLandroidx/recyclerview/widget/RecyclerView$LayoutManager;->getLeftDecorationWidth(Landroid/view/View;)I
 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
@@ -37152,6 +37820,7 @@ 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;->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
@@ -37170,6 +37839,7 @@ PLandroidx/recyclerview/widget/ViewInfoStore;->popFromPreLayout(Landroidx/recycl
 PLandroidx/recyclerview/widget/ViewInfoStore;->removeViewHolder(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;)V
 PLandroidx/savedstate/Recreator$SavedStateProvider;-><init>(Landroidx/savedstate/SavedStateRegistry;)V
 PLandroidx/savedstate/Recreator$SavedStateProvider;->add(Ljava/lang/String;)V
+PLandroidx/savedstate/SavedStateRegistry;->performSave(Landroid/os/Bundle;)V
 PLandroidx/savedstate/SavedStateRegistry;->runOnNextRecreation(Ljava/lang/Class;)V
 PLandroidx/savedstate/SavedStateRegistryController;->performSave(Landroid/os/Bundle;)V
 PLcom/airbnb/lottie/LottieAnimationView$SavedState$1;-><init>()V
@@ -37177,19 +37847,11 @@ 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;->onSaveInstanceState()Landroid/os/Parcelable;
-PLcom/airbnb/lottie/LottieDrawable$$ExternalSyntheticLambda9;->run(Lcom/airbnb/lottie/LottieComposition;)V
-PLcom/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
 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/LottieDrawable;->lambda$addValueCallback$14(Lcom/airbnb/lottie/model/KeyPath;Ljava/lang/Object;Lcom/airbnb/lottie/value/LottieValueCallback;Lcom/airbnb/lottie/LottieComposition;)V
-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
@@ -37244,10 +37906,6 @@ 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
@@ -37264,7 +37922,6 @@ PLio/reactivex/rxjava3/core/Maybe;->observeOn(Lio/reactivex/rxjava3/core/Schedul
 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
@@ -37358,7 +38015,6 @@ 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
@@ -37380,7 +38036,6 @@ 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
@@ -37403,9 +38058,13 @@ PLio/reactivex/rxjava3/internal/subscribers/BasicFuseableConditionalSubscriber;-
 PLio/reactivex/rxjava3/internal/subscribers/BasicFuseableSubscriber;->cancel()V
 PLio/reactivex/rxjava3/internal/subscribers/LambdaSubscriber;->cancel()V
 PLio/reactivex/rxjava3/internal/subscribers/LambdaSubscriber;->dispose()V
+PLio/reactivex/rxjava3/internal/util/AppendOnlyLinkedArrayList;-><init>(I)V
+PLio/reactivex/rxjava3/internal/util/AppendOnlyLinkedArrayList;->add(Ljava/lang/Object;)V
+PLio/reactivex/rxjava3/internal/util/AppendOnlyLinkedArrayList;->forEachWhile(Lio/reactivex/rxjava3/internal/util/AppendOnlyLinkedArrayList$NonThrowingPredicate;)V
 PLio/reactivex/rxjava3/internal/util/AtomicThrowable;->terminate()Ljava/lang/Throwable;
 PLio/reactivex/rxjava3/internal/util/AtomicThrowable;->tryTerminateAndReport()V
 PLio/reactivex/rxjava3/internal/util/ExceptionHelper;->terminate(Ljava/util/concurrent/atomic/AtomicReference;)Ljava/lang/Throwable;
+PLio/reactivex/rxjava3/internal/util/NotificationLite;->acceptFull(Ljava/lang/Object;Lio/reactivex/rxjava3/core/Observer;)Z
 PLio/reactivex/rxjava3/internal/util/NotificationLite;->complete()Ljava/lang/Object;
 PLio/reactivex/rxjava3/internal/util/OpenHashSet;->rehash()V
 PLio/reactivex/rxjava3/internal/util/QueueDrainHelper;->checkTerminated(ZZLio/reactivex/rxjava3/core/Observer;ZLio/reactivex/rxjava3/internal/fuseable/SimpleQueue;Lio/reactivex/rxjava3/disposables/Disposable;Lio/reactivex/rxjava3/internal/util/ObservableQueueDrain;)Z
@@ -37424,24 +38083,10 @@ PLio/reactivex/rxjava3/subjects/BehaviorSubject;->onComplete()V
 PLio/reactivex/rxjava3/subjects/BehaviorSubject;->terminate(Ljava/lang/Object;)[Lio/reactivex/rxjava3/subjects/BehaviorSubject$BehaviorDisposable;
 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/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/A1;-><init>(Lj$/util/stream/V2;Ljava/lang/Object;I)V
-PLj$/util/stream/A1;->l1()Lj$/util/stream/P1;
-PLj$/util/stream/E1;-><init>(Lj$/util/function/BinaryOperator;)V
-PLj$/util/stream/E1;->accept(Ljava/lang/Object;)V
-PLj$/util/stream/E1;->get()Ljava/lang/Object;
-PLj$/util/stream/E1;->m()V
-PLj$/util/stream/E1;->n(J)V
-PLj$/util/stream/E1;->q()Z
-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;->n(J)V
-PLj$/util/stream/h2;->q()Z
-PLj$/util/stream/i2;-><init>(Lj$/util/stream/c;IJJ)V
-PLj$/util/stream/i2;->B1(ILj$/util/stream/g2;)Lj$/util/stream/g2;
 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
@@ -37453,6 +38098,7 @@ 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
@@ -37519,24 +38165,12 @@ 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/SignalExecutors;->$r8$lambda$0Q0afsv1raKIrq3aP-SuMcT2Ad0(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/paging/BufferedPagingController$$ExternalSyntheticLambda2;-><init>(Lorg/signal/paging/BufferedPagingController;Ljava/lang/Object;)V
-PLorg/signal/paging/BufferedPagingController$$ExternalSyntheticLambda2;->run()V
-PLorg/signal/paging/BufferedPagingController;->$r8$lambda$GxlLAxjfERBgyqmyvxteAPWaQkA(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$2jZFFAhs3dG0IThMmzJQSvWvcd0(Lorg/signal/paging/FixedSizePagingController;Ljava/lang/Object;)V
 PLorg/signal/paging/FixedSizePagingController;->buildDataNeededLog(ILjava/lang/String;)Ljava/lang/String;
-PLorg/signal/paging/FixedSizePagingController;->onDataItemChanged(Ljava/lang/Object;)V
-PLorg/signal/paging/ProxyPagingController;->onDataItemChanged(Ljava/lang/Object;)V
 PLorg/thoughtcrime/securesms/ApplicationContext$$ExternalSyntheticLambda60;->isInternal()Z
 PLorg/thoughtcrime/securesms/LoggingFragment;->onDestroy()V
 PLorg/thoughtcrime/securesms/LoggingFragment;->onStop()V
@@ -37556,18 +38190,6 @@ 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/components/AlbumThumbnailView$$ExternalSyntheticLambda0;-><init>(Lorg/thoughtcrime/securesms/components/AlbumThumbnailView;Ljava/util/List;)V
-PLorg/thoughtcrime/securesms/components/AlbumThumbnailView$$ExternalSyntheticLambda1;-><init>(Lorg/thoughtcrime/securesms/components/AlbumThumbnailView;Ljava/util/List;)V
-PLorg/thoughtcrime/securesms/components/AlbumThumbnailView$$ExternalSyntheticLambda2;-><init>(Lorg/thoughtcrime/securesms/components/AlbumThumbnailView;)V
-PLorg/thoughtcrime/securesms/components/AlbumThumbnailView$$ExternalSyntheticLambda3;-><init>(Lorg/thoughtcrime/securesms/components/AlbumThumbnailView;)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
@@ -37580,30 +38202,11 @@ PLorg/thoughtcrime/securesms/components/AudioView;->onPlaybackState(Lorg/thought
 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/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;->setCursorPositionChangedListener(Lorg/thoughtcrime/securesms/components/ComposeText$CursorPositionChangedListener;)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;->setStylingChangedListener(Lorg/thoughtcrime/securesms/components/ComposeText$StylingChangedListener;)V
 PLorg/thoughtcrime/securesms/components/ConversationItemFooter;->onDetachedFromWindow()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;->dispatchDraw(Landroid/graphics/Canvas;)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
@@ -37637,16 +38240,8 @@ PLorg/thoughtcrime/securesms/components/LinkPreviewViewThumbnailState;->getDownl
 PLorg/thoughtcrime/securesms/components/MicrophoneRecorderView;->cancelAction(Z)V
 PLorg/thoughtcrime/securesms/components/MicrophoneRecorderView;->isRecordingLocked()Z
 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;->isListCommitted()Z
 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
@@ -37654,23 +38249,6 @@ 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;->hasSameContents(Lorg/thoughtcrime/securesms/mms/Slide;Lorg/thoughtcrime/securesms/mms/Slide;)Z
-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;->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;
@@ -37683,12 +38261,6 @@ PLorg/thoughtcrime/securesms/components/emoji/EmojiProvider$$ExternalSyntheticLa
 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;->lambda$getEmojiDrawable$0(Lorg/thoughtcrime/securesms/components/emoji/EmojiProvider$EmojiDrawable;Lorg/thoughtcrime/securesms/emoji/EmojiPageCache$LoadResult;)V
-PLorg/thoughtcrime/securesms/components/emoji/EmojiTextView$$ExternalSyntheticLambda0;-><init>(Lorg/thoughtcrime/securesms/components/emoji/EmojiTextView;)V
-PLorg/thoughtcrime/securesms/components/emoji/EmojiTextView$$ExternalSyntheticLambda0;->apply(Ljava/lang/Object;)Ljava/lang/Object;
-PLorg/thoughtcrime/securesms/components/emoji/EmojiTextView$$ExternalSyntheticLambda1;-><init>()V
-PLorg/thoughtcrime/securesms/components/mention/MentionAnnotation$$ExternalSyntheticLambda1;-><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/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
@@ -37699,59 +38271,9 @@ 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
@@ -37769,18 +38291,6 @@ 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/ConversationHeaderView$$ExternalSyntheticLambda3;-><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;
@@ -37790,9 +38300,6 @@ 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;->getBadgeImageView()Landroid/view/View;
 PLorg/thoughtcrime/securesms/conversation/ConversationItem;->getBubbleViews()Ljava/util/List;
 PLorg/thoughtcrime/securesms/conversation/ConversationItem;->getContactPhotoHolderView()Landroid/view/View;
@@ -37802,16 +38309,6 @@ PLorg/thoughtcrime/securesms/conversation/ConversationItem;->getReactionsView()L
 PLorg/thoughtcrime/securesms/conversation/ConversationItem;->getReplyView()Landroid/view/View;
 PLorg/thoughtcrime/securesms/conversation/ConversationItem;->onDetachedFromWindow()V
 PLorg/thoughtcrime/securesms/conversation/ConversationItem;->onRecipientChanged(Lorg/thoughtcrime/securesms/recipients/Recipient;)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$$ExternalSyntheticLambda0;-><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
@@ -37823,9 +38320,6 @@ PLorg/thoughtcrime/securesms/conversation/ConversationOptionsMenu$Provider$onCre
 PLorg/thoughtcrime/securesms/conversation/ConversationOptionsMenu$Provider;->applyTitleSpan(Landroid/view/MenuItem;Ljava/lang/Object;)V
 PLorg/thoughtcrime/securesms/conversation/ConversationOptionsMenu$Provider;->hideMenuItem(Landroid/view/Menu;I)V
 PLorg/thoughtcrime/securesms/conversation/ConversationOptionsMenu$Provider;->setAfterFirstRenderMode(Z)V
-PLorg/thoughtcrime/securesms/conversation/ConversationOptionsMenu;-><clinit>()V
-PLorg/thoughtcrime/securesms/conversation/ConversationOptionsMenu;-><init>()V
-PLorg/thoughtcrime/securesms/conversation/ConversationOptionsMenu;->access$getTAG$p()Ljava/lang/String;
 PLorg/thoughtcrime/securesms/conversation/ConversationSearchViewModel;-><init>(Ljava/lang/String;)V
 PLorg/thoughtcrime/securesms/conversation/ConversationSearchViewModel;->getSearchResults()Landroidx/lifecycle/LiveData;
 PLorg/thoughtcrime/securesms/conversation/ConversationStickerSuggestionAdapter;->setStickers(Ljava/util/List;)V
@@ -37858,11 +38352,8 @@ 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$$ExternalSyntheticLambda0;-><init>()V
-PLorg/thoughtcrime/securesms/conversation/MarkReadHelper$$ExternalSyntheticLambda1;-><init>()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;-><init>(Lorg/thoughtcrime/securesms/conversation/MarkReadHelper;J)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
@@ -37894,8 +38385,6 @@ 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/drafts/DraftRepository$$ExternalSyntheticLambda0;-><init>(Lorg/thoughtcrime/securesms/database/DraftTable$Drafts;Lorg/thoughtcrime/securesms/conversation/drafts/DraftRepository;J)V
 PLorg/thoughtcrime/securesms/conversation/drafts/DraftRepository$$ExternalSyntheticLambda0;->run()V
 PLorg/thoughtcrime/securesms/conversation/drafts/DraftRepository$Companion;-><init>()V
@@ -37945,17 +38434,11 @@ 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;->saveDrafts(Lorg/thoughtcrime/securesms/conversation/drafts/DraftState;)Lorg/thoughtcrime/securesms/conversation/drafts/DraftState;
-PLorg/thoughtcrime/securesms/conversation/mutiselect/ConversationItemAnimator$$ExternalSyntheticLambda1;-><init>(Landroidx/recyclerview/widget/RecyclerView;)V
 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;->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;->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
@@ -37991,17 +38474,6 @@ PLorg/thoughtcrime/securesms/conversation/v2/BubbleLayoutTransitionListener;->on
 PLorg/thoughtcrime/securesms/conversation/v2/BubbleLayoutTransitionListener;->onStop(Landroidx/lifecycle/LifecycleOwner;)V
 PLorg/thoughtcrime/securesms/conversation/v2/ConversationActivity;->getVoiceNoteMediaController()Lorg/thoughtcrime/securesms/components/voice/VoiceNoteMediaController;
 PLorg/thoughtcrime/securesms/conversation/v2/ConversationActivity;->onDestroy()V
-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;-><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;
@@ -38059,11 +38531,6 @@ 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$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$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
@@ -38127,7 +38594,6 @@ 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$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$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;
@@ -38203,19 +38669,14 @@ PLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment;->presentReque
 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/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/ConversationRepository$$ExternalSyntheticLambda12;-><init>(JJ)V
-PLorg/thoughtcrime/securesms/conversation/v2/ConversationRepository$$ExternalSyntheticLambda12;->run()V
-PLorg/thoughtcrime/securesms/conversation/v2/ConversationRepository$$ExternalSyntheticLambda15;-><init>(Lorg/thoughtcrime/securesms/conversation/v2/ConversationRepository;Lorg/thoughtcrime/securesms/database/model/GroupRecord;)V
-PLorg/thoughtcrime/securesms/conversation/v2/ConversationRepository$$ExternalSyntheticLambda15;->call()Ljava/lang/Object;
-PLorg/thoughtcrime/securesms/conversation/v2/ConversationRepository$$ExternalSyntheticLambda20;-><init>(Lorg/thoughtcrime/securesms/database/model/GroupRecord;Lorg/thoughtcrime/securesms/messagerequests/MessageRequestState;Lorg/thoughtcrime/securesms/recipients/Recipient;)V
-PLorg/thoughtcrime/securesms/conversation/v2/ConversationRepository$$ExternalSyntheticLambda20;->call()Ljava/lang/Object;
-PLorg/thoughtcrime/securesms/conversation/v2/ConversationRepository$$ExternalSyntheticLambda9;-><init>(J)V
-PLorg/thoughtcrime/securesms/conversation/v2/ConversationRepository$$ExternalSyntheticLambda9;->run()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;
@@ -38240,16 +38701,11 @@ PLorg/thoughtcrime/securesms/conversation/v2/ConversationViewModel$17;->onNext(L
 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;->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;
@@ -38273,7 +38729,6 @@ PLorg/thoughtcrime/securesms/conversation/v2/MotionEventRelay;->setDrain(Lorg/th
 PLorg/thoughtcrime/securesms/conversation/v2/RequestReviewState;-><clinit>()V
 PLorg/thoughtcrime/securesms/conversation/v2/RequestReviewState;-><init>(Lorg/thoughtcrime/securesms/conversation/v2/RequestReviewState$IndividualReviewState;Lorg/thoughtcrime/securesms/conversation/v2/RequestReviewState$GroupReviewState;)V
 PLorg/thoughtcrime/securesms/conversation/v2/RequestReviewState;-><init>(Lorg/thoughtcrime/securesms/conversation/v2/RequestReviewState$IndividualReviewState;Lorg/thoughtcrime/securesms/conversation/v2/RequestReviewState$GroupReviewState;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
-PLorg/thoughtcrime/securesms/conversation/v2/RequestReviewState;->equals(Ljava/lang/Object;)Z
 PLorg/thoughtcrime/securesms/conversation/v2/RequestReviewState;->shouldShowReviewBanner()Z
 PLorg/thoughtcrime/securesms/conversation/v2/ShareDataTimestampViewModel;-><clinit>()V
 PLorg/thoughtcrime/securesms/conversation/v2/ShareDataTimestampViewModel;-><init>()V
@@ -38290,12 +38745,6 @@ 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/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
@@ -38320,136 +38769,21 @@ PLorg/thoughtcrime/securesms/conversation/v2/groups/ConversationGroupCallViewMod
 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;-><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;->isSolidColor()Z
-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/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$$ExternalSyntheticLambda0;-><init>(Lorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTextOnlyViewHolder;)V
-PLorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTextOnlyViewHolder$$ExternalSyntheticLambda0;->onLayoutChange(Landroid/view/View;IIIIIIII)V
-PLorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTextOnlyViewHolder$$ExternalSyntheticLambda1;-><init>(Lorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTextOnlyViewHolder;)V
-PLorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTextOnlyViewHolder$$ExternalSyntheticLambda2;-><init>(Lorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTextOnlyViewHolder;)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$$ExternalSyntheticLambda4;-><init>()V
-PLorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTextOnlyViewHolder$$ExternalSyntheticLambda7;-><init>(Lorg/thoughtcrime/securesms/conversation/ConversationAdapter$ItemClickListener;)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$footerDrawable$1;->invoke()Lorg/thoughtcrime/securesms/conversation/v2/items/ChatColorsDrawable$ChatColorsData;
-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$ocilDMoff9b132TfYhzB6ol1qqk(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;)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;->onPreMeasure()V
-PLorg/thoughtcrime/securesms/conversation/v2/items/V2OnDispatchTouchEventListener$$ExternalSyntheticLambda1;-><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
 PLorg/thoughtcrime/securesms/conversationlist/chatfilter/ConversationListFilterPullView;->onSaveInstanceState()Landroid/os/Parcelable;
+PLorg/thoughtcrime/securesms/database/CallTable$markAllCallEventsWithPeerBeforeTimestampRead$latestCallAsOfTimestamp$1;-><init>(Lorg/thoughtcrime/securesms/recipients/RecipientId;J)V
+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$$ExternalSyntheticLambda1;-><init>(Lorg/thoughtcrime/securesms/database/DatabaseObserver;Lorg/thoughtcrime/securesms/database/DatabaseObserver$Observer;)V
-PLorg/thoughtcrime/securesms/database/DatabaseObserver$$ExternalSyntheticLambda1;->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$$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$6H_TtixOHSa7Tr30medlqcHry2c(Lorg/thoughtcrime/securesms/database/DatabaseObserver;Lorg/thoughtcrime/securesms/database/DatabaseObserver$Observer;)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
@@ -38457,9 +38791,7 @@ PLorg/thoughtcrime/securesms/database/DatabaseObserver;->lambda$registerSchedule
 PLorg/thoughtcrime/securesms/database/DatabaseObserver;->lambda$unregisterObserver$18(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;-><init>(Ljava/util/List;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 PLorg/thoughtcrime/securesms/database/DraftTable$Drafts;->addIfNotNull(Lorg/thoughtcrime/securesms/database/DraftTable$Draft;)V
@@ -38477,10 +38809,12 @@ 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/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
 PLorg/thoughtcrime/securesms/database/ThreadTable$setReadSince$1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
 PLorg/thoughtcrime/securesms/database/ThreadTable$setReadSince$1;->invoke(Lorg/thoughtcrime/securesms/database/SQLiteDatabase;)V
 PLorg/thoughtcrime/securesms/database/ThreadTable;->createQuery(Ljava/lang/String;J)Ljava/lang/String;
+PLorg/thoughtcrime/securesms/database/ThreadTable;->getRecipientIdsForThreadIds(Ljava/util/Collection;)Ljava/util/List;
 PLorg/thoughtcrime/securesms/database/ThreadTable;->getThreadRecord(Ljava/lang/Long;)Lorg/thoughtcrime/securesms/database/model/ThreadRecord;
 PLorg/thoughtcrime/securesms/database/ThreadTable;->setLastSeen(J)V
 PLorg/thoughtcrime/securesms/database/ThreadTable;->setReadSince(JZJ)Ljava/util/List;
@@ -38488,40 +38822,12 @@ PLorg/thoughtcrime/securesms/database/ThreadTable;->setReadSince(Ljava/util/Map;
 PLorg/thoughtcrime/securesms/database/ThreadTable;->setReadSince(Lorg/thoughtcrime/securesms/notifications/v2/ConversationId;ZJ)Ljava/util/List;
 PLorg/thoughtcrime/securesms/database/ThreadTable;->update(JZZ)Z
 PLorg/thoughtcrime/securesms/database/identity/IdentityRecordList;->equals(Ljava/lang/Object;)Z
-PLorg/thoughtcrime/securesms/database/model/StoryViewState$Companion$$ExternalSyntheticLambda3;->cancel()V
-PLorg/thoughtcrime/securesms/database/model/StoryViewState$Companion;->$r8$lambda$_YM1i9V93JIKhbRirbAeb_98VJw(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/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/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;->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
@@ -38534,7 +38840,6 @@ 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
@@ -38566,13 +38871,17 @@ 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/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/mms/SlideDeck$$ExternalSyntheticLambda0;-><init>()V
-PLorg/thoughtcrime/securesms/mms/SlideDeck$$ExternalSyntheticLambda0;->test(Ljava/lang/Object;)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/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;-><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
@@ -38616,9 +38925,9 @@ 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;-><init>(Lorg/thoughtcrime/securesms/recipients/LiveRecipient;Lorg/thoughtcrime/securesms/recipients/RecipientForeverObserver;)V
 PLorg/thoughtcrime/securesms/recipients/LiveRecipient$$ExternalSyntheticLambda0;->run()V
 PLorg/thoughtcrime/securesms/recipients/LiveRecipient$$ExternalSyntheticLambda2;->onChanged(Ljava/lang/Object;)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
@@ -38630,6 +38939,7 @@ PLorg/thoughtcrime/securesms/recipients/LiveRecipient;->lambda$new$0(Lorg/though
 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/Recipient;->getContactUri()Landroid/net/Uri;
 PLorg/thoughtcrime/securesms/recipients/Recipient;->getNotificationChannel()Ljava/lang/String;
 PLorg/thoughtcrime/securesms/service/ExpiringMessageManager$$ExternalSyntheticLambda0;-><init>()V
@@ -38661,21 +38971,12 @@ PLorg/thoughtcrime/securesms/util/LeakyBucketLimiter$$ExternalSyntheticLambda0;-
 PLorg/thoughtcrime/securesms/util/LeakyBucketLimiter;->$r8$lambda$1L8FIPWGmHakh7u9Krsm8K4DSjQ(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;->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/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;
@@ -38684,16 +38985,12 @@ 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;->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/Util;->clamp(FFF)F
 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;
@@ -38711,14 +39008,13 @@ PLorg/thoughtcrime/securesms/util/ViewUtil;->fadeOut(Landroid/view/View;II)Lorg/
 PLorg/thoughtcrime/securesms/util/ViewUtil;->getAlphaAnimation(FFI)Landroid/view/animation/Animation;
 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
 PLorg/thoughtcrime/securesms/util/adapter/mapping/MappingDiffCallback;->areContentsTheSame(Lorg/thoughtcrime/securesms/util/adapter/mapping/MappingModel;Lorg/thoughtcrime/securesms/util/adapter/mapping/MappingModel;)Z
 PLorg/thoughtcrime/securesms/util/adapter/mapping/MappingDiffCallback;->areItemsTheSame(Ljava/lang/Object;Ljava/lang/Object;)Z
 PLorg/thoughtcrime/securesms/util/adapter/mapping/MappingDiffCallback;->areItemsTheSame(Lorg/thoughtcrime/securesms/util/adapter/mapping/MappingModel;Lorg/thoughtcrime/securesms/util/adapter/mapping/MappingModel;)Z
 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/concurrent/SerialMonoLifoExecutor$$ExternalSyntheticLambda0;-><init>(Lorg/thoughtcrime/securesms/util/concurrent/SerialMonoLifoExecutor;Ljava/lang/Runnable;)V
 PLorg/thoughtcrime/securesms/util/concurrent/SerialMonoLifoExecutor$$ExternalSyntheticLambda0;->run()V
@@ -38727,8 +39023,6 @@ PLorg/thoughtcrime/securesms/util/concurrent/SerialMonoLifoExecutor;->enqueue(Lj
 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/Stub;->getVisibility()I
 PLorg/thoughtcrime/securesms/util/views/Stub;->isVisible()Z
diff --git a/app/src/main/java/org/thoughtcrime/securesms/ApplicationContext.java b/app/src/main/java/org/thoughtcrime/securesms/ApplicationContext.java
index 7d1aa25352..15ef16f2cf 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/ApplicationContext.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/ApplicationContext.java
@@ -98,9 +98,10 @@
 import org.thoughtcrime.securesms.service.DirectoryRefreshListener;
 import org.thoughtcrime.securesms.service.KeyCachingService;
 import org.thoughtcrime.securesms.service.LocalBackupListener;
-import org.thoughtcrime.securesms.service.WipeMemoryService;
+import org.thoughtcrime.securesms.service.MessageBackupListener;
 import org.thoughtcrime.securesms.service.RotateSenderCertificateListener;
 import org.thoughtcrime.securesms.service.RotateSignedPreKeyListener;
+import org.thoughtcrime.securesms.service.WipeMemoryService;
 import org.thoughtcrime.securesms.service.webrtc.ActiveCallManager;
 import org.thoughtcrime.securesms.service.webrtc.AndroidTelecomUtil;
 import org.thoughtcrime.securesms.storage.StorageSyncHelper;
@@ -551,6 +552,7 @@ private void initializePeriodicTasks() {
     RotateSignedPreKeyListener.schedule(this);
     DirectoryRefreshListener.schedule(this);
     LocalBackupListener.schedule(this);
+    MessageBackupListener.schedule(this);
     RotateSenderCertificateListener.schedule(this);
     RoutineMessageFetchReceiver.startOrUpdateAlarm(this);
     AnalyzeDatabaseAlarmListener.schedule(this);
diff --git a/app/src/main/java/org/thoughtcrime/securesms/BindableConversationItem.java b/app/src/main/java/org/thoughtcrime/securesms/BindableConversationItem.java
index 2049bcebf2..7bfba91dec 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/BindableConversationItem.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/BindableConversationItem.java
@@ -1,6 +1,7 @@
 package org.thoughtcrime.securesms;
 
 import android.net.Uri;
+import android.view.GestureDetector;
 import android.view.View;
 
 import androidx.annotation.NonNull;
@@ -58,6 +59,10 @@ void bind(@NonNull LifecycleOwner lifecycleOwner,
 
   void setEventListener(@Nullable EventListener listener);
 
+  default void setGestureDetector(@Nullable GestureDetector gestureDetector) {
+    // Intentionally Blank.
+  }
+
   default void setParentScrolling(boolean isParentScrolling) {
     // Intentionally Blank.
   }
@@ -124,5 +129,6 @@ interface EventListener {
     void onShowSafetyTips(boolean forGroup);
     void onReportSpamLearnMoreClicked();
     void onMessageRequestAcceptOptionsClicked();
+    void onItemDoubleClick(MultiselectPart multiselectPart);
   }
 }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/PassphraseRequiredActivity.java b/app/src/main/java/org/thoughtcrime/securesms/PassphraseRequiredActivity.java
index 5a793e45a2..fe6b6e0812 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/PassphraseRequiredActivity.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/PassphraseRequiredActivity.java
@@ -19,6 +19,7 @@
 import org.thoughtcrime.securesms.crypto.MasterSecretUtil;
 import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
 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,8 +29,11 @@
 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.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.TextSecurePreferences;
 
 import java.util.Locale;
@@ -51,6 +55,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 BroadcastReceiver          clearKeyReceiver;
 
@@ -123,10 +128,12 @@ protected <T extends Fragment> T initFragment(@IdRes int target,
   }
 
   private void routeApplicationState(boolean locked) {
-    Intent intent = getIntentForState(getApplicationState(locked));
+    final int applicationState = getApplicationState(locked);
+    Intent    intent           = getIntentForState(applicationState);
     if (intent == null || (intent.getComponent() != null && getLocalClassName().equals(intent.getComponent().getClassName()))) {
       return;
     }
+    Log.d(TAG, "routeApplicationState(), intent: " + intent.getComponent());
     startActivity(intent);
     finish();
   }
@@ -145,6 +152,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();
       default:                        return null;
     }
   }
@@ -158,6 +166,8 @@ 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()) {
@@ -202,7 +212,11 @@ private Intent getUiBlockingUpgradeIntent() {
   }
 
   private Intent getPushRegistrationIntent() {
-    return RegistrationNavigationActivity.newIntentForNewRegistration(this, getIntent());
+    if (FeatureFlags.registrationV2()) {
+      return RegistrationV2Activity.newIntentForNewRegistration(this, getIntent());
+    } else {
+      return RegistrationNavigationActivity.newIntentForNewRegistration(this, getIntent());
+    }
   }
 
   private Intent getEnterSignalPinIntent() {
@@ -221,6 +235,11 @@ private Intent getCreateSignalPinIntent() {
     return getRoutedIntent(CreateSvrPinActivity.class, intent);
   }
 
+  private Intent getRestoreIntent() {
+    Intent intent = RestoreActivity.getIntentForRestore(this);
+    return getRoutedIntent(intent, getIntent());
+  }
+
   private Intent getCreateProfileNameIntent() {
     Intent intent = CreateProfileActivity.getIntentForUserProfile(this);
     return getRoutedIntent(intent, getIntent());
diff --git a/app/src/main/java/org/thoughtcrime/securesms/WebRtcCallActivity.java b/app/src/main/java/org/thoughtcrime/securesms/WebRtcCallActivity.java
index 83eb8b24ff..1b4adcee97 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/WebRtcCallActivity.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/WebRtcCallActivity.java
@@ -36,6 +36,7 @@
 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;
@@ -62,6 +63,7 @@
 import org.thoughtcrime.securesms.components.webrtc.CallOverflowPopupWindow;
 import org.thoughtcrime.securesms.components.webrtc.CallParticipantsListUpdatePopupWindow;
 import org.thoughtcrime.securesms.components.webrtc.CallParticipantsState;
+import org.thoughtcrime.securesms.components.webrtc.CallReactionScrubber;
 import org.thoughtcrime.securesms.components.webrtc.CallStateUpdatePopupWindow;
 import org.thoughtcrime.securesms.components.webrtc.CallToastPopupWindow;
 import org.thoughtcrime.securesms.components.webrtc.GroupCallSafetyNumberChangeNotificationUtil;
@@ -225,6 +227,8 @@ public void onCreate(Bundle savedInstanceState) {
 
     processIntent(getIntent());
 
+    registerSystemPipChangeListeners();
+
     windowLayoutInfoConsumer = new WindowLayoutInfoConsumer();
 
     windowInfoTrackerCallbackAdapter = new WindowInfoTrackerCallbackAdapter(WindowInfoTracker.getOrCreate(this));
@@ -237,6 +241,13 @@ public void onCreate(Bundle savedInstanceState) {
     WindowUtil.setNavigationBarColor(this, ContextCompat.getColor(this, R.color.signal_dark_colorSurface));
   }
 
+  private void registerSystemPipChangeListeners() {
+    addOnPictureInPictureModeChangedListener(pictureInPictureModeChangedInfo -> {
+      CallParticipantsListDialog.dismiss(getSupportFragmentManager());
+      CallReactionScrubber.dismissCustomEmojiBottomSheet(getSupportFragmentManager());
+    });
+  }
+
   @Override
   protected void onStart() {
     super.onStart();
@@ -375,8 +386,6 @@ private boolean enterPipModeIfPossible() {
           return false;
         }
 
-        CallParticipantsListDialog.dismiss(getSupportFragmentManager());
-
         return true;
       }
       if (Build.VERSION.SDK_INT >= 31) {
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 2b4692b95f..43bb72f15e 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/absbackup/SignalBackupAgent.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/absbackup/SignalBackupAgent.kt
@@ -54,6 +54,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.")
   }
 
   private fun cumulativeHashCode(): Int {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/attachments/ArchivedAttachment.kt b/app/src/main/java/org/thoughtcrime/securesms/attachments/ArchivedAttachment.kt
new file mode 100644
index 0000000000..bda906d2a8
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/attachments/ArchivedAttachment.kt
@@ -0,0 +1,90 @@
+/*
+ * Copyright 2024 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.thoughtcrime.securesms.attachments
+
+import android.net.Uri
+import android.os.Parcel
+import org.signal.core.util.Base64
+import org.thoughtcrime.securesms.blurhash.BlurHash
+import org.thoughtcrime.securesms.database.AttachmentTable
+
+class ArchivedAttachment : Attachment {
+
+  @JvmField
+  val archiveCdn: Int
+
+  @JvmField
+  val archiveMediaName: String
+
+  @JvmField
+  val archiveMediaId: String
+
+  constructor(
+    contentType: String?,
+    size: Long,
+    cdn: Int,
+    key: ByteArray,
+    cdnKey: String?,
+    archiveCdn: Int?,
+    archiveMediaName: String,
+    archiveMediaId: String,
+    digest: ByteArray,
+    incrementalMac: ByteArray?,
+    incrementalMacChunkSize: Int?,
+    width: Int?,
+    height: Int?,
+    caption: String?,
+    blurHash: String?,
+    voiceNote: Boolean,
+    borderless: Boolean,
+    gif: Boolean,
+    quote: Boolean
+  ) : super(
+    contentType = contentType ?: "",
+    quote = quote,
+    transferState = AttachmentTable.TRANSFER_NEEDS_RESTORE,
+    size = size,
+    fileName = null,
+    cdn = Cdn.fromCdnNumber(cdn),
+    remoteLocation = cdnKey,
+    remoteKey = Base64.encodeWithoutPadding(key),
+    remoteDigest = digest,
+    incrementalDigest = incrementalMac,
+    fastPreflightId = null,
+    voiceNote = voiceNote,
+    borderless = borderless,
+    videoGif = gif,
+    width = width ?: 0,
+    height = height ?: 0,
+    incrementalMacChunkSize = incrementalMacChunkSize ?: 0,
+    uploadTimestamp = 0,
+    caption = caption,
+    stickerLocator = null,
+    blurHash = BlurHash.parseOrNull(blurHash),
+    audioHash = null,
+    transformProperties = null
+  ) {
+    this.archiveCdn = archiveCdn ?: Cdn.CDN_3.cdnNumber
+    this.archiveMediaName = archiveMediaName
+    this.archiveMediaId = archiveMediaId
+  }
+
+  constructor(parcel: Parcel) : super(parcel) {
+    archiveCdn = parcel.readInt()
+    archiveMediaName = parcel.readString()!!
+    archiveMediaId = parcel.readString()!!
+  }
+
+  override fun writeToParcel(dest: Parcel, flags: Int) {
+    super.writeToParcel(dest, flags)
+    dest.writeInt(archiveCdn)
+    dest.writeString(archiveMediaName)
+    dest.writeString(archiveMediaId)
+  }
+
+  override val uri: Uri? = null
+  override val publicUri: Uri? = null
+}
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 0330e91e6c..8d88953e76 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/attachments/Attachment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/attachments/Attachment.kt
@@ -29,7 +29,7 @@ abstract class Attachment(
   @JvmField
   val fileName: String?,
   @JvmField
-  val cdnNumber: Int,
+  val cdn: Cdn,
   @JvmField
   val remoteLocation: String?,
   @JvmField
@@ -76,7 +76,7 @@ abstract class Attachment(
     transferState = parcel.readInt(),
     size = parcel.readLong(),
     fileName = parcel.readString(),
-    cdnNumber = parcel.readInt(),
+    cdn = Cdn.deserialize(parcel.readInt()),
     remoteLocation = parcel.readString(),
     remoteKey = parcel.readString(),
     remoteDigest = ParcelUtil.readByteArray(parcel),
@@ -103,7 +103,7 @@ abstract class Attachment(
     dest.writeInt(transferState)
     dest.writeLong(size)
     dest.writeString(fileName)
-    dest.writeInt(cdnNumber)
+    dest.writeInt(cdn.serialize())
     dest.writeString(remoteLocation)
     dest.writeString(remoteKey)
     ParcelUtil.writeByteArray(dest, remoteDigest)
diff --git a/app/src/main/java/org/thoughtcrime/securesms/attachments/AttachmentCreator.kt b/app/src/main/java/org/thoughtcrime/securesms/attachments/AttachmentCreator.kt
index e70b2b61cf..4a9b2ae5cc 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/attachments/AttachmentCreator.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/attachments/AttachmentCreator.kt
@@ -17,7 +17,8 @@ object AttachmentCreator : Parcelable.Creator<Attachment> {
     DATABASE(DatabaseAttachment::class.java, "database"),
     POINTER(PointerAttachment::class.java, "pointer"),
     TOMBSTONE(TombstoneAttachment::class.java, "tombstone"),
-    URI(UriAttachment::class.java, "uri")
+    URI(UriAttachment::class.java, "uri"),
+    ARCHIVED(ArchivedAttachment::class.java, "archived")
   }
 
   @JvmStatic
@@ -34,6 +35,7 @@ object AttachmentCreator : Parcelable.Creator<Attachment> {
       Subclass.POINTER -> PointerAttachment(source)
       Subclass.TOMBSTONE -> TombstoneAttachment(source)
       Subclass.URI -> UriAttachment(source)
+      Subclass.ARCHIVED -> ArchivedAttachment(source)
     }
   }
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/attachments/AttachmentUploadUtil.kt b/app/src/main/java/org/thoughtcrime/securesms/attachments/AttachmentUploadUtil.kt
new file mode 100644
index 0000000000..3423a8150a
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/attachments/AttachmentUploadUtil.kt
@@ -0,0 +1,105 @@
+/*
+ * Copyright 2024 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.thoughtcrime.securesms.attachments
+
+import android.content.Context
+import android.graphics.Bitmap
+import android.os.Build
+import org.signal.core.util.logging.Log
+import org.signal.protos.resumableuploads.ResumableUpload
+import org.thoughtcrime.securesms.blurhash.BlurHashEncoder
+import org.thoughtcrime.securesms.mms.PartAuthority
+import org.thoughtcrime.securesms.util.MediaUtil
+import org.whispersystems.signalservice.api.messages.SignalServiceAttachment
+import org.whispersystems.signalservice.api.messages.SignalServiceAttachment.ProgressListener
+import org.whispersystems.signalservice.api.messages.SignalServiceAttachmentStream
+import org.whispersystems.signalservice.internal.push.http.ResumableUploadSpec
+import java.io.IOException
+import java.util.Objects
+
+/**
+ * A place collect common attachment upload operations to allow for code reuse.
+ */
+object AttachmentUploadUtil {
+
+  private val TAG = Log.tag(AttachmentUploadUtil::class.java)
+
+  /**
+   * Builds a [SignalServiceAttachmentStream] from the provided data, which can then be provided to various upload methods.
+   */
+  @Throws(IOException::class)
+  fun buildSignalServiceAttachmentStream(
+    context: Context,
+    attachment: Attachment,
+    uploadSpec: ResumableUpload,
+    cancellationSignal: (() -> Boolean)? = null,
+    progressListener: ProgressListener? = null
+  ): SignalServiceAttachmentStream {
+    val inputStream = PartAuthority.getAttachmentStream(context, attachment.uri!!)
+    val builder = SignalServiceAttachment.newStreamBuilder()
+      .withStream(inputStream)
+      .withContentType(attachment.contentType)
+      .withLength(attachment.size)
+      .withFileName(attachment.fileName)
+      .withVoiceNote(attachment.voiceNote)
+      .withBorderless(attachment.borderless)
+      .withGif(attachment.videoGif)
+      .withFaststart(attachment.transformProperties?.mp4FastStart ?: false)
+      .withWidth(attachment.width)
+      .withHeight(attachment.height)
+      .withUploadTimestamp(System.currentTimeMillis())
+      .withCaption(attachment.caption)
+      .withResumableUploadSpec(ResumableUploadSpec.from(uploadSpec))
+      .withCancelationSignal(cancellationSignal)
+      .withListener(progressListener)
+
+    if (MediaUtil.isImageType(attachment.contentType)) {
+      builder.withBlurHash(getImageBlurHash(context, attachment))
+    } else if (MediaUtil.isVideoType(attachment.contentType)) {
+      builder.withBlurHash(getVideoBlurHash(context, attachment))
+    }
+
+    return builder.build()
+  }
+
+  @Throws(IOException::class)
+  private fun getImageBlurHash(context: Context, attachment: Attachment): String? {
+    if (attachment.blurHash != null) {
+      return attachment.blurHash!!.hash
+    }
+
+    if (attachment.uri == null) {
+      return null
+    }
+
+    return PartAuthority.getAttachmentStream(context, attachment.uri!!).use { inputStream ->
+      BlurHashEncoder.encode(inputStream)
+    }
+  }
+
+  @Throws(IOException::class)
+  private fun getVideoBlurHash(context: Context, attachment: Attachment): String? {
+    if (attachment.blurHash != null) {
+      return attachment.blurHash.hash
+    }
+
+    if (Build.VERSION.SDK_INT < 23) {
+      Log.w(TAG, "Video thumbnails not supported...")
+      return null
+    }
+
+    return MediaUtil.getVideoThumbnail(context, Objects.requireNonNull(attachment.uri), 1000)?.let { bitmap ->
+      val thumb = Bitmap.createScaledBitmap(bitmap, 100, 100, false)
+      bitmap.recycle()
+
+      Log.i(TAG, "Generated video thumbnail...")
+      val hash = BlurHashEncoder.encode(thumb)
+      thumb.recycle()
+
+      hash
+    }
+  }
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/attachments/Cdn.kt b/app/src/main/java/org/thoughtcrime/securesms/attachments/Cdn.kt
new file mode 100644
index 0000000000..9131944d47
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/attachments/Cdn.kt
@@ -0,0 +1,53 @@
+/*
+ * Copyright 2024 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.thoughtcrime.securesms.attachments
+
+import org.signal.core.util.IntSerializer
+
+/**
+ * Attachments/media can come from and go to multiple CDN locations depending on when and where
+ * they were uploaded. This class represents the CDNs where attachments/media can live.
+ */
+enum class Cdn(private val value: Int) {
+  S3(-1),
+  CDN_0(0),
+  CDN_2(2),
+  CDN_3(3);
+
+  val cdnNumber: Int
+    get() {
+      return when (this) {
+        S3 -> -1
+        CDN_0 -> 0
+        CDN_2 -> 2
+        CDN_3 -> 3
+      }
+    }
+
+  fun serialize(): Int {
+    return Serializer.serialize(this)
+  }
+
+  companion object Serializer : IntSerializer<Cdn> {
+    override fun serialize(data: Cdn): Int {
+      return data.value
+    }
+
+    override fun deserialize(data: Int): Cdn {
+      return values().first { it.value == data }
+    }
+
+    fun fromCdnNumber(cdnNumber: Int): Cdn {
+      return when (cdnNumber) {
+        -1 -> S3
+        0 -> CDN_0
+        2 -> CDN_2
+        3 -> CDN_3
+        else -> throw UnsupportedOperationException()
+      }
+    }
+  }
+}
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 1fb11a06e2..1c0f4bfc30 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/attachments/DatabaseAttachment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/attachments/DatabaseAttachment.kt
@@ -25,6 +25,15 @@ class DatabaseAttachment : Attachment {
   @JvmField
   val dataHash: String?
 
+  @JvmField
+  val archiveCdn: Int
+
+  @JvmField
+  val archiveMediaName: String?
+
+  @JvmField
+  val archiveMediaId: String?
+
   private val hasThumbnail: Boolean
   val displayOrder: Int
 
@@ -37,7 +46,7 @@ class DatabaseAttachment : Attachment {
     transferProgress: Int,
     size: Long,
     fileName: String?,
-    cdnNumber: Int,
+    cdn: Cdn,
     location: String?,
     key: String?,
     digest: ByteArray?,
@@ -57,13 +66,16 @@ class DatabaseAttachment : Attachment {
     transformProperties: TransformProperties?,
     displayOrder: Int,
     uploadTimestamp: Long,
-    dataHash: String?
+    dataHash: String?,
+    archiveCdn: Int,
+    archiveMediaName: String?,
+    archiveMediaId: String?
   ) : super(
     contentType = contentType!!,
     transferState = transferProgress,
     size = size,
     fileName = fileName,
-    cdnNumber = cdnNumber,
+    cdn = cdn,
     remoteLocation = location,
     remoteKey = key,
     remoteDigest = digest,
@@ -88,6 +100,9 @@ class DatabaseAttachment : Attachment {
     this.dataHash = dataHash
     this.hasThumbnail = hasThumbnail
     this.displayOrder = displayOrder
+    this.archiveCdn = archiveCdn
+    this.archiveMediaName = archiveMediaName
+    this.archiveMediaId = archiveMediaId
   }
 
   constructor(parcel: Parcel) : super(parcel) {
@@ -97,6 +112,9 @@ class DatabaseAttachment : Attachment {
     hasThumbnail = ParcelUtil.readBoolean(parcel)
     mmsId = parcel.readLong()
     displayOrder = parcel.readInt()
+    archiveCdn = parcel.readInt()
+    archiveMediaName = parcel.readString()
+    archiveMediaId = parcel.readString()
   }
 
   override fun writeToParcel(dest: Parcel, flags: Int) {
@@ -107,6 +125,9 @@ class DatabaseAttachment : Attachment {
     ParcelUtil.writeBoolean(dest, hasThumbnail)
     dest.writeLong(mmsId)
     dest.writeInt(displayOrder)
+    dest.writeInt(archiveCdn)
+    dest.writeString(archiveMediaName)
+    dest.writeString(archiveMediaId)
   }
 
   override val uri: Uri?
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 66175b0a33..6b988cf75f 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/attachments/PointerAttachment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/attachments/PointerAttachment.kt
@@ -9,7 +9,6 @@ import org.thoughtcrime.securesms.database.AttachmentTable
 import org.thoughtcrime.securesms.stickers.StickerLocator
 import org.whispersystems.signalservice.api.InvalidMessageStructureException
 import org.whispersystems.signalservice.api.messages.SignalServiceAttachment
-import org.whispersystems.signalservice.api.messages.SignalServiceDataMessage
 import org.whispersystems.signalservice.api.util.AttachmentPointerUtil
 import org.whispersystems.signalservice.internal.push.DataMessage
 import java.util.Optional
@@ -21,7 +20,7 @@ class PointerAttachment : Attachment {
     transferState: Int,
     size: Long,
     fileName: String?,
-    cdnNumber: Int,
+    cdn: Cdn,
     location: String,
     key: String?,
     digest: ByteArray?,
@@ -42,7 +41,7 @@ class PointerAttachment : Attachment {
     transferState = transferState,
     size = size,
     fileName = fileName,
-    cdnNumber = cdnNumber,
+    cdn = cdn,
     remoteLocation = location,
     remoteKey = key,
     remoteDigest = digest,
@@ -83,7 +82,7 @@ class PointerAttachment : Attachment {
 
     @JvmStatic
     @JvmOverloads
-    fun forPointer(pointer: Optional<SignalServiceAttachment>, stickerLocator: StickerLocator? = null, fastPreflightId: String? = null): Optional<Attachment> {
+    fun forPointer(pointer: Optional<SignalServiceAttachment>, stickerLocator: StickerLocator? = null, fastPreflightId: String? = null, transferState: Int = AttachmentTable.TRANSFER_PROGRESS_PENDING): Optional<Attachment> {
       if (!pointer.isPresent || !pointer.get().isPointer) {
         return Optional.empty()
       }
@@ -97,10 +96,10 @@ class PointerAttachment : Attachment {
       return Optional.of(
         PointerAttachment(
           contentType = pointer.get().contentType,
-          transferState = AttachmentTable.TRANSFER_PROGRESS_PENDING,
+          transferState = transferState,
           size = pointer.get().asPointer().size.orElse(0).toLong(),
           fileName = pointer.get().asPointer().fileName.orElse(null),
-          cdnNumber = pointer.get().asPointer().cdnNumber,
+          cdn = Cdn.fromCdnNumber(pointer.get().asPointer().cdnNumber),
           location = pointer.get().asPointer().remoteId.toString(),
           key = encodedKey,
           digest = pointer.get().asPointer().digest.orElse(null),
@@ -120,35 +119,6 @@ class PointerAttachment : Attachment {
       )
     }
 
-    fun forPointer(pointer: SignalServiceDataMessage.Quote.QuotedAttachment): Optional<Attachment> {
-      val thumbnail = pointer.thumbnail
-
-      return Optional.of(
-        PointerAttachment(
-          contentType = pointer.contentType,
-          transferState = AttachmentTable.TRANSFER_PROGRESS_PENDING,
-          size = (if (thumbnail != null) thumbnail.asPointer().size.orElse(0) else 0).toLong(),
-          fileName = pointer.fileName,
-          cdnNumber = thumbnail?.asPointer()?.cdnNumber ?: 0,
-          location = thumbnail?.asPointer()?.remoteId?.toString() ?: "0",
-          key = if (thumbnail != null && thumbnail.asPointer().key != null) encodeWithPadding(thumbnail.asPointer().key) else null,
-          digest = thumbnail?.asPointer()?.digest?.orElse(null),
-          incrementalDigest = thumbnail?.asPointer()?.incrementalDigest?.orElse(null),
-          incrementalMacChunkSize = thumbnail?.asPointer()?.incrementalMacChunkSize ?: 0,
-          fastPreflightId = null,
-          voiceNote = false,
-          borderless = false,
-          videoGif = false,
-          width = thumbnail?.asPointer()?.width ?: 0,
-          height = thumbnail?.asPointer()?.height ?: 0,
-          uploadTimestamp = thumbnail?.asPointer()?.uploadTimestamp ?: 0,
-          caption = thumbnail?.asPointer()?.caption?.orElse(null),
-          stickerLocator = null,
-          blurHash = null
-        )
-      )
-    }
-
     fun forPointer(quotedAttachment: DataMessage.Quote.QuotedAttachment): Optional<Attachment> {
       val thumbnail: SignalServiceAttachment? = try {
         if (quotedAttachment.thumbnail != null) {
@@ -166,7 +136,7 @@ class PointerAttachment : Attachment {
           transferState = AttachmentTable.TRANSFER_PROGRESS_PENDING,
           size = (if (thumbnail != null) thumbnail.asPointer().size.orElse(0) else 0).toLong(),
           fileName = quotedAttachment.fileName,
-          cdnNumber = thumbnail?.asPointer()?.cdnNumber ?: 0,
+          cdn = Cdn.fromCdnNumber(thumbnail?.asPointer()?.cdnNumber ?: 0),
           location = thumbnail?.asPointer()?.remoteId?.toString() ?: "0",
           key = if (thumbnail != null && thumbnail.asPointer().key != null) encodeWithPadding(thumbnail.asPointer().key) else null,
           digest = thumbnail?.asPointer()?.digest?.orElse(null),
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 ef7a371ff0..efbf88b404 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/attachments/TombstoneAttachment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/attachments/TombstoneAttachment.kt
@@ -2,6 +2,7 @@ package org.thoughtcrime.securesms.attachments
 
 import android.net.Uri
 import android.os.Parcel
+import org.thoughtcrime.securesms.blurhash.BlurHash
 import org.thoughtcrime.securesms.database.AttachmentTable
 
 /**
@@ -17,7 +18,7 @@ class TombstoneAttachment : Attachment {
     transferState = AttachmentTable.TRANSFER_PROGRESS_DONE,
     size = 0,
     fileName = null,
-    cdnNumber = 0,
+    cdn = Cdn.CDN_0,
     remoteLocation = null,
     remoteKey = null,
     remoteDigest = null,
@@ -37,6 +38,44 @@ class TombstoneAttachment : Attachment {
     transformProperties = null
   )
 
+  constructor(
+    contentType: String?,
+    incrementalMac: ByteArray?,
+    incrementalMacChunkSize: Int?,
+    width: Int?,
+    height: Int?,
+    caption: String?,
+    blurHash: String?,
+    voiceNote: Boolean = false,
+    borderless: Boolean = false,
+    gif: Boolean = false,
+    quote: Boolean
+  ) : super(
+    contentType = contentType ?: "",
+    quote = quote,
+    transferState = AttachmentTable.TRANSFER_PROGRESS_PERMANENT_FAILURE,
+    size = 0,
+    fileName = null,
+    cdn = Cdn.CDN_0,
+    remoteLocation = null,
+    remoteKey = null,
+    remoteDigest = null,
+    incrementalDigest = incrementalMac,
+    fastPreflightId = null,
+    voiceNote = voiceNote,
+    borderless = borderless,
+    videoGif = gif,
+    width = width ?: 0,
+    height = height ?: 0,
+    incrementalMacChunkSize = incrementalMacChunkSize ?: 0,
+    uploadTimestamp = 0,
+    caption = caption,
+    stickerLocator = null,
+    blurHash = BlurHash.parseOrNull(blurHash),
+    audioHash = null,
+    transformProperties = null
+  )
+
   constructor(parcel: Parcel) : super(parcel)
 
   override val uri: Uri? = null
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 f158bd367a..39e3f02a18 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/attachments/UriAttachment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/attachments/UriAttachment.kt
@@ -69,7 +69,7 @@ class UriAttachment : Attachment {
     transferState = transferState,
     size = size,
     fileName = fileName,
-    cdnNumber = 0,
+    cdn = Cdn.CDN_0,
     remoteLocation = null,
     remoteKey = null,
     remoteDigest = null,
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 08f8f179c9..54d9e7fe6f 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/backup/FullBackupExporter.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/backup/FullBackupExporter.java
@@ -36,6 +36,7 @@
 import org.thoughtcrime.securesms.database.OneTimePreKeyTable;
 import org.thoughtcrime.securesms.database.PendingRetryReceiptTable;
 import org.thoughtcrime.securesms.database.ReactionTable;
+import org.thoughtcrime.securesms.database.RemappedRecordTables;
 import org.thoughtcrime.securesms.database.SearchTable;
 import org.thoughtcrime.securesms.database.SenderKeyTable;
 import org.thoughtcrime.securesms.database.SenderKeySharedTable;
@@ -91,7 +92,9 @@ public class FullBackupExporter extends FullBackupBase {
       SenderKeyTable.TABLE_NAME,
       SenderKeySharedTable.TABLE_NAME,
       PendingRetryReceiptTable.TABLE_NAME,
-      AvatarPickerDatabase.TABLE_NAME
+      AvatarPickerDatabase.TABLE_NAME,
+      RemappedRecordTables.Recipients.TABLE_NAME,
+      RemappedRecordTables.Threads.TABLE_NAME
   );
 
   public static BackupEvent export(@NonNull Context context,
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 0afc5e578f..6cb122097e 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/backup/FullBackupImporter.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/backup/FullBackupImporter.java
@@ -39,6 +39,7 @@
 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;
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/backup/RestoreState.kt b/app/src/main/java/org/thoughtcrime/securesms/backup/RestoreState.kt
new file mode 100644
index 0000000000..4b7110748b
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/backup/RestoreState.kt
@@ -0,0 +1,36 @@
+/*
+ * Copyright 2024 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.thoughtcrime.securesms.backup
+
+import org.signal.core.util.LongSerializer
+
+enum class RestoreState(val id: Int, val inProgress: Boolean) {
+  FAILED(-1, false),
+  NONE(0, false),
+  PENDING(1, true),
+  RESTORING_DB(2, true),
+  RESTORING_MEDIA(3, true);
+
+  companion object {
+    val serializer: LongSerializer<RestoreState> = Serializer()
+  }
+
+  class Serializer : LongSerializer<RestoreState> {
+    override fun serialize(data: RestoreState): Long {
+      return data.id.toLong()
+    }
+
+    override fun deserialize(data: Long): RestoreState {
+      return when (data.toInt()) {
+        FAILED.id -> FAILED
+        PENDING.id -> PENDING
+        RESTORING_DB.id -> RESTORING_DB
+        RESTORING_MEDIA.id -> RESTORING_MEDIA
+        else -> NONE
+      }
+    }
+  }
+}
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 38680114eb..8193585d4b 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Signal Messenger, LLC
+ * Copyright 2024 Signal Messenger, LLC
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 
@@ -14,6 +14,8 @@ 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.profiles.ProfileKey
+import org.thoughtcrime.securesms.attachments.AttachmentId
+import org.thoughtcrime.securesms.attachments.Cdn
 import org.thoughtcrime.securesms.attachments.DatabaseAttachment
 import org.thoughtcrime.securesms.backup.v2.database.ChatItemImportInserter
 import org.thoughtcrime.securesms.backup.v2.database.clearAllDataForBackupRestore
@@ -35,19 +37,24 @@ import org.thoughtcrime.securesms.jobs.RequestGroupV2InfoJob
 import org.thoughtcrime.securesms.keyvalue.SignalStore
 import org.thoughtcrime.securesms.recipients.RecipientId
 import org.whispersystems.signalservice.api.NetworkResult
+import org.whispersystems.signalservice.api.StatusCodeErrorAction
 import org.whispersystems.signalservice.api.archive.ArchiveGetMediaItemsResponse
 import org.whispersystems.signalservice.api.archive.ArchiveMediaRequest
-import org.whispersystems.signalservice.api.archive.ArchiveMediaResponse
 import org.whispersystems.signalservice.api.archive.ArchiveServiceCredential
-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.backup.BackupKey
+import org.whispersystems.signalservice.api.backup.MediaName
 import org.whispersystems.signalservice.api.crypto.AttachmentCipherStreamUtil
+import org.whispersystems.signalservice.api.messages.SignalServiceAttachment.ProgressListener
 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.http.ResumableUploadSpec
 import java.io.ByteArrayOutputStream
+import java.io.File
 import java.io.InputStream
+import java.io.OutputStream
 import kotlin.time.Duration.Companion.milliseconds
 
 object BackupRepository {
@@ -55,10 +62,15 @@ object BackupRepository {
   private val TAG = Log.tag(BackupRepository::class.java)
   private const val VERSION = 1L
 
-  fun export(plaintext: Boolean = false): ByteArray {
-    val eventTimer = EventTimer()
+  private val resetInitializedStateErrorAction: StatusCodeErrorAction = { error ->
+    if (error.code == 401) {
+      Log.i(TAG, "Resetting initialized state due to 401.")
+      SignalStore.backup().backupsInitialized = false
+    }
+  }
 
-    val outputStream = ByteArrayOutputStream()
+  fun export(outputStream: OutputStream, append: (ByteArray) -> Unit, plaintext: Boolean = false) {
+    val eventTimer = EventTimer()
     val writer: BackupExportWriter = if (plaintext) {
       PlainTextBackupWriter(outputStream)
     } else {
@@ -66,11 +78,11 @@ object BackupRepository {
         key = SignalStore.svr().getOrCreateMasterKey().deriveBackupKey(),
         aci = SignalStore.account().aci!!,
         outputStream = outputStream,
-        append = { mac -> outputStream.write(mac) }
+        append = append
       )
     }
 
-    val exportState = ExportState(System.currentTimeMillis())
+    val exportState = ExportState(backupTime = System.currentTimeMillis(), allowMediaBackup = true)
 
     writer.use {
       writer.write(
@@ -110,7 +122,11 @@ object BackupRepository {
     }
 
     Log.d(TAG, "export() ${eventTimer.stop().summary}")
+  }
 
+  fun export(plaintext: Boolean = false): ByteArray {
+    val outputStream = ByteArrayOutputStream()
+    export(outputStream = outputStream, append = { mac -> outputStream.write(mac) }, plaintext = plaintext)
     return outputStream.toByteArray()
   }
 
@@ -124,11 +140,13 @@ object BackupRepository {
   fun import(length: Long, inputStreamFactory: () -> InputStream, selfData: SelfData, plaintext: Boolean = false) {
     val eventTimer = EventTimer()
 
+    val backupKey = SignalStore.svr().getOrCreateMasterKey().deriveBackupKey()
+
     val frameReader = if (plaintext) {
       PlainTextBackupReader(inputStreamFactory())
     } else {
       EncryptedBackupReader(
-        key = SignalStore.svr().getOrCreateMasterKey().deriveBackupKey(),
+        key = backupKey,
         aci = selfData.aci,
         streamLength = length,
         dataStream = inputStreamFactory
@@ -160,7 +178,7 @@ object BackupRepository {
       SignalDatabase.recipients.setProfileSharing(selfId, true)
 
       eventTimer.emit("setup")
-      val backupState = BackupState()
+      val backupState = BackupState(backupKey)
       val chatItemInserter: ChatItemImportInserter = ChatItemBackupProcessor.beginImport(backupState)
 
       for (frame in frameReader) {
@@ -215,6 +233,16 @@ object BackupRepository {
     Log.d(TAG, "import() ${eventTimer.stop().summary}")
   }
 
+  fun listRemoteMediaObjects(limit: Int, cursor: String? = null): NetworkResult<ArchiveGetMediaItemsResponse> {
+    val api = ApplicationDependencies.getSignalServiceAccountManager().archiveApi
+    val backupKey = SignalStore.svr().getOrCreateMasterKey().deriveBackupKey()
+
+    return initBackupAndFetchAuth(backupKey)
+      .then { credential ->
+        api.getArchiveMediaItemsPage(backupKey, credential, limit, cursor)
+      }
+  }
+
   /**
    * Returns an object with details about the remote backup state.
    */
@@ -222,14 +250,7 @@ object BackupRepository {
     val api = ApplicationDependencies.getSignalServiceAccountManager().archiveApi
     val backupKey = SignalStore.svr().getOrCreateMasterKey().deriveBackupKey()
 
-    return api
-      .triggerBackupIdReservation(backupKey)
-      .then { getAuthCredential() }
-      .then { credential ->
-        api.setPublicKey(backupKey, credential)
-          .also { Log.i(TAG, "PublicKeyResult: $it") }
-          .map { credential }
-      }
+    return initBackupAndFetchAuth(backupKey)
       .then { credential ->
         api.getBackupInfo(backupKey, credential)
           .map { it to credential }
@@ -256,14 +277,7 @@ object BackupRepository {
     val api = ApplicationDependencies.getSignalServiceAccountManager().archiveApi
     val backupKey = SignalStore.svr().getOrCreateMasterKey().deriveBackupKey()
 
-    return api
-      .triggerBackupIdReservation(backupKey)
-      .then { getAuthCredential() }
-      .then { credential ->
-        api.setPublicKey(backupKey, credential)
-          .also { Log.i(TAG, "PublicKeyResult: $it") }
-          .map { credential }
-      }
+    return initBackupAndFetchAuth(backupKey)
       .then { credential ->
         api.getMessageBackupUploadForm(backupKey, credential)
           .also { Log.i(TAG, "UploadFormResult: $it") }
@@ -281,6 +295,22 @@ object BackupRepository {
       .also { Log.i(TAG, "OverallResult: $it") } is NetworkResult.Success
   }
 
+  fun downloadBackupFile(destination: File, listener: ProgressListener? = null): Boolean {
+    val api = ApplicationDependencies.getSignalServiceAccountManager().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 } }
+      .map { pair ->
+        val (cdnCredentials, info) = pair
+        val messageReceiver = ApplicationDependencies.getSignalServiceMessageReceiver()
+        messageReceiver.retrieveBackup(info.cdn!!, cdnCredentials, "backups/${info.backupDir}/${info.backupName}", destination, listener)
+      } is NetworkResult.Success
+  }
+
   /**
    * Returns an object with details about the remote backup state.
    */
@@ -288,60 +318,143 @@ object BackupRepository {
     val api = ApplicationDependencies.getSignalServiceAccountManager().archiveApi
     val backupKey = SignalStore.svr().getOrCreateMasterKey().deriveBackupKey()
 
-    return api
-      .triggerBackupIdReservation(backupKey)
-      .then { getAuthCredential() }
+    return initBackupAndFetchAuth(backupKey)
       .then { credential ->
         api.debugGetUploadedMediaItemMetadata(backupKey, credential)
       }
   }
 
-  fun archiveMedia(attachment: DatabaseAttachment): NetworkResult<ArchiveMediaResponse> {
+  /**
+   * Retrieves an upload spec that can be used to upload attachment media.
+   */
+  fun getMediaUploadSpec(): NetworkResult<ResumableUploadSpec> {
     val api = ApplicationDependencies.getSignalServiceAccountManager().archiveApi
     val backupKey = SignalStore.svr().getOrCreateMasterKey().deriveBackupKey()
 
-    return api
-      .triggerBackupIdReservation(backupKey)
-      .then { getAuthCredential() }
+    return initBackupAndFetchAuth(backupKey)
       .then { credential ->
-        api.archiveAttachmentMedia(
-          backupKey = backupKey,
-          serviceCredential = credential,
-          item = attachment.toArchiveMediaRequest(backupKey)
-        )
+        api.getMediaUploadForm(backupKey, credential)
+      }
+      .then { form ->
+        api.getResumableUploadSpec(form)
+      }
+  }
+
+  fun archiveMedia(attachment: DatabaseAttachment): NetworkResult<Unit> {
+    val api = ApplicationDependencies.getSignalServiceAccountManager().archiveApi
+    val backupKey = SignalStore.svr().getOrCreateMasterKey().deriveBackupKey()
+
+    return initBackupAndFetchAuth(backupKey)
+      .then { credential ->
+        api.setPublicKey(backupKey, credential)
+          .map { credential }
       }
-      .also { Log.i(TAG, "backupMediaResult: $it") }
+      .then { credential ->
+        val mediaName = attachment.getMediaName()
+        val request = attachment.toArchiveMediaRequest(mediaName, backupKey)
+        api
+          .archiveAttachmentMedia(
+            backupKey = backupKey,
+            serviceCredential = credential,
+            item = request
+          )
+          .map { Triple(mediaName, request.mediaId, it) }
+      }
+      .map { (mediaName, mediaId, response) ->
+        SignalDatabase.attachments.setArchiveData(attachmentId = attachment.attachmentId, archiveCdn = response.cdn, archiveMediaName = mediaName.name, archiveMediaId = mediaId)
+      }
+      .also { Log.i(TAG, "archiveMediaResult: $it") }
   }
 
-  fun archiveMedia(attachments: List<DatabaseAttachment>): NetworkResult<BatchArchiveMediaResponse> {
+  fun archiveMedia(databaseAttachments: List<DatabaseAttachment>): NetworkResult<BatchArchiveMediaResult> {
     val api = ApplicationDependencies.getSignalServiceAccountManager().archiveApi
     val backupKey = SignalStore.svr().getOrCreateMasterKey().deriveBackupKey()
 
-    return api
-      .triggerBackupIdReservation(backupKey)
-      .then { getAuthCredential() }
+    return initBackupAndFetchAuth(backupKey)
       .then { credential ->
-        api.archiveAttachmentMedia(
+        val requests = mutableListOf<ArchiveMediaRequest>()
+        val mediaIdToAttachmentId = mutableMapOf<String, AttachmentId>()
+        val attachmentIdToMediaName = mutableMapOf<AttachmentId, String>()
+
+        databaseAttachments.forEach {
+          val mediaName = it.getMediaName()
+          val request = it.toArchiveMediaRequest(mediaName, backupKey)
+          requests += request
+          mediaIdToAttachmentId[request.mediaId] = it.attachmentId
+          attachmentIdToMediaName[it.attachmentId] = mediaName.name
+        }
+
+        api
+          .archiveAttachmentMedia(
+            backupKey = backupKey,
+            serviceCredential = credential,
+            items = requests
+          )
+          .map { BatchArchiveMediaResult(it, mediaIdToAttachmentId, attachmentIdToMediaName) }
+      }
+      .map { result ->
+        result
+          .successfulResponses
+          .forEach {
+            val attachmentId = result.mediaIdToAttachmentId(it.mediaId)
+            val mediaName = result.attachmentIdToMediaName(attachmentId)
+            SignalDatabase.attachments.setArchiveData(attachmentId = attachmentId, archiveCdn = it.cdn!!, archiveMediaName = mediaName, archiveMediaId = it.mediaId)
+          }
+        result
+      }
+      .also { Log.i(TAG, "archiveMediaResult: $it") }
+  }
+
+  fun deleteArchivedMedia(attachments: List<DatabaseAttachment>): NetworkResult<Unit> {
+    val api = ApplicationDependencies.getSignalServiceAccountManager().archiveApi
+    val backupKey = SignalStore.svr().getOrCreateMasterKey().deriveBackupKey()
+
+    val mediaToDelete = attachments
+      .filter { it.archiveMediaId != null }
+      .map {
+        DeleteArchivedMediaRequest.ArchivedMediaObject(
+          cdn = it.archiveCdn,
+          mediaId = it.archiveMediaId!!
+        )
+      }
+
+    if (mediaToDelete.isEmpty()) {
+      Log.i(TAG, "No media to delete, quick success")
+      return NetworkResult.Success(Unit)
+    }
+
+    return initBackupAndFetchAuth(backupKey)
+      .then { credential ->
+        api.deleteArchivedMedia(
           backupKey = backupKey,
           serviceCredential = credential,
-          items = attachments.map { it.toArchiveMediaRequest(backupKey) }
+          mediaToDelete = mediaToDelete
         )
       }
-      .also { Log.i(TAG, "backupMediaResult: $it") }
+      .map {
+        SignalDatabase.attachments.clearArchiveData(attachments.map { it.attachmentId })
+      }
+      .also { Log.i(TAG, "deleteArchivedMediaResult: $it") }
   }
 
-  fun deleteArchivedMedia(attachments: List<DatabaseAttachment>): NetworkResult<Unit> {
+  fun deleteAbandonedMediaObjects(mediaObjects: Collection<ArchivedMediaObject>): NetworkResult<Unit> {
     val api = ApplicationDependencies.getSignalServiceAccountManager().archiveApi
     val backupKey = SignalStore.svr().getOrCreateMasterKey().deriveBackupKey()
 
-    val mediaToDelete = attachments.map {
-      DeleteArchivedMediaRequest.ArchivedMediaObject(
-        cdn = 3, // TODO [cody] store and reuse backup cdn returned from copy/move call
-        mediaId = backupKey.deriveMediaId(Base64.decode(it.dataHash!!)).toString()
-      )
+    val mediaToDelete = mediaObjects
+      .map {
+        DeleteArchivedMediaRequest.ArchivedMediaObject(
+          cdn = it.cdn,
+          mediaId = it.mediaId
+        )
+      }
+
+    if (mediaToDelete.isEmpty()) {
+      Log.i(TAG, "No media to delete, quick success")
+      return NetworkResult.Success(Unit)
     }
 
-    return getAuthCredential()
+    return initBackupAndFetchAuth(backupKey)
       .then { credential ->
         api.deleteArchivedMedia(
           backupKey = backupKey,
@@ -349,7 +462,123 @@ object BackupRepository {
           mediaToDelete = mediaToDelete
         )
       }
-      .also { Log.i(TAG, "deleteBackupMediaResult: $it") }
+      .also { Log.i(TAG, "deleteAbandonedMediaObjectsResult: $it") }
+  }
+
+  fun debugDeleteAllArchivedMedia(): NetworkResult<Unit> {
+    val api = ApplicationDependencies.getSignalServiceAccountManager().archiveApi
+    val backupKey = SignalStore.svr().getOrCreateMasterKey().deriveBackupKey()
+
+    return debugGetArchivedMediaState()
+      .then { archivedMedia ->
+        val mediaToDelete = archivedMedia
+          .map {
+            DeleteArchivedMediaRequest.ArchivedMediaObject(
+              cdn = it.cdn,
+              mediaId = it.mediaId
+            )
+          }
+
+        if (mediaToDelete.isEmpty()) {
+          Log.i(TAG, "No media to delete, quick success")
+          NetworkResult.Success(Unit)
+        } else {
+          getAuthCredential()
+            .then { credential ->
+              api.deleteArchivedMedia(
+                backupKey = backupKey,
+                serviceCredential = credential,
+                mediaToDelete = mediaToDelete
+              )
+            }
+        }
+      }
+      .map {
+        SignalDatabase.attachments.clearAllArchiveData()
+      }
+      .also { Log.i(TAG, "debugDeleteAllArchivedMediaResult: $it") }
+  }
+
+  /**
+   * Retrieve credentials for reading from the backup cdn.
+   */
+  fun getCdnReadCredentials(cdnNumber: Int): NetworkResult<GetArchiveCdnCredentialsResponse> {
+    val cached = SignalStore.backup().cdnReadCredentials
+    if (cached != null) {
+      return NetworkResult.Success(cached)
+    }
+
+    val api = ApplicationDependencies.getSignalServiceAccountManager().archiveApi
+    val backupKey = SignalStore.svr().getOrCreateMasterKey().deriveBackupKey()
+
+    return initBackupAndFetchAuth(backupKey)
+      .then { credential ->
+        api.getCdnReadCredentials(
+          cdnNumber = cdnNumber,
+          backupKey = backupKey,
+          serviceCredential = credential
+        )
+      }
+      .also {
+        if (it is NetworkResult.Success) {
+          SignalStore.backup().cdnReadCredentials = it.result
+        }
+      }
+      .also { Log.i(TAG, "getCdnReadCredentialsResult: $it") }
+  }
+
+  /**
+   * 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
+
+    if (cachedBackupDirectory != null && cachedBackupMediaDirectory != null) {
+      return NetworkResult.Success(
+        BackupDirectories(
+          backupDir = cachedBackupDirectory,
+          mediaDir = cachedBackupMediaDirectory
+        )
+      )
+    }
+
+    val api = ApplicationDependencies.getSignalServiceAccountManager().archiveApi
+    val backupKey = SignalStore.svr().getOrCreateMasterKey().deriveBackupKey()
+
+    return initBackupAndFetchAuth(backupKey)
+      .then { credential ->
+        api.getBackupInfo(backupKey, credential).map {
+          BackupDirectories(it.backupDir!!, it.mediaDir!!)
+        }
+      }
+      .also {
+        if (it is NetworkResult.Success) {
+          SignalStore.backup().cachedBackupDirectory = it.result.backupDir
+          SignalStore.backup().cachedBackupMediaDirectory = it.result.mediaDir
+        }
+      }
+  }
+
+  /**
+   * 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
+
+    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 }
+        .runOnStatusCodeError(resetInitializedStateErrorAction)
+    }
   }
 
   /**
@@ -380,15 +609,20 @@ object BackupRepository {
     val profileKey: ProfileKey
   )
 
-  private fun DatabaseAttachment.toArchiveMediaRequest(backupKey: BackupKey): ArchiveMediaRequest {
-    val mediaSecrets = backupKey.deriveMediaSecrets(Base64.decode(dataHash!!))
+  fun DatabaseAttachment.getMediaName(): MediaName {
+    return MediaName.fromDigest(remoteDigest!!)
+  }
+
+  private fun DatabaseAttachment.toArchiveMediaRequest(mediaName: MediaName, backupKey: BackupKey): ArchiveMediaRequest {
+    val mediaSecrets = backupKey.deriveMediaSecrets(mediaName)
+
     return ArchiveMediaRequest(
       sourceAttachment = ArchiveMediaRequest.SourceAttachment(
-        cdn = cdnNumber,
+        cdn = cdn.cdnNumber,
         key = remoteLocation!!
       ),
       objectLength = AttachmentCipherStreamUtil.getCiphertextLength(PaddingInputStream.getPaddedSize(size)).toInt(),
-      mediaId = mediaSecrets.id.toString(),
+      mediaId = mediaSecrets.id.encode(),
       hmacKey = Base64.encodeWithPadding(mediaSecrets.macKey),
       encryptionKey = Base64.encodeWithPadding(mediaSecrets.cipherKey),
       iv = Base64.encodeWithPadding(mediaSecrets.iv)
@@ -396,12 +630,16 @@ object BackupRepository {
   }
 }
 
-class ExportState(val backupTime: Long) {
+data class ArchivedMediaObject(val mediaId: String, val cdn: Int)
+
+data class BackupDirectories(val backupDir: String, val mediaDir: String)
+
+class ExportState(val backupTime: Long, val allowMediaBackup: Boolean) {
   val recipientIds = HashSet<Long>()
   val threadIds = HashSet<Long>()
 }
 
-class BackupState {
+class BackupState(val backupKey: BackupKey) {
   val backupToLocalRecipientId = HashMap<Long, RecipientId>()
   val chatIdToLocalThreadId = HashMap<Long, Long>()
   val chatIdToLocalRecipientId = HashMap<Long, RecipientId>()
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
new file mode 100644
index 0000000000..0a716f3363
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/BackupRestoreManager.kt
@@ -0,0 +1,46 @@
+/*
+ * Copyright 2024 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.thoughtcrime.securesms.backup.v2
+
+import org.signal.core.util.concurrent.SignalExecutors
+import org.thoughtcrime.securesms.attachments.AttachmentId
+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
+
+/**
+ * Responsible for managing logic around restore prioritization
+ */
+object BackupRestoreManager {
+
+  private val reprioritizedAttachments: HashSet<AttachmentId> = HashSet()
+
+  /**
+   * Raise priority of all attachments for the included message records.
+   *
+   * This is so we can make certain attachments get downloaded more quickly
+   */
+  fun prioritizeAttachmentsIfNeeded(messageRecords: List<MessageRecord>) {
+    SignalExecutors.BOUNDED.execute {
+      synchronized(this) {
+        val restoringAttachments: List<AttachmentId> = 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 }
+
+        reprioritizedAttachments += restoringAttachments
+
+        if (restoringAttachments.isNotEmpty()) {
+          RestoreAttachmentJob.modifyPriorities(restoringAttachments.toSet(), 1)
+        }
+      }
+    }
+  }
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/BatchArchiveMediaResult.kt b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/BatchArchiveMediaResult.kt
new file mode 100644
index 0000000000..a8a14b02c9
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/BatchArchiveMediaResult.kt
@@ -0,0 +1,39 @@
+/*
+ * Copyright 2024 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.thoughtcrime.securesms.backup.v2
+
+import org.thoughtcrime.securesms.attachments.AttachmentId
+import org.whispersystems.signalservice.api.archive.BatchArchiveMediaResponse
+
+/**
+ * Result of attempting to batch copy multiple attachments at once with helpers for
+ * processing the collection of mini-responses.
+ */
+data class BatchArchiveMediaResult(
+  private val response: BatchArchiveMediaResponse,
+  private val mediaIdToAttachmentId: Map<String, AttachmentId>,
+  private val attachmentIdToMediaName: Map<AttachmentId, String>
+) {
+  val successfulResponses: Sequence<BatchArchiveMediaResponse.BatchArchiveMediaItemResponse>
+    get() = response
+      .responses
+      .asSequence()
+      .filter { it.status == 200 }
+
+  val sourceNotFoundResponses: Sequence<BatchArchiveMediaResponse.BatchArchiveMediaItemResponse>
+    get() = response
+      .responses
+      .asSequence()
+      .filter { it.status == 410 }
+
+  fun mediaIdToAttachmentId(mediaId: String): AttachmentId {
+    return mediaIdToAttachmentId[mediaId]!!
+  }
+
+  fun attachmentIdToMediaName(attachmentId: AttachmentId): String {
+    return attachmentIdToMediaName[attachmentId]!!
+  }
+}
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 6813fce25b..f6646be505 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
@@ -17,7 +17,9 @@ import org.signal.core.util.requireBoolean
 import org.signal.core.util.requireInt
 import org.signal.core.util.requireLong
 import org.signal.core.util.requireString
+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.CallChatUpdate
 import org.thoughtcrime.securesms.backup.v2.proto.ChatItem
 import org.thoughtcrime.securesms.backup.v2.proto.ChatUpdateMessage
@@ -36,6 +38,7 @@ import org.thoughtcrime.securesms.backup.v2.proto.SimpleChatUpdate
 import org.thoughtcrime.securesms.backup.v2.proto.StandardMessage
 import org.thoughtcrime.securesms.backup.v2.proto.Text
 import org.thoughtcrime.securesms.backup.v2.proto.ThreadMergeChatUpdate
+import org.thoughtcrime.securesms.database.AttachmentTable
 import org.thoughtcrime.securesms.database.GroupReceiptTable
 import org.thoughtcrime.securesms.database.MessageTable
 import org.thoughtcrime.securesms.database.MessageTypes
@@ -73,7 +76,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) : 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)
@@ -139,6 +142,7 @@ class ChatItemExportIterator(private val cursor: Cursor, private val batchSize:
           builder.expiresInMs = null
         }
         MessageTypes.isProfileChange(record.type) -> {
+          if (record.body == null) continue
           builder.updateMessage = ChatUpdateMessage(
             profileChange = try {
               val decoded: ByteArray = Base64.decode(record.body!!)
@@ -196,6 +200,7 @@ class ChatItemExportIterator(private val cursor: Cursor, private val batchSize:
           }
         }
         MessageTypes.isCallLog(record.type) -> {
+          builder.sms = false
           val call = calls.getCallByMessageId(record.id)
           if (call != null) {
             builder.updateMessage = ChatUpdateMessage(callingMessage = CallChatUpdate(callId = call.callId))
@@ -228,12 +233,23 @@ class ChatItemExportIterator(private val cursor: Cursor, private val batchSize:
                     .withoutNulls()
                     .map { obj: UUID? -> ACI.from(obj!!).toByteString() }
                     .toList()
+
+                  val localUserJoined: GroupCallChatUpdate.LocalUserJoined = if (groupCallUpdateDetails.localUserJoined) {
+                    GroupCallChatUpdate.LocalUserJoined.JOINED
+                  } else if (groupCallUpdateDetails.endedCallTimestamp == 0L) {
+                    GroupCallChatUpdate.LocalUserJoined.UNKNOWN
+                  } else {
+                    GroupCallChatUpdate.LocalUserJoined.DID_NOT_JOIN
+                  }
+
                   builder.updateMessage = ChatUpdateMessage(
                     callingMessage = CallChatUpdate(
                       groupCall = GroupCallChatUpdate(
                         startedCallAci = ACI.from(UuidUtil.parseOrThrow(groupCallUpdateDetails.startedCallUuid)).toByteString(),
                         startedCallTimestamp = groupCallUpdateDetails.startedCallTimestamp,
-                        inCallAcis = joinedMembers
+                        inCallAcis = joinedMembers,
+                        localUserJoined = localUserJoined,
+                        endedCallTimestamp = groupCallUpdateDetails.endedCallTimestamp
                       )
                     )
                   )
@@ -354,24 +370,46 @@ class ChatItemExportIterator(private val cursor: Cursor, private val batchSize:
   }
 
   private fun DatabaseAttachment.toBackupAttachment(): MessageAttachment {
+    val builder = FilePointer.Builder()
+    builder.contentType = contentType
+    builder.incrementalMac = incrementalDigest?.toByteString()
+    builder.incrementalMacChunkSize = incrementalMacChunkSize
+    builder.fileName = fileName
+    builder.width = width
+    builder.height = height
+    builder.caption = caption
+    builder.blurHash = blurHash?.hash
+
+    if (remoteKey.isNullOrBlank() || remoteDigest == null || size == 0L) {
+      builder.invalidAttachmentLocator = FilePointer.InvalidAttachmentLocator()
+    } else {
+      if (archiveMedia) {
+        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(),
+          size = this.size.toInt(),
+          digest = remoteDigest.toByteString()
+        )
+      } else {
+        if (remoteLocation.isNullOrBlank()) {
+          builder.invalidAttachmentLocator = FilePointer.InvalidAttachmentLocator()
+        } else {
+          builder.attachmentLocator = FilePointer.AttachmentLocator(
+            cdnKey = this.remoteLocation,
+            cdnNumber = this.cdn.cdnNumber,
+            uploadTimestamp = this.uploadTimestamp,
+            key = decode(remoteKey).toByteString(),
+            size = this.size.toInt(),
+            digest = remoteDigest.toByteString()
+          )
+        }
+      }
+    }
     return MessageAttachment(
-      pointer = FilePointer(
-        attachmentLocator = FilePointer.AttachmentLocator(
-          cdnKey = this.remoteLocation ?: "",
-          cdnNumber = this.cdnNumber,
-          uploadTimestamp = this.uploadTimestamp
-        ),
-        key = if (remoteKey != null) decode(remoteKey).toByteString() else null,
-        contentType = this.contentType,
-        size = this.size.toInt(),
-        incrementalMac = this.incrementalDigest?.toByteString(),
-        incrementalMacChunkSize = this.incrementalMacChunkSize,
-        fileName = this.fileName,
-        width = this.width,
-        height = this.height,
-        caption = this.caption,
-        blurHash = this.blurHash?.hash
-      )
+      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
     )
   }
 
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 8c6df58438..e735f62060 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
@@ -13,8 +13,11 @@ import org.signal.core.util.logging.Log
 import org.signal.core.util.orNull
 import org.signal.core.util.requireLong
 import org.signal.core.util.toInt
+import org.thoughtcrime.securesms.attachments.ArchivedAttachment
 import org.thoughtcrime.securesms.attachments.Attachment
+import org.thoughtcrime.securesms.attachments.Cdn
 import org.thoughtcrime.securesms.attachments.PointerAttachment
+import org.thoughtcrime.securesms.attachments.TombstoneAttachment
 import org.thoughtcrime.securesms.backup.v2.BackupState
 import org.thoughtcrime.securesms.backup.v2.proto.BodyRange
 import org.thoughtcrime.securesms.backup.v2.proto.ChatItem
@@ -26,6 +29,7 @@ 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.database.AttachmentTable
 import org.thoughtcrime.securesms.database.CallTable
 import org.thoughtcrime.securesms.database.GroupReceiptTable
 import org.thoughtcrime.securesms.database.MessageTable
@@ -37,6 +41,7 @@ import org.thoughtcrime.securesms.database.documents.IdentityKeyMismatch
 import org.thoughtcrime.securesms.database.documents.IdentityKeyMismatchSet
 import org.thoughtcrime.securesms.database.documents.NetworkFailure
 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.GV2UpdateDescription
@@ -48,11 +53,12 @@ import org.thoughtcrime.securesms.mms.QuoteModel
 import org.thoughtcrime.securesms.recipients.Recipient
 import org.thoughtcrime.securesms.recipients.RecipientId
 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.messages.SignalServiceDataMessage
 import org.whispersystems.signalservice.api.push.ServiceId
 import org.whispersystems.signalservice.api.util.UuidUtil
+import org.whispersystems.signalservice.internal.push.DataMessage
 import java.util.Optional
 
 /**
@@ -96,7 +102,8 @@ class ChatItemImportInserter(
       MessageTable.SHARED_CONTACTS,
       MessageTable.LINK_PREVIEWS,
       MessageTable.MESSAGE_RANGES,
-      MessageTable.VIEW_ONCE
+      MessageTable.VIEW_ONCE,
+      MessageTable.MESSAGE_EXTRAS
     )
 
     private val REACTION_COLUMNS = arrayOf(
@@ -455,6 +462,10 @@ class ChatItemImportInserter(
               IndividualCallChatUpdate.Type.UNKNOWN -> typeFlags
             }
           }
+          updateMessage.callingMessage.groupCall != null -> {
+            typeFlags = MessageTypes.GROUP_CALL_TYPE
+            this.put(MessageTable.BODY, GroupCallUpdateDetailsUtil.createBodyFromBackup(updateMessage.callingMessage.groupCall))
+          }
         }
         // Calls don't use the incoming/outgoing flags, so we overwrite the flags here
         this.put(MessageTable.TYPE, typeFlags)
@@ -570,12 +581,12 @@ class ChatItemImportInserter(
         pointer.attachmentLocator.cdnNumber,
         SignalServiceAttachmentRemoteId.from(pointer.attachmentLocator.cdnKey),
         contentType,
-        pointer.key?.toByteArray(),
-        Optional.ofNullable(pointer.size),
+        pointer.attachmentLocator.key.toByteArray(),
+        Optional.ofNullable(pointer.attachmentLocator.size),
         Optional.empty(),
         pointer.width ?: 0,
         pointer.height ?: 0,
-        Optional.empty(),
+        Optional.ofNullable(pointer.attachmentLocator.digest.toByteArray()),
         Optional.ofNullable(pointer.incrementalMac?.toByteArray()),
         pointer.incrementalMacChunkSize ?: 0,
         Optional.ofNullable(fileName),
@@ -586,14 +597,53 @@ class ChatItemImportInserter(
         Optional.ofNullable(pointer.blurHash),
         pointer.attachmentLocator.uploadTimestamp
       )
-      return PointerAttachment.forPointer(Optional.of(signalAttachmentPointer)).orNull()
+      return PointerAttachment.forPointer(
+        pointer = Optional.of(signalAttachmentPointer),
+        transferState = if (wasDownloaded) AttachmentTable.TRANSFER_NEEDS_RESTORE else AttachmentTable.TRANSFER_PROGRESS_PENDING
+      ).orNull()
+    } else if (pointer.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
+      )
+    } else if (pointer.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(),
+        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
+      )
     }
     return null
   }
 
   private fun Quote.QuotedAttachment.toLocalAttachment(): Attachment? {
     return thumbnail?.toLocalAttachment(this.contentType, this.fileName)
-      ?: if (this.contentType == null) null else PointerAttachment.forPointer(SignalServiceDataMessage.Quote.QuotedAttachment(contentType = this.contentType!!, fileName = this.fileName, thumbnail = null)).orNull()
+      ?: 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)?)
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 775423cdca..f4a6b5cfce 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
@@ -16,7 +16,7 @@ import java.util.concurrent.TimeUnit
 private val TAG = Log.tag(MessageTable::class.java)
 private const val BASE_TYPE = "base_type"
 
-fun MessageTable.getMessagesForBackup(backupTime: Long): ChatItemExportIterator {
+fun MessageTable.getMessagesForBackup(backupTime: Long, archiveMedia: Boolean): ChatItemExportIterator {
   val cursor = readableDatabase
     .select(
       MessageTable.ID,
@@ -64,7 +64,7 @@ fun MessageTable.getMessagesForBackup(backupTime: Long): ChatItemExportIterator
     .orderBy("${MessageTable.DATE_RECEIVED} ASC")
     .run()
 
-  return ChatItemExportIterator(cursor, 100)
+  return ChatItemExportIterator(cursor, 100, archiveMedia)
 }
 
 fun MessageTable.createChatItemInserter(backupState: BackupState): ChatItemImportInserter {
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 9a99d9bb86..3aab49c032 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
@@ -13,6 +13,7 @@ import org.signal.core.util.SqlUtil
 import org.signal.core.util.deleteAll
 import org.signal.core.util.logging.Log
 import org.signal.core.util.nullIfBlank
+import org.signal.core.util.requireBlob
 import org.signal.core.util.requireBoolean
 import org.signal.core.util.requireInt
 import org.signal.core.util.requireLong
@@ -23,7 +24,16 @@ import org.signal.core.util.toInt
 import org.signal.core.util.update
 import org.signal.libsignal.zkgroup.InvalidInputException
 import org.signal.libsignal.zkgroup.groups.GroupMasterKey
+import org.signal.libsignal.zkgroup.groups.GroupSecretParams
+import org.signal.storageservice.protos.groups.AccessControl
+import org.signal.storageservice.protos.groups.Member
+import org.signal.storageservice.protos.groups.local.DecryptedBannedMember
 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 org.signal.storageservice.protos.groups.local.DecryptedRequestingMember
+import org.signal.storageservice.protos.groups.local.DecryptedTimer
+import org.signal.storageservice.protos.groups.local.EnabledState
 import org.thoughtcrime.securesms.backup.v2.BackupState
 import org.thoughtcrime.securesms.backup.v2.proto.AccountData
 import org.thoughtcrime.securesms.backup.v2.proto.Contact
@@ -37,13 +47,14 @@ import org.thoughtcrime.securesms.database.SignalDatabase
 import org.thoughtcrime.securesms.database.model.databaseprotos.RecipientExtras
 import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
 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
+import org.whispersystems.signalservice.api.push.ServiceId
 import org.whispersystems.signalservice.api.push.ServiceId.ACI
 import org.whispersystems.signalservice.api.push.ServiceId.PNI
 import org.whispersystems.signalservice.api.util.toByteArray
@@ -103,7 +114,8 @@ fun RecipientTable.getGroupsForBackup(): BackupGroupIterator {
       "${RecipientTable.TABLE_NAME}.${RecipientTable.EXTRAS}",
       "${GroupTable.TABLE_NAME}.${GroupTable.V2_MASTER_KEY}",
       "${GroupTable.TABLE_NAME}.${GroupTable.SHOW_AS_STORY_STATE}",
-      "${GroupTable.TABLE_NAME}.${GroupTable.TITLE}"
+      "${GroupTable.TABLE_NAME}.${GroupTable.TITLE}",
+      "${GroupTable.TABLE_NAME}.${GroupTable.V2_DECRYPTED_GROUP}"
     )
     .from(
       """
@@ -219,9 +231,8 @@ private fun RecipientTable.restoreGroupFromBackup(group: Group): RecipientId {
   val masterKey = GroupMasterKey(group.masterKey.toByteArray())
   val groupId = GroupId.v2(masterKey)
 
-  val placeholderState = DecryptedGroup.Builder()
-    .revision(GroupsV2StateProcessor.PLACEHOLDER_REVISION)
-    .build()
+  val operations = ApplicationDependencies.getGroupsV2Operations().forGroup(GroupSecretParams.deriveFromMasterKey(masterKey))
+  val decryptedState = group.snapshot!!.toDecryptedGroup(operations)
 
   val values = ContentValues().apply {
     put(RecipientTable.GROUP_ID, groupId.toString())
@@ -236,20 +247,148 @@ private fun RecipientTable.restoreGroupFromBackup(group: Group): RecipientId {
   }
 
   val recipientId = writableDatabase.insert(RecipientTable.TABLE_NAME, null, values)
-  val groupValues = ContentValues().apply {
-    put(GroupTable.RECIPIENT_ID, recipientId)
-    put(GroupTable.GROUP_ID, groupId.toString())
-    put(GroupTable.TITLE, group.name)
-    put(GroupTable.V2_MASTER_KEY, masterKey.serialize())
-    put(GroupTable.V2_DECRYPTED_GROUP, placeholderState.encode())
-    put(GroupTable.V2_REVISION, placeholderState.revision)
-    put(GroupTable.SHOW_AS_STORY_STATE, group.storySendMode.toGroupShowAsStoryState().code)
-  }
-  writableDatabase.insert(GroupTable.TABLE_NAME, null, groupValues)
+  SignalDatabase.groups.create(masterKey, decryptedState)
 
   return RecipientId.from(recipientId)
 }
 
+private fun Group.AccessControl.AccessRequired.toLocal(): AccessControl.AccessRequired {
+  return when (this) {
+    Group.AccessControl.AccessRequired.UNKNOWN -> AccessControl.AccessRequired.UNKNOWN
+    Group.AccessControl.AccessRequired.ANY -> AccessControl.AccessRequired.ANY
+    Group.AccessControl.AccessRequired.MEMBER -> AccessControl.AccessRequired.MEMBER
+    Group.AccessControl.AccessRequired.ADMINISTRATOR -> AccessControl.AccessRequired.ADMINISTRATOR
+    Group.AccessControl.AccessRequired.UNSATISFIABLE -> AccessControl.AccessRequired.UNSATISFIABLE
+  }
+}
+
+private fun Group.AccessControl.toLocal(): AccessControl {
+  return AccessControl(members = this.members.toLocal(), attributes = this.attributes.toLocal(), addFromInviteLink = this.addFromInviteLink.toLocal())
+}
+
+private fun Group.Member.Role.toLocal(): Member.Role {
+  return when (this) {
+    Group.Member.Role.UNKNOWN -> Member.Role.UNKNOWN
+    Group.Member.Role.DEFAULT -> Member.Role.DEFAULT
+    Group.Member.Role.ADMINISTRATOR -> Member.Role.ADMINISTRATOR
+  }
+}
+
+private fun AccessControl.AccessRequired.toSnapshot(): Group.AccessControl.AccessRequired {
+  return when (this) {
+    AccessControl.AccessRequired.UNKNOWN -> Group.AccessControl.AccessRequired.UNKNOWN
+    AccessControl.AccessRequired.ANY -> Group.AccessControl.AccessRequired.ANY
+    AccessControl.AccessRequired.MEMBER -> Group.AccessControl.AccessRequired.MEMBER
+    AccessControl.AccessRequired.ADMINISTRATOR -> Group.AccessControl.AccessRequired.ADMINISTRATOR
+    AccessControl.AccessRequired.UNSATISFIABLE -> Group.AccessControl.AccessRequired.UNSATISFIABLE
+  }
+}
+
+private fun AccessControl.toSnapshot(): Group.AccessControl {
+  return Group.AccessControl(members = members.toSnapshot(), attributes = attributes.toSnapshot(), addFromInviteLink = addFromInviteLink.toSnapshot())
+}
+
+private fun Member.Role.toSnapshot(): Group.Member.Role {
+  return when (this) {
+    Member.Role.UNKNOWN -> Group.Member.Role.UNKNOWN
+    Member.Role.DEFAULT -> Group.Member.Role.DEFAULT
+    Member.Role.ADMINISTRATOR -> Group.Member.Role.ADMINISTRATOR
+  }
+}
+
+private fun DecryptedGroup.toSnapshot(): Group.GroupSnapshot {
+  return Group.GroupSnapshot(
+    title = title,
+    avatar = avatar,
+    disappearingMessagesTimer = disappearingMessagesTimer?.duration ?: 0,
+    accessControl = accessControl?.toSnapshot(),
+    version = revision,
+    members = members.map { it.toSnapshot() },
+    membersPendingProfileKey = pendingMembers.map { it.toSnapshot() },
+    membersPendingAdminApproval = requestingMembers.map { it.toSnapshot() },
+    inviteLinkPassword = inviteLinkPassword,
+    description = description,
+    announcements_only = isAnnouncementGroup == EnabledState.ENABLED,
+    members_banned = bannedMembers.map { it.toSnapshot() }
+  )
+}
+
+private fun Group.Member.toLocal(): DecryptedMember {
+  return DecryptedMember(aciBytes = userId, role = role.toLocal(), profileKey = profileKey, joinedAtRevision = joinedAtVersion)
+}
+
+private fun DecryptedMember.toSnapshot(): Group.Member {
+  return Group.Member(userId = aciBytes, role = role.toSnapshot(), profileKey = profileKey, joinedAtVersion = joinedAtRevision)
+}
+
+private fun Group.MemberPendingProfileKey.toLocal(operations: GroupsV2Operations.GroupOperations): DecryptedPendingMember {
+  return DecryptedPendingMember(
+    serviceIdBytes = member!!.userId,
+    role = member.role.toLocal(),
+    addedByAci = addedByUserId,
+    timestamp = timestamp,
+    serviceIdCipherText = operations.encryptServiceId(ServiceId.Companion.parseOrNull(member.userId))
+  )
+}
+
+private fun DecryptedPendingMember.toSnapshot(): Group.MemberPendingProfileKey {
+  return Group.MemberPendingProfileKey(
+    member = Group.Member(
+      userId = serviceIdBytes,
+      role = role.toSnapshot()
+    ),
+    addedByUserId = addedByAci,
+    timestamp = timestamp
+  )
+}
+
+private fun Group.MemberPendingAdminApproval.toLocal(): DecryptedRequestingMember {
+  return DecryptedRequestingMember(
+    aciBytes = userId,
+    profileKey = profileKey,
+    timestamp = timestamp
+  )
+}
+
+private fun DecryptedRequestingMember.toSnapshot(): Group.MemberPendingAdminApproval {
+  return Group.MemberPendingAdminApproval(
+    userId = aciBytes,
+    profileKey = profileKey,
+    timestamp = timestamp
+  )
+}
+
+private fun Group.MemberBanned.toLocal(): DecryptedBannedMember {
+  return DecryptedBannedMember(
+    serviceIdBytes = userId,
+    timestamp = timestamp
+  )
+}
+
+private fun DecryptedBannedMember.toSnapshot(): Group.MemberBanned {
+  return Group.MemberBanned(
+    userId = serviceIdBytes,
+    timestamp = timestamp
+  )
+}
+
+private fun Group.GroupSnapshot.toDecryptedGroup(operations: GroupsV2Operations.GroupOperations): DecryptedGroup {
+  return DecryptedGroup(
+    title = title,
+    avatar = avatar,
+    disappearingMessagesTimer = DecryptedTimer(duration = disappearingMessagesTimer),
+    accessControl = accessControl?.toLocal(),
+    revision = version,
+    members = members.map { member -> member.toLocal() },
+    pendingMembers = membersPendingProfileKey.map { pending -> pending.toLocal(operations) },
+    requestingMembers = membersPendingAdminApproval.map { requesting -> requesting.toLocal() },
+    inviteLinkPassword = inviteLinkPassword,
+    description = description,
+    isAnnouncementGroup = if (announcements_only) EnabledState.ENABLED else EnabledState.DISABLED,
+    bannedMembers = members_banned.map { it.toLocal() }
+  )
+}
+
 private fun Contact.toLocalExtras(): RecipientExtras {
   return RecipientExtras(
     hideStory = this.hideStory
@@ -331,6 +470,8 @@ class BackupGroupIterator(private val cursor: Cursor) : Iterator<BackupRecipient
     val extras = RecipientTableCursorUtil.getExtras(cursor)
     val showAsStoryState: GroupTable.ShowAsStoryState = GroupTable.ShowAsStoryState.deserialize(cursor.requireInt(GroupTable.SHOW_AS_STORY_STATE))
 
+    val decryptedGroup: DecryptedGroup = DecryptedGroup.ADAPTER.decode(cursor.requireBlob(GroupTable.V2_DECRYPTED_GROUP)!!)
+
     return BackupRecipient(
       id = cursor.requireLong(RecipientTable.ID),
       group = BackupGroup(
@@ -338,7 +479,8 @@ class BackupGroupIterator(private val cursor: Cursor) : Iterator<BackupRecipient
         whitelisted = cursor.requireBoolean(RecipientTable.PROFILE_SHARING),
         hideStory = extras?.hideStory() ?: false,
         storySendMode = showAsStoryState.toGroupStorySendMode(),
-        name = cursor.requireString(GroupTable.TITLE) ?: ""
+        name = cursor.requireString(GroupTable.TITLE) ?: "",
+        snapshot = decryptedGroup.toSnapshot()
       )
     )
   }
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 807e2931e6..9e998fc946 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
@@ -19,7 +19,7 @@ object ChatItemBackupProcessor {
   val TAG = Log.tag(ChatItemBackupProcessor::class.java)
 
   fun export(exportState: ExportState, emitter: BackupFrameEmitter) {
-    SignalDatabase.messages.getMessagesForBackup(exportState.backupTime).use { chatItems ->
+    SignalDatabase.messages.getMessagesForBackup(exportState.backupTime, exportState.allowMediaBackup).use { chatItems ->
       for (chatItem in chatItems) {
         if (exportState.threadIds.contains(chatItem.chatId)) {
           emitter.emit(Frame(chatItem = chatItem))
diff --git a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/stream/BackupEncryptedOutputStream.kt b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/stream/BackupEncryptedOutputStream.kt
deleted file mode 100644
index 5a7c535d13..0000000000
--- a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/stream/BackupEncryptedOutputStream.kt
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * Copyright 2023 Signal Messenger, LLC
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-package org.thoughtcrime.securesms.backup.v2.stream
-
-import org.signal.libsignal.protocol.kdf.HKDF
-import java.io.FilterOutputStream
-import java.io.OutputStream
-import javax.crypto.Cipher
-import javax.crypto.Mac
-import javax.crypto.spec.IvParameterSpec
-import javax.crypto.spec.SecretKeySpec
-
-class BackupEncryptedOutputStream(key: ByteArray, backupId: ByteArray, wrapped: OutputStream) : FilterOutputStream(wrapped) {
-
-  val cipher: Cipher = Cipher.getInstance("AES/CBC/PKCS5Padding")
-  val mac: Mac = Mac.getInstance("HmacSHA256")
-
-  var finalMac: ByteArray? = null
-
-  init {
-    if (key.size != 32) {
-      throw IllegalArgumentException("Key must be 32 bytes!")
-    }
-
-    if (backupId.size != 16) {
-      throw IllegalArgumentException("BackupId must be 32 bytes!")
-    }
-
-    val extendedKey = HKDF.deriveSecrets(key, backupId, "20231003_Signal_Backups_EncryptMessageBackup".toByteArray(), 80)
-    val macKey = extendedKey.copyOfRange(0, 32)
-    val cipherKey = extendedKey.copyOfRange(32, 64)
-    val iv = extendedKey.copyOfRange(64, 80)
-
-    cipher.init(Cipher.ENCRYPT_MODE, SecretKeySpec(cipherKey, "AES"), IvParameterSpec(iv))
-    mac.init(SecretKeySpec(macKey, "HmacSHA256"))
-  }
-
-  override fun write(b: Int) {
-    throw UnsupportedOperationException()
-  }
-
-  override fun write(data: ByteArray) {
-    write(data, 0, data.size)
-  }
-
-  override fun write(data: ByteArray, off: Int, len: Int) {
-    cipher.update(data, off, len)?.let { ciphertext ->
-      mac.update(ciphertext)
-      super.write(ciphertext)
-    }
-  }
-
-  override fun flush() {
-    cipher.doFinal()?.let { ciphertext ->
-      mac.update(ciphertext)
-      super.write(ciphertext)
-    }
-
-    finalMac = mac.doFinal()
-
-    super.flush()
-  }
-
-  override fun close() {
-    flush()
-    super.close()
-  }
-
-  fun getMac(): ByteArray {
-    return finalMac ?: throw IllegalStateException("Mac not yet available! You must call flush() before asking for the mac.")
-  }
-}
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 1c597850b6..7031bca71f 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
@@ -41,18 +41,21 @@ class EncryptedBackupReader(
   val stream: InputStream
 
   init {
-    val keyMaterial = key.deriveSecrets(aci)
+    val keyMaterial = key.deriveBackupSecrets(aci)
+
+    validateMac(keyMaterial.macKey, streamLength, dataStream())
+
+    val inputStream = dataStream()
+    val iv = inputStream.readNBytesOrThrow(16)
 
     val cipher = Cipher.getInstance("AES/CBC/PKCS5Padding").apply {
-      init(Cipher.DECRYPT_MODE, SecretKeySpec(keyMaterial.cipherKey, "AES"), IvParameterSpec(keyMaterial.iv))
+      init(Cipher.DECRYPT_MODE, SecretKeySpec(keyMaterial.cipherKey, "AES"), IvParameterSpec(iv))
     }
 
-    validateMac(keyMaterial.macKey, streamLength, dataStream())
-
     stream = GZIPInputStream(
       CipherInputStream(
         TruncatingInputStream(
-          wrapped = dataStream(),
+          wrapped = inputStream,
           maxBytes = streamLength - MAC_SIZE
         ),
         cipher
diff --git a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/stream/EncryptedBackupWriter.kt b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/stream/EncryptedBackupWriter.kt
index c8d2ea4de9..fcbb64d904 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/stream/EncryptedBackupWriter.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/stream/EncryptedBackupWriter.kt
@@ -9,11 +9,11 @@ import org.signal.core.util.stream.MacOutputStream
 import org.signal.core.util.writeVarInt32
 import org.thoughtcrime.securesms.backup.v2.proto.BackupInfo
 import org.thoughtcrime.securesms.backup.v2.proto.Frame
+import org.thoughtcrime.securesms.util.Util
 import org.whispersystems.signalservice.api.backup.BackupKey
 import org.whispersystems.signalservice.api.push.ServiceId.ACI
 import java.io.IOException
 import java.io.OutputStream
-import java.util.zip.GZIPOutputStream
 import javax.crypto.Cipher
 import javax.crypto.CipherOutputStream
 import javax.crypto.Mac
@@ -33,28 +33,29 @@ class EncryptedBackupWriter(
   private val append: (ByteArray) -> Unit
 ) : BackupExportWriter {
 
-  private val mainStream: GZIPOutputStream
+  private val mainStream: PaddedGzipOutputStream
   private val macStream: MacOutputStream
 
   init {
-    val keyMaterial = key.deriveSecrets(aci)
+    val keyMaterial = key.deriveBackupSecrets(aci)
+
+    val iv: ByteArray = Util.getSecretBytes(16)
+    outputStream.write(iv)
+    outputStream.flush()
 
     val cipher = Cipher.getInstance("AES/CBC/PKCS5Padding").apply {
-      init(Cipher.ENCRYPT_MODE, SecretKeySpec(keyMaterial.cipherKey, "AES"), IvParameterSpec(keyMaterial.iv))
+      init(Cipher.ENCRYPT_MODE, SecretKeySpec(keyMaterial.cipherKey, "AES"), IvParameterSpec(iv))
     }
 
     val mac = Mac.getInstance("HmacSHA256").apply {
       init(SecretKeySpec(keyMaterial.macKey, "HmacSHA256"))
+      update(iv)
     }
 
     macStream = MacOutputStream(outputStream, mac)
+    val cipherStream = CipherOutputStream(macStream, cipher)
 
-    mainStream = GZIPOutputStream(
-      CipherOutputStream(
-        macStream,
-        cipher
-      )
-    )
+    mainStream = PaddedGzipOutputStream(cipherStream)
   }
 
   override fun write(header: BackupInfo) {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/stream/PaddedGzipOutputStream.kt b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/stream/PaddedGzipOutputStream.kt
new file mode 100644
index 0000000000..791adc036a
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/stream/PaddedGzipOutputStream.kt
@@ -0,0 +1,55 @@
+/*
+ * Copyright 2024 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.thoughtcrime.securesms.backup.v2.stream
+
+import org.whispersystems.signalservice.internal.crypto.PaddingInputStream
+import java.io.FilterOutputStream
+import java.io.OutputStream
+import java.util.zip.GZIPOutputStream
+
+/**
+ * GZIPs the content of the provided [outputStream], but also adds padding to the end of the stream using the same algorithm as [PaddingInputStream].
+ * We do this to fit files into a smaller number of size buckets to avoid fingerprinting. And it turns out that bolting on zeros to the end of a GZIP stream is
+ * fine, because GZIP is smart enough to ignore it. This means readers of this data don't have to do anything special.
+ */
+class PaddedGzipOutputStream private constructor(private val outputStream: SizeObservingOutputStream) : GZIPOutputStream(outputStream) {
+
+  constructor(outputStream: OutputStream) : this(SizeObservingOutputStream(outputStream))
+
+  override fun finish() {
+    super.finish()
+
+    val totalLength = outputStream.size
+    val paddedSize: Long = PaddingInputStream.getPaddedSize(totalLength)
+    val paddingToAdd: Int = (paddedSize - totalLength).toInt()
+
+    outputStream.write(ByteArray(paddingToAdd))
+  }
+
+  /**
+   * We need to know the size of the *compressed* stream to know how much padding to add at the end.
+   */
+  private class SizeObservingOutputStream(val wrapped: OutputStream) : FilterOutputStream(wrapped) {
+
+    var size: Long = 0L
+      private set
+
+    override fun write(b: Int) {
+      wrapped.write(b)
+      size++
+    }
+
+    override fun write(b: ByteArray) {
+      wrapped.write(b)
+      size += b.size
+    }
+
+    override fun write(b: ByteArray, off: Int, len: Int) {
+      wrapped.write(b, off, len)
+      size += len
+    }
+  }
+}
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
new file mode 100644
index 0000000000..a0bb482a7d
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/BackupAlertBottomSheet.kt
@@ -0,0 +1,289 @@
+/*
+ * Copyright 2024 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.thoughtcrime.securesms.backup.v2.ui
+
+import android.os.Parcelable
+import androidx.annotation.StringRes
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Spacer
+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.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.remember
+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.stringResource
+import androidx.compose.ui.unit.dp
+import androidx.core.os.BundleCompat
+import androidx.core.os.bundleOf
+import kotlinx.parcelize.Parcelize
+import org.signal.core.ui.BottomSheets
+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.compose.ComposeBottomSheetDialogFragment
+
+/**
+ * Notifies the user of an issue with their backup.
+ */
+class BackupAlertBottomSheet : ComposeBottomSheetDialogFragment() {
+
+  companion object {
+    private const val ARG_ALERT = "alert"
+
+    fun create(backupAlert: BackupAlert): BackupAlertBottomSheet {
+      return BackupAlertBottomSheet().apply {
+        arguments = bundleOf(ARG_ALERT to backupAlert)
+      }
+    }
+  }
+
+  private val backupAlert: BackupAlert by lazy(LazyThreadSafetyMode.NONE) {
+    BundleCompat.getParcelable(requireArguments(), ARG_ALERT, BackupAlert::class.java)!!
+  }
+
+  @Composable
+  override fun SheetContent() {
+    BackupAlertSheetContent(
+      backupAlert = backupAlert,
+      onPrimaryActionClick = this::performPrimaryAction,
+      onSecondaryActionClick = this::performSecondaryAction
+    )
+  }
+
+  @Stable
+  private fun performPrimaryAction() {
+    when (backupAlert) {
+      BackupAlert.GENERIC -> {
+        // TODO [message-backups] -- Back up now
+      }
+      BackupAlert.PAYMENT_PROCESSING -> {
+        // TODO [message-backups] -- Silence
+      }
+      BackupAlert.MEDIA_BACKUPS_ARE_OFF -> {
+        // TODO [message-backups] -- Download media now
+      }
+      BackupAlert.MEDIA_WILL_BE_DELETED_TODAY -> {
+        // TODO [message-backups] -- Download media now
+      }
+    }
+
+    dismissAllowingStateLoss()
+  }
+
+  @Stable
+  private fun performSecondaryAction() {
+    when (backupAlert) {
+      BackupAlert.GENERIC -> {
+        // TODO [message-backups] - Dismiss and notify later
+      }
+      BackupAlert.PAYMENT_PROCESSING -> error("PAYMENT_PROCESSING state does not support a secondary action.")
+      BackupAlert.MEDIA_BACKUPS_ARE_OFF -> {
+        // TODO [message-backups] - Silence and remind on last day
+      }
+      BackupAlert.MEDIA_WILL_BE_DELETED_TODAY -> {
+        // TODO [message-backups] - Silence forever
+      }
+    }
+
+    dismissAllowingStateLoss()
+  }
+}
+
+@Composable
+private fun BackupAlertSheetContent(
+  backupAlert: BackupAlert,
+  onPrimaryActionClick: () -> Unit,
+  onSecondaryActionClick: () -> Unit
+) {
+  Column(
+    horizontalAlignment = Alignment.CenterHorizontally,
+    modifier = Modifier
+      .fillMaxWidth()
+      .padding(horizontal = dimensionResource(id = R.dimen.core_ui__gutter))
+  ) {
+    BottomSheets.Handle()
+
+    Spacer(modifier = Modifier.size(26.dp))
+
+    val iconColors = rememberBackupsIconColors(backupAlert = backupAlert)
+    Icons.BrushedForeground(
+      painter = painterResource(id = R.drawable.symbol_backup_light), // TODO [message-backups] final asset
+      contentDescription = null,
+      foregroundBrush = iconColors.foreground,
+      modifier = Modifier
+        .size(88.dp)
+        .background(color = iconColors.background, shape = CircleShape)
+        .padding(20.dp)
+    )
+
+    Text(
+      text = stringResource(id = rememberTitleResource(backupAlert = backupAlert)),
+      style = MaterialTheme.typography.titleLarge,
+      modifier = Modifier.padding(top = 16.dp, bottom = 6.dp)
+    )
+
+    when (backupAlert) {
+      BackupAlert.GENERIC -> GenericBody()
+      BackupAlert.PAYMENT_PROCESSING -> PaymentProcessingBody()
+      BackupAlert.MEDIA_BACKUPS_ARE_OFF -> MediaBackupsAreOffBody()
+      BackupAlert.MEDIA_WILL_BE_DELETED_TODAY -> MediaWillBeDeletedTodayBody()
+    }
+
+    val secondaryActionResource = rememberSecondaryActionResource(backupAlert = backupAlert)
+    val padBottom = if (secondaryActionResource > 0) 16.dp else 56.dp
+
+    Buttons.LargeTonal(
+      onClick = onPrimaryActionClick,
+      modifier = Modifier
+        .defaultMinSize(minWidth = 220.dp)
+        .padding(top = 60.dp, bottom = padBottom)
+    ) {
+      Text(text = stringResource(id = rememberPrimaryActionResource(backupAlert = backupAlert)))
+    }
+
+    if (secondaryActionResource > 0) {
+      TextButton(onClick = onSecondaryActionClick, modifier = Modifier.padding(bottom = 32.dp)) {
+        Text(text = stringResource(id = secondaryActionResource))
+      }
+    }
+  }
+}
+
+@Composable
+private fun GenericBody() {
+  Text(text = "TODO")
+}
+
+@Composable
+private fun PaymentProcessingBody() {
+  Text(text = "TODO")
+}
+
+@Composable
+private fun MediaBackupsAreOffBody() {
+  Text(text = "TODO")
+}
+
+@Composable
+private fun MediaWillBeDeletedTodayBody() {
+  Text(text = "TODO")
+}
+
+@Composable
+private fun rememberBackupsIconColors(backupAlert: BackupAlert): BackupsIconColors {
+  return remember(backupAlert) {
+    when (backupAlert) {
+      BackupAlert.GENERIC, BackupAlert.PAYMENT_PROCESSING -> BackupsIconColors.Warning
+      BackupAlert.MEDIA_BACKUPS_ARE_OFF, BackupAlert.MEDIA_WILL_BE_DELETED_TODAY -> BackupsIconColors.Error
+    }
+  }
+}
+
+@Composable
+@StringRes
+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
+    }
+  }
+}
+
+@Composable
+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
+    }
+  }
+}
+
+@Composable
+private fun rememberSecondaryActionResource(backupAlert: BackupAlert): Int {
+  return remember(backupAlert) {
+    when (backupAlert) {
+      BackupAlert.GENERIC -> 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
+    }
+  }
+}
+
+@SignalPreview
+@Composable
+private fun BackupAlertSheetContentPreviewGeneric() {
+  Previews.BottomSheetPreview {
+    BackupAlertSheetContent(
+      backupAlert = BackupAlert.GENERIC,
+      onPrimaryActionClick = {},
+      onSecondaryActionClick = {}
+    )
+  }
+}
+
+@SignalPreview
+@Composable
+private fun BackupAlertSheetContentPreviewPayment() {
+  Previews.BottomSheetPreview {
+    BackupAlertSheetContent(
+      backupAlert = BackupAlert.PAYMENT_PROCESSING,
+      onPrimaryActionClick = {},
+      onSecondaryActionClick = {}
+    )
+  }
+}
+
+@SignalPreview
+@Composable
+private fun BackupAlertSheetContentPreviewMedia() {
+  Previews.BottomSheetPreview {
+    BackupAlertSheetContent(
+      backupAlert = BackupAlert.MEDIA_BACKUPS_ARE_OFF,
+      onPrimaryActionClick = {},
+      onSecondaryActionClick = {}
+    )
+  }
+}
+
+@SignalPreview
+@Composable
+private fun BackupAlertSheetContentPreviewDelete() {
+  Previews.BottomSheetPreview {
+    BackupAlertSheetContent(
+      backupAlert = BackupAlert.MEDIA_WILL_BE_DELETED_TODAY,
+      onPrimaryActionClick = {},
+      onSecondaryActionClick = {}
+    )
+  }
+}
+
+@Parcelize
+enum class BackupAlert : Parcelable {
+  GENERIC,
+  PAYMENT_PROCESSING,
+  MEDIA_BACKUPS_ARE_OFF,
+  MEDIA_WILL_BE_DELETED_TODAY
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/BackupsIconColors.kt b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/BackupsIconColors.kt
new file mode 100644
index 0000000000..16e8396066
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/BackupsIconColors.kt
@@ -0,0 +1,45 @@
+/*
+ * Copyright 2024 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.thoughtcrime.securesms.backup.v2.ui
+
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.remember
+import androidx.compose.ui.geometry.Offset
+import androidx.compose.ui.graphics.Brush
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.SolidColor
+
+sealed interface BackupsIconColors {
+  @get:Composable
+  val foreground: Brush
+
+  @get:Composable
+  val background: Color
+
+  object Normal : BackupsIconColors {
+    override val foreground: Brush
+      @Composable get() = remember {
+        Brush.linearGradient(
+          colors = listOf(Color(0xFF316ED0), Color(0xFF558BE2)),
+          start = Offset(x = 0f, y = Float.POSITIVE_INFINITY),
+          end = Offset(x = Float.POSITIVE_INFINITY, y = 0f)
+        )
+      }
+
+    override val background: Color @Composable get() = MaterialTheme.colorScheme.primaryContainer
+  }
+
+  object Warning : BackupsIconColors {
+    override val foreground: Brush @Composable get() = SolidColor(Color(0xFFC86600))
+    override val background: Color @Composable get() = Color(0xFFF9E4B6)
+  }
+
+  object Error : BackupsIconColors {
+    override val foreground: Brush @Composable get() = SolidColor(MaterialTheme.colorScheme.error)
+    override val background: Color @Composable get() = Color(0xFFFFD9D9)
+  }
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/restore/RestoreFromBackupFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/restore/RestoreFromBackupFragment.kt
index c44e63e45e..f92b2e0b9b 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/restore/RestoreFromBackupFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/restore/RestoreFromBackupFragment.kt
@@ -32,8 +32,8 @@ import org.signal.core.ui.Buttons
 import org.signal.core.ui.Previews
 import org.signal.core.ui.theme.SignalTheme
 import org.thoughtcrime.securesms.R
-import org.thoughtcrime.securesms.backup.v2.ui.MessageBackupsTypeFeature
-import org.thoughtcrime.securesms.backup.v2.ui.MessageBackupsTypeFeatureRow
+import org.thoughtcrime.securesms.backup.v2.ui.subscription.MessageBackupsTypeFeature
+import org.thoughtcrime.securesms.backup.v2.ui.subscription.MessageBackupsTypeFeatureRow
 import org.thoughtcrime.securesms.compose.ComposeFragment
 import org.thoughtcrime.securesms.devicetransfer.moreoptions.MoreTransferOrRestoreOptionsMode
 import org.thoughtcrime.securesms.util.navigation.safeNavigate
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
new file mode 100644
index 0000000000..023b295a46
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/status/BackupStatus.kt
@@ -0,0 +1,217 @@
+/*
+ * Copyright 2024 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+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
+import androidx.compose.foundation.border
+import androidx.compose.foundation.layout.Arrangement
+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.shape.CircleShape
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material3.LinearProgressIndicator
+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.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.thoughtcrime.securesms.R
+import org.thoughtcrime.securesms.backup.v2.ui.BackupsIconColors
+import kotlin.math.max
+import kotlin.math.min
+
+private const val NONE = -1
+
+/**
+ * Displays a "heads up" widget containing information about the current
+ * status of the user's backup.
+ */
+@Composable
+fun BackupStatus(
+  data: BackupStatusData,
+  onActionClick: () -> Unit = {}
+) {
+  Row(
+    verticalAlignment = Alignment.CenterVertically,
+    modifier = Modifier
+      .border(1.dp, color = MaterialTheme.colorScheme.outline.copy(alpha = 0.38f), shape = RoundedCornerShape(12.dp))
+      .fillMaxWidth()
+      .padding(14.dp)
+  ) {
+    val foreground: Brush = data.iconColors.foreground
+    Icons.BrushedForeground(
+      painter = painterResource(id = data.iconRes),
+      contentDescription = null,
+      foregroundBrush = foreground,
+      modifier = Modifier
+        .background(color = data.iconColors.background, shape = CircleShape)
+        .padding(8.dp)
+    )
+
+    Column(
+      modifier = Modifier
+        .padding(start = 12.dp)
+        .weight(1f)
+    ) {
+      Text(
+        text = stringResource(id = data.titleRes),
+        style = MaterialTheme.typography.bodyMedium
+      )
+
+      if (data.progress >= 0f) {
+        LinearProgressIndicator(
+          progress = data.progress,
+          strokeCap = StrokeCap.Round,
+          modifier = Modifier
+            .fillMaxWidth()
+            .padding(vertical = 6.dp)
+        )
+      }
+
+      if (data.statusRes != NONE) {
+        Text(
+          text = stringResource(id = data.statusRes),
+          style = MaterialTheme.typography.bodySmall,
+          color = MaterialTheme.colorScheme.onSurfaceVariant
+        )
+      }
+    }
+
+    if (data.actionRes != NONE) {
+      Buttons.Small(
+        onClick = onActionClick,
+        modifier = Modifier.padding(start = 8.dp)
+      ) {
+        Text(text = stringResource(id = data.actionRes))
+      }
+    }
+  }
+}
+
+@Preview
+@Preview(uiMode = Configuration.UI_MODE_NIGHT_YES)
+@Composable
+fun BackupStatusPreview() {
+  Previews.Preview {
+    Column(
+      verticalArrangement = Arrangement.spacedBy(12.dp)
+    ) {
+      BackupStatus(
+        data = BackupStatusData.CouldNotCompleteBackup
+      )
+
+      BackupStatus(
+        data = BackupStatusData.NotEnoughFreeSpace
+      )
+
+      BackupStatus(
+        data = BackupStatusData.RestoringMedia(50, 100)
+      )
+    }
+  }
+}
+
+/**
+ * Sealed interface describing status data to display in BackupStatus widget.
+ *
+ * TODO [message-requests] - Finalize assets and text
+ */
+sealed interface BackupStatusData {
+
+  @get:DrawableRes
+  val iconRes: Int
+
+  @get:StringRes
+  val titleRes: Int
+
+  val iconColors: BackupsIconColors
+
+  @get:StringRes
+  val actionRes: Int get() = NONE
+
+  @get:StringRes
+  val statusRes: Int get() = NONE
+
+  val progress: Float get() = NONE.toFloat()
+
+  /**
+   * Generic failure
+   */
+  object CouldNotCompleteBackup : BackupStatusData {
+    override val iconRes: Int = R.drawable.symbol_backup_light
+    override val titleRes: Int = 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 {
+    override val iconRes: Int = R.drawable.symbol_backup_light
+    override val titleRes: Int = R.string.default_error_msg
+    override val iconColors: BackupsIconColors = BackupsIconColors.Warning
+    override val actionRes: Int = R.string.registration_activity__skip
+  }
+
+  /**
+   * Restoring media, finished, and paused states.
+   */
+  data class RestoringMedia(
+    val bytesDownloaded: Long,
+    val bytesTotal: Long,
+    val status: Status = Status.NONE
+  ) : 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 statusRes: 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 progress: Float = if (bytesTotal > 0) {
+      min(1f, max(0f, bytesDownloaded.toFloat() / bytesTotal))
+    } else {
+      0f
+    }
+  }
+
+  /**
+   * Describes the status of an in-progress media download session.
+   */
+  enum class Status {
+    NONE,
+    LOW_BATTERY,
+    WAITING_FOR_INTERNET,
+    WAITING_FOR_WIFI,
+    FINISHED
+  }
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/MessageBackupsCheckoutSheet.kt b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/subscription/MessageBackupsCheckoutSheet.kt
similarity index 98%
rename from app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/MessageBackupsCheckoutSheet.kt
rename to app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/subscription/MessageBackupsCheckoutSheet.kt
index 39c1876948..feca2614de 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/MessageBackupsCheckoutSheet.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/subscription/MessageBackupsCheckoutSheet.kt
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 
-package org.thoughtcrime.securesms.backup.v2.ui
+package org.thoughtcrime.securesms.backup.v2.ui.subscription
 
 import android.view.LayoutInflater
 import android.view.ViewGroup
diff --git a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/MessageBackupsEducationScreen.kt b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/subscription/MessageBackupsEducationScreen.kt
similarity index 98%
rename from app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/MessageBackupsEducationScreen.kt
rename to app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/subscription/MessageBackupsEducationScreen.kt
index 53d663150d..66ea3279a4 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/MessageBackupsEducationScreen.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/subscription/MessageBackupsEducationScreen.kt
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 
-package org.thoughtcrime.securesms.backup.v2.ui
+package org.thoughtcrime.securesms.backup.v2.ui.subscription
 
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.background
diff --git a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/MessageBackupsFlowActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/subscription/MessageBackupsFlowActivity.kt
similarity index 98%
rename from app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/MessageBackupsFlowActivity.kt
rename to app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/subscription/MessageBackupsFlowActivity.kt
index 615dff02a0..9926651d07 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/MessageBackupsFlowActivity.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/subscription/MessageBackupsFlowActivity.kt
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 
-package org.thoughtcrime.securesms.backup.v2.ui
+package org.thoughtcrime.securesms.backup.v2.ui.subscription
 
 import android.os.Bundle
 import androidx.activity.compose.setContent
diff --git a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/MessageBackupsFlowRepository.kt b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/subscription/MessageBackupsFlowRepository.kt
similarity index 67%
rename from app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/MessageBackupsFlowRepository.kt
rename to app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/subscription/MessageBackupsFlowRepository.kt
index 19e28b439c..791b352f3f 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/MessageBackupsFlowRepository.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/subscription/MessageBackupsFlowRepository.kt
@@ -3,6 +3,6 @@
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 
-package org.thoughtcrime.securesms.backup.v2.ui
+package org.thoughtcrime.securesms.backup.v2.ui.subscription
 
 class MessageBackupsFlowRepository
diff --git a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/MessageBackupsFlowState.kt b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/subscription/MessageBackupsFlowState.kt
similarity index 88%
rename from app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/MessageBackupsFlowState.kt
rename to app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/subscription/MessageBackupsFlowState.kt
index 0492cac5d6..369bbe1916 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/MessageBackupsFlowState.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/subscription/MessageBackupsFlowState.kt
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 
-package org.thoughtcrime.securesms.backup.v2.ui
+package org.thoughtcrime.securesms.backup.v2.ui.subscription
 
 import org.thoughtcrime.securesms.keyvalue.SignalStore
 import org.thoughtcrime.securesms.lock.v2.PinKeyboardType
diff --git a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/MessageBackupsFlowViewModel.kt b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/subscription/MessageBackupsFlowViewModel.kt
similarity index 96%
rename from app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/MessageBackupsFlowViewModel.kt
rename to app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/subscription/MessageBackupsFlowViewModel.kt
index b09ea8299d..7c30d6c560 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/MessageBackupsFlowViewModel.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/subscription/MessageBackupsFlowViewModel.kt
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 
-package org.thoughtcrime.securesms.backup.v2.ui
+package org.thoughtcrime.securesms.backup.v2.ui.subscription
 
 import androidx.compose.runtime.State
 import androidx.compose.runtime.mutableStateOf
diff --git a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/subscription/MessageBackupsFrequency.kt b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/subscription/MessageBackupsFrequency.kt
new file mode 100644
index 0000000000..3adb6d9e58
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/subscription/MessageBackupsFrequency.kt
@@ -0,0 +1,16 @@
+/*
+ * Copyright 2024 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.thoughtcrime.securesms.backup.v2.ui.subscription
+
+/**
+ * Describes how often a users messages are backed up.
+ */
+enum class MessageBackupsFrequency {
+  DAILY,
+  WEEKLY,
+  MONTHLY,
+  NEVER
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/MessageBackupsPinConfirmationScreen.kt b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/subscription/MessageBackupsPinConfirmationScreen.kt
similarity index 98%
rename from app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/MessageBackupsPinConfirmationScreen.kt
rename to app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/subscription/MessageBackupsPinConfirmationScreen.kt
index c0ab92e70d..7468a53880 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/MessageBackupsPinConfirmationScreen.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/subscription/MessageBackupsPinConfirmationScreen.kt
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 
-package org.thoughtcrime.securesms.backup.v2.ui
+package org.thoughtcrime.securesms.backup.v2.ui.subscription
 
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
diff --git a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/MessageBackupsPinEducationScreen.kt b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/subscription/MessageBackupsPinEducationScreen.kt
similarity index 98%
rename from app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/MessageBackupsPinEducationScreen.kt
rename to app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/subscription/MessageBackupsPinEducationScreen.kt
index c01d280d72..bcf48c5a5d 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/MessageBackupsPinEducationScreen.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/subscription/MessageBackupsPinEducationScreen.kt
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 
-package org.thoughtcrime.securesms.backup.v2.ui
+package org.thoughtcrime.securesms.backup.v2.ui.subscription
 
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.layout.Column
diff --git a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/MessageBackupsScreen.kt b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/subscription/MessageBackupsScreen.kt
similarity index 80%
rename from app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/MessageBackupsScreen.kt
rename to app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/subscription/MessageBackupsScreen.kt
index 6025778299..994f180ffd 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/MessageBackupsScreen.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/subscription/MessageBackupsScreen.kt
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 
-package org.thoughtcrime.securesms.backup.v2.ui
+package org.thoughtcrime.securesms.backup.v2.ui.subscription
 
 enum class MessageBackupsScreen {
   EDUCATION,
diff --git a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/MessageBackupsTestRestoreActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/subscription/MessageBackupsTestRestoreActivity.kt
similarity index 86%
rename from app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/MessageBackupsTestRestoreActivity.kt
rename to app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/subscription/MessageBackupsTestRestoreActivity.kt
index 853ccb80e7..065af0c3ec 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/MessageBackupsTestRestoreActivity.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/subscription/MessageBackupsTestRestoreActivity.kt
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 
-package org.thoughtcrime.securesms.backup.v2.ui
+package org.thoughtcrime.securesms.backup.v2.ui.subscription
 
 import android.content.Context
 import android.content.Intent
@@ -26,6 +26,7 @@ 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
@@ -80,6 +81,15 @@ class MessageBackupsTestRestoreActivity : BaseActivity() {
             .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
           ) {
@@ -120,9 +130,20 @@ class MessageBackupsTestRestoreActivity : BaseActivity() {
           }
         }
       }
+      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)
diff --git a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/MessageBackupsTestRestoreViewModel.kt b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/subscription/MessageBackupsTestRestoreViewModel.kt
similarity index 67%
rename from app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/MessageBackupsTestRestoreViewModel.kt
rename to app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/subscription/MessageBackupsTestRestoreViewModel.kt
index 5213febed5..66578fea19 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/MessageBackupsTestRestoreViewModel.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/subscription/MessageBackupsTestRestoreViewModel.kt
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 
-package org.thoughtcrime.securesms.backup.v2.ui
+package org.thoughtcrime.securesms.backup.v2.ui.subscription
 
 import androidx.compose.runtime.MutableState
 import androidx.compose.runtime.State
@@ -17,8 +17,13 @@ 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.jobs.BackupRestoreJob
+import org.thoughtcrime.securesms.jobs.BackupRestoreMediaJob
+import org.thoughtcrime.securesms.jobs.SyncArchivedMediaJob
 import org.thoughtcrime.securesms.recipients.Recipient
 import java.io.InputStream
+import kotlin.time.Duration.Companion.seconds
 
 class MessageBackupsTestRestoreViewModel : ViewModel() {
   val disposables = CompositeDisposable()
@@ -40,6 +45,23 @@ class MessageBackupsTestRestoreViewModel : ViewModel() {
       }
   }
 
+  fun restore() {
+    _state.value = _state.value.copy(importState = ImportState.IN_PROGRESS)
+    disposables += Single.fromCallable {
+      ApplicationDependencies
+        .getJobManager()
+        .startChain(BackupRestoreJob())
+        .then(SyncArchivedMediaJob())
+        .then(BackupRestoreMediaJob())
+        .enqueueAndBlockUntilCompletion(120.seconds.inWholeMilliseconds)
+    }
+      .subscribeOn(Schedulers.io())
+      .observeOn(AndroidSchedulers.mainThread())
+      .subscribeBy {
+        _state.value = _state.value.copy(importState = ImportState.RESTORED)
+      }
+  }
+
   fun onPlaintextToggled() {
     _state.value = _state.value.copy(plaintext = !_state.value.plaintext)
   }
@@ -54,6 +76,6 @@ class MessageBackupsTestRestoreViewModel : ViewModel() {
   )
 
   enum class ImportState(val inProgress: Boolean = false) {
-    NONE, IN_PROGRESS(true)
+    NONE, IN_PROGRESS(true), RESTORED
   }
 }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/MessageBackupsTypeFeature.kt b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/subscription/MessageBackupsTypeFeature.kt
similarity index 75%
rename from app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/MessageBackupsTypeFeature.kt
rename to app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/subscription/MessageBackupsTypeFeature.kt
index da608ad624..adf33e4eff 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/MessageBackupsTypeFeature.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/subscription/MessageBackupsTypeFeature.kt
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 
-package org.thoughtcrime.securesms.backup.v2.ui
+package org.thoughtcrime.securesms.backup.v2.ui.subscription
 
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.fillMaxWidth
@@ -18,6 +18,9 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.unit.dp
+import org.signal.core.ui.Previews
+import org.signal.core.ui.SignalPreview
+import org.thoughtcrime.securesms.R
 
 /**
  * Represents a "Feature" included for a specify tier of message backups
@@ -53,3 +56,16 @@ fun MessageBackupsTypeFeatureRow(
     )
   }
 }
+
+@SignalPreview
+@Composable
+private fun MessageBackupsTypeFeatureRowPreview() {
+  Previews.Preview {
+    MessageBackupsTypeFeatureRow(
+      messageBackupsTypeFeature = MessageBackupsTypeFeature(
+        iconResourceId = R.drawable.symbol_edit_24,
+        label = "Content Label"
+      )
+    )
+  }
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/MessageBackupsTypeSelectionScreen.kt b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/subscription/MessageBackupsTypeSelectionScreen.kt
similarity index 98%
rename from app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/MessageBackupsTypeSelectionScreen.kt
rename to app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/subscription/MessageBackupsTypeSelectionScreen.kt
index 1cee65d231..680b4d048b 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/MessageBackupsTypeSelectionScreen.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/subscription/MessageBackupsTypeSelectionScreen.kt
@@ -2,7 +2,7 @@
  * Copyright 2024 Signal Messenger, LLC
  * SPDX-License-Identifier: AGPL-3.0-only
  */
-package org.thoughtcrime.securesms.backup.v2.ui
+package org.thoughtcrime.securesms.backup.v2.ui.subscription
 
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.background
@@ -21,6 +21,7 @@ import androidx.compose.foundation.text.ClickableText
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
 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
@@ -269,6 +270,7 @@ private fun formatCostPerMonth(pricePerMonth: FiatMoney): String {
   }
 }
 
+@Stable
 data class MessageBackupsType(
   val pricePerMonth: FiatMoney,
   val title: String,
diff --git a/app/src/main/java/org/thoughtcrime/securesms/calls/links/create/CreateCallLinkBottomSheetDialogFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/calls/links/create/CreateCallLinkBottomSheetDialogFragment.kt
index 1be045338f..6d9a9f3a32 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/calls/links/create/CreateCallLinkBottomSheetDialogFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/calls/links/create/CreateCallLinkBottomSheetDialogFragment.kt
@@ -24,10 +24,9 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.vector.ImageVector
 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.unit.dp
 import androidx.core.app.ShareCompat
@@ -128,19 +127,19 @@ class CreateCallLinkBottomSheetDialogFragment : ComposeBottomSheetDialogFragment
 
       Rows.TextRow(
         text = stringResource(id = R.string.CreateCallLinkBottomSheetDialogFragment__share_link_via_signal),
-        icon = ImageVector.vectorResource(id = R.drawable.symbol_forward_24),
+        icon = painterResource(id = R.drawable.symbol_forward_24),
         onClick = this@CreateCallLinkBottomSheetDialogFragment::onShareViaSignalClicked
       )
 
       Rows.TextRow(
         text = stringResource(id = R.string.CreateCallLinkBottomSheetDialogFragment__copy_link),
-        icon = ImageVector.vectorResource(id = R.drawable.symbol_copy_android_24),
+        icon = painterResource(id = R.drawable.symbol_copy_android_24),
         onClick = this@CreateCallLinkBottomSheetDialogFragment::onCopyLinkClicked
       )
 
       Rows.TextRow(
         text = stringResource(id = R.string.CreateCallLinkBottomSheetDialogFragment__share_link),
-        icon = ImageVector.vectorResource(id = R.drawable.symbol_share_android_24),
+        icon = painterResource(id = R.drawable.symbol_share_android_24),
         onClick = this@CreateCallLinkBottomSheetDialogFragment::onShareLinkClicked
       )
 
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 1738c944cf..af39062092 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
@@ -10,11 +10,13 @@ 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.jobs.CallLinkUpdateSendJob
 import org.thoughtcrime.securesms.recipients.Recipient
 import org.thoughtcrime.securesms.recipients.RecipientId
 import org.thoughtcrime.securesms.service.webrtc.links.CallLinkCredentials
 import org.thoughtcrime.securesms.service.webrtc.links.CreateCallLinkResult
 import org.thoughtcrime.securesms.service.webrtc.links.SignalCallLinkManager
+import org.whispersystems.signalservice.internal.push.SyncMessage
 
 /**
  * Repository for creating new call links. This will delegate to the [SignalCallLinkManager]
@@ -44,6 +46,13 @@ class CreateCallLinkRepository(
                 )
               )
 
+              ApplicationDependencies.getJobManager().add(
+                CallLinkUpdateSendJob(
+                  credentials.roomId,
+                  SyncMessage.CallLinkUpdate.Type.UPDATE
+                )
+              )
+
               EnsureCallLinkCreatedResult.Success(
                 Recipient.resolved(
                   SignalDatabase.recipients.getByCallLinkRoomId(credentials.roomId).get()
diff --git a/app/src/main/java/org/thoughtcrime/securesms/calls/links/details/CallLinkDetailsFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/calls/links/details/CallLinkDetailsFragment.kt
index f0689ac88a..023f7b54f8 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/calls/links/details/CallLinkDetailsFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/calls/links/details/CallLinkDetailsFragment.kt
@@ -17,10 +17,8 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.res.vectorResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.core.app.ActivityCompat
@@ -287,25 +285,25 @@ private fun CallLinkDetails(
 
       Rows.TextRow(
         text = stringResource(id = R.string.CreateCallLinkBottomSheetDialogFragment__share_link_via_signal),
-        icon = ImageVector.vectorResource(id = R.drawable.symbol_forward_24),
+        icon = painterResource(id = R.drawable.symbol_forward_24),
         onClick = callback::onShareLinkViaSignalClicked
       )
 
       Rows.TextRow(
         text = stringResource(id = R.string.CreateCallLinkBottomSheetDialogFragment__copy_link),
-        icon = ImageVector.vectorResource(id = R.drawable.symbol_copy_android_24),
+        icon = painterResource(id = R.drawable.symbol_copy_android_24),
         onClick = callback::onCopyClicked
       )
 
       Rows.TextRow(
         text = stringResource(id = R.string.CallLinkDetailsFragment__share_link),
-        icon = ImageVector.vectorResource(id = R.drawable.symbol_link_24),
+        icon = painterResource(id = R.drawable.symbol_link_24),
         onClick = callback::onShareClicked
       )
 
       Rows.TextRow(
         text = stringResource(id = R.string.CallLinkDetailsFragment__delete_call_link),
-        icon = ImageVector.vectorResource(id = R.drawable.symbol_trash_24),
+        icon = painterResource(id = R.drawable.symbol_trash_24),
         foregroundTint = MaterialTheme.colorScheme.error,
         onClick = callback::onDeleteClicked
       )
diff --git a/app/src/main/java/org/thoughtcrime/securesms/calls/log/CallLogAdapter.kt b/app/src/main/java/org/thoughtcrime/securesms/calls/log/CallLogAdapter.kt
index da4557f780..488ce8ed0b 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/calls/log/CallLogAdapter.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/calls/log/CallLogAdapter.kt
@@ -305,7 +305,7 @@ class CallLogAdapter(
 
       val color = ContextCompat.getColor(
         context,
-        if (call.record.event.isMissedCall()) {
+        if (call.record.isDisplayedAsMissedCallInUi) {
           R.color.signal_colorError
         } else {
           R.color.signal_colorOnSurfaceVariant
@@ -371,11 +371,11 @@ class CallLogAdapter(
     private fun getCallStateDrawableRes(call: CallTable.Call): Int {
       return when (call.messageType) {
         MessageTypes.MISSED_VIDEO_CALL_TYPE, MessageTypes.MISSED_AUDIO_CALL_TYPE -> R.drawable.symbol_missed_incoming_compact_16
-        MessageTypes.INCOMING_AUDIO_CALL_TYPE, MessageTypes.INCOMING_VIDEO_CALL_TYPE -> R.drawable.symbol_arrow_downleft_compact_16
+        MessageTypes.INCOMING_AUDIO_CALL_TYPE, MessageTypes.INCOMING_VIDEO_CALL_TYPE -> if (call.isDisplayedAsMissedCallInUi) R.drawable.symbol_missed_incoming_compact_16 else R.drawable.symbol_arrow_downleft_compact_16
         MessageTypes.OUTGOING_AUDIO_CALL_TYPE, MessageTypes.OUTGOING_VIDEO_CALL_TYPE -> R.drawable.symbol_arrow_upright_compact_16
         MessageTypes.GROUP_CALL_TYPE -> when {
           call.type == CallTable.Type.AD_HOC_CALL -> R.drawable.symbol_link_compact_16
-          call.event.isMissedCall() -> R.drawable.symbol_missed_incoming_compact_16
+          call.isDisplayedAsMissedCallInUi -> R.drawable.symbol_missed_incoming_compact_16
           call.event == CallTable.Event.GENERIC_GROUP_CALL || call.event == CallTable.Event.JOINED -> R.drawable.symbol_group_compact_16
           call.direction == CallTable.Direction.INCOMING -> R.drawable.symbol_arrow_downleft_compact_16
           call.direction == CallTable.Direction.OUTGOING -> R.drawable.symbol_arrow_upright_compact_16
@@ -389,23 +389,19 @@ class CallLogAdapter(
     @StringRes
     private fun getCallStateStringRes(call: CallTable.Call): Int {
       return when (call.messageType) {
-        MessageTypes.MISSED_VIDEO_CALL_TYPE,
-        MessageTypes.MISSED_AUDIO_CALL_TYPE -> if (call.event == CallTable.Event.MISSED) R.string.CallLogAdapter__missed else R.string.CallLogAdapter__missed_notification_profile
-        MessageTypes.INCOMING_AUDIO_CALL_TYPE -> R.string.CallLogAdapter__incoming
-        MessageTypes.INCOMING_VIDEO_CALL_TYPE -> R.string.CallLogAdapter__incoming
+        MessageTypes.MISSED_VIDEO_CALL_TYPE, MessageTypes.MISSED_AUDIO_CALL_TYPE -> if (call.event == CallTable.Event.MISSED) R.string.CallLogAdapter__missed else R.string.CallLogAdapter__missed_notification_profile
         MessageTypes.OUTGOING_AUDIO_CALL_TYPE -> R.string.CallLogAdapter__outgoing
         MessageTypes.OUTGOING_VIDEO_CALL_TYPE -> R.string.CallLogAdapter__outgoing
         MessageTypes.GROUP_CALL_TYPE -> when {
           call.type == CallTable.Type.AD_HOC_CALL -> R.string.CallLogAdapter__call_link
-          call.event == CallTable.Event.MISSED -> R.string.CallLogAdapter__missed
           call.event == CallTable.Event.MISSED_NOTIFICATION_PROFILE -> R.string.CallLogAdapter__missed_notification_profile
+          call.isDisplayedAsMissedCallInUi -> R.string.CallLogAdapter__missed
           call.event == CallTable.Event.GENERIC_GROUP_CALL || call.event == CallTable.Event.JOINED -> R.string.CallPreference__group_call
           call.direction == CallTable.Direction.INCOMING -> R.string.CallLogAdapter__incoming
           call.direction == CallTable.Direction.OUTGOING -> R.string.CallLogAdapter__outgoing
           else -> throw AssertionError()
         }
-
-        else -> error("Unexpected type ${call.messageType}")
+        else -> if (call.isDisplayedAsMissedCallInUi) R.string.CallLogAdapter__missed else R.string.CallLogAdapter__incoming
       }
     }
   }
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 8d73f8eded..80a3ad3e8d 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/ComposeText.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/ComposeText.java
@@ -57,9 +57,9 @@
 
 public class ComposeText extends EmojiEditText {
 
-  private static final char EMOJI_STARTER       = ':';
-
-  private static final Pattern TIME_PATTERN = Pattern.compile("^[0-9]{1,2}:[0-9]{1,2}$");
+  private static final char    EMOJI_STARTER    = ':';
+  private static final int     MAX_QUERY_LENGTH = 64;
+  private static final Pattern TIME_PATTERN     = Pattern.compile("^[0-9]{1,2}:[0-9]{1,2}$");
 
   private CharSequence            hint;
   private MentionRendererDelegate mentionRendererDelegate;
@@ -370,16 +370,16 @@ private boolean changeSelectionForPartialMentions(@NonNull Spanned spanned, int
   }
 
   private void doAfterCursorChange(@NonNull Editable text) {
-    if (enoughToFilter(text, false)) {
-      performFiltering(text, false);
+    if (canFilter(text)) {
+      performFiltering(text);
     } else {
       clearInlineQuery();
     }
   }
 
-  private void performFiltering(@NonNull Editable text, boolean keywordEmojiSearch) {
+  private void performFiltering(@NonNull Editable text) {
     int        end        = getSelectionEnd();
-    QueryStart queryStart = findQueryStart(text, end, keywordEmojiSearch);
+    QueryStart queryStart = findQueryStart(text, end);
     int        start      = queryStart.index;
     String     query      = text.subSequence(start, end).toString();
 
@@ -387,7 +387,7 @@ private void performFiltering(@NonNull Editable text, boolean keywordEmojiSearch
       if (queryStart.isMentionQuery) {
         inlineQueryChangedListener.onQueryChanged(new InlineQuery.Mention(query));
       } else {
-        inlineQueryChangedListener.onQueryChanged(new InlineQuery.Emoji(query, keywordEmojiSearch));
+        inlineQueryChangedListener.onQueryChanged(new InlineQuery.Emoji(query));
       }
     }
   }
@@ -398,23 +398,25 @@ private void clearInlineQuery() {
     }
   }
 
-  private boolean enoughToFilter(@NonNull Editable text, boolean keywordEmojiSearch) {
+  private boolean canFilter(@NonNull Editable text) {
     int end = getSelectionEnd();
     if (end < 0) {
       return false;
     }
-    return findQueryStart(text, end, keywordEmojiSearch).index != -1;
+
+    QueryStart start = findQueryStart(text, end);
+    return start.index != -1 && ((end - start.index) <= MAX_QUERY_LENGTH);
   }
 
   public void replaceTextWithMention(@NonNull String displayName, @NonNull RecipientId recipientId) {
-    replaceText(createReplacementToken(displayName, recipientId), false);
+    replaceText(createReplacementToken(displayName, recipientId));
   }
 
   public void replaceText(@NonNull InlineQueryReplacement replacement) {
-    replaceText(replacement.toCharSequence(getContext()), replacement.isKeywordSearch());
+    replaceText(replacement.toCharSequence(getContext()));
   }
 
-  private void replaceText(@NonNull CharSequence replacement, boolean keywordReplacement) {
+  private void replaceText(@NonNull CharSequence replacement) {
     Editable text = getText();
     if (text == null) {
       return;
@@ -423,7 +425,7 @@ private void replaceText(@NonNull CharSequence replacement, boolean keywordRepla
     clearComposingText();
 
     int end   = getSelectionEnd();
-    int start = findQueryStart(text, end, keywordReplacement).index - (keywordReplacement ? 0 : 1);
+    int start = findQueryStart(text, end).index - 1;
 
     text.replace(start, end, "");
     text.insert(start, replacement);
@@ -444,17 +446,7 @@ private void replaceText(@NonNull CharSequence replacement, boolean keywordRepla
     return builder;
   }
 
-  private QueryStart findQueryStart(@NonNull CharSequence text, int inputCursorPosition, boolean keywordEmojiSearch) {
-    if (keywordEmojiSearch) {
-      int start = findQueryStart(text, inputCursorPosition, ' ');
-      if (start == -1 && inputCursorPosition != 0) {
-        start = 0;
-      } else if (start == inputCursorPosition) {
-        start = -1;
-      }
-      return new QueryStart(start, false);
-    }
-
+  private QueryStart findQueryStart(@NonNull CharSequence text, int inputCursorPosition) {
     QueryStart queryStart = new QueryStart(findQueryStart(text, inputCursorPosition, MENTION_STARTER), true);
 
     if (queryStart.index < 0) {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/FromTextView.java b/app/src/main/java/org/thoughtcrime/securesms/components/FromTextView.java
index 6202548b5a..b254011987 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/FromTextView.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/FromTextView.java
@@ -40,9 +40,15 @@ public void setText(Recipient recipient, @Nullable CharSequence fromString, @Nul
   }
 
   public void setText(Recipient recipient, @Nullable CharSequence fromString, @Nullable CharSequence suffix, boolean asThread) {
+    setText(recipient, fromString, suffix, asThread, false);
+  }
+
+  public void setText(Recipient recipient, @Nullable CharSequence fromString, @Nullable CharSequence suffix, boolean asThread, boolean showSelfAsYou) {
     SpannableStringBuilder builder  = new SpannableStringBuilder();
 
-    if (asThread && recipient.isSelf()) {
+    if (asThread && recipient.isSelf() && showSelfAsYou) {
+      builder.append(getContext().getString(R.string.Recipient_you));
+    } else if (asThread && recipient.isSelf()) {
       builder.append(getContext().getString(R.string.note_to_self));
     } else {
       builder.append(fromString);
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/registration/VerificationCodeView.kt b/app/src/main/java/org/thoughtcrime/securesms/components/registration/VerificationCodeView.kt
index 395d2b1a12..9677a38a5c 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/registration/VerificationCodeView.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/registration/VerificationCodeView.kt
@@ -59,7 +59,7 @@ class VerificationCodeView @JvmOverloads constructor(context: Context, attrs: At
     }
   }
 
-  interface OnCodeEnteredListener {
+  fun interface OnCodeEnteredListener {
     fun onCodeComplete(code: String)
   }
 
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 27787fdf3e..b5f69d4973 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
@@ -177,7 +177,7 @@ class AppSettingsFragment : DSLSettingsFragment(
         onClick = {
           findNavController().safeNavigate(R.id.action_appSettingsFragment_to_chatsSettingsFragment)
         },
-        isEnabled = state.isRegisteredAndUpToDate()
+        isEnabled = true
       )
 
       clickPref(
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 f6fcab0239..f67762179b 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,13 +1,16 @@
 package org.thoughtcrime.securesms.components.settings.app.chats
 
+import android.content.Intent
 import androidx.lifecycle.ViewModelProvider
 import androidx.navigation.Navigation
 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.configure
 import org.thoughtcrime.securesms.keyvalue.SignalStore
+import org.thoughtcrime.securesms.util.FeatureFlags
 import org.thoughtcrime.securesms.util.adapter.mapping.MappingAdapter
 import org.thoughtcrime.securesms.util.navigation.safeNavigate
 
@@ -82,9 +85,23 @@ class ChatsSettingsFragment : DSLSettingsFragment(R.string.preferences_chats__ch
 
       sectionHeaderPref(R.string.preferences_chats__backups)
 
+      if (FeatureFlags.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),
+          onClick = {
+            if (state.remoteBackupsEnabled) {
+              Navigation.findNavController(requireView()).safeNavigate(R.id.action_chatsSettingsFragment_to_remoteBackupsSettingsFragment)
+            } else {
+              startActivity(Intent(requireContext(), MessageBackupsFlowActivity::class.java))
+            }
+          }
+        )
+      }
+
       clickPref(
         title = DSLSettingsText.from(R.string.preferences_chats__chat_backups),
-        summary = DSLSettingsText.from(if (state.chatBackupsEnabled) R.string.arrays__enabled else R.string.arrays__disabled),
+        summary = DSLSettingsText.from(if (state.localBackupsEnabled) R.string.arrays__enabled else R.string.arrays__disabled),
         onClick = {
           Navigation.findNavController(requireView()).safeNavigate(R.id.action_chatsSettingsFragment_to_backupsPreferenceFragment)
         }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/chats/ChatsSettingsState.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/chats/ChatsSettingsState.kt
index f47f48d11a..8429a69eb8 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/chats/ChatsSettingsState.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/chats/ChatsSettingsState.kt
@@ -6,5 +6,6 @@ data class ChatsSettingsState(
   val keepMutedChatsArchived: Boolean,
   val useSystemEmoji: Boolean,
   val enterKeySends: Boolean,
-  val chatBackupsEnabled: Boolean
+  val localBackupsEnabled: Boolean,
+  val remoteBackupsEnabled: Boolean
 )
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 d6557edb19..e750449c92 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
@@ -22,7 +22,8 @@ class ChatsSettingsViewModel @JvmOverloads constructor(
       keepMutedChatsArchived = SignalStore.settings().shouldKeepMutedChatsArchived(),
       useSystemEmoji = SignalStore.settings().isPreferSystemEmoji,
       enterKeySends = SignalStore.settings().isEnterKeySends,
-      chatBackupsEnabled = SignalStore.settings().isBackupEnabled && BackupUtil.canUserAccessBackupDirectory(ApplicationDependencies.getApplication())
+      localBackupsEnabled = SignalStore.settings().isBackupEnabled && BackupUtil.canUserAccessBackupDirectory(ApplicationDependencies.getApplication()),
+      remoteBackupsEnabled = SignalStore.backup().areBackupsEnabled
     )
   )
 
@@ -62,8 +63,8 @@ class ChatsSettingsViewModel @JvmOverloads constructor(
 
   fun refresh() {
     val backupsEnabled = SignalStore.settings().isBackupEnabled && BackupUtil.canUserAccessBackupDirectory(ApplicationDependencies.getApplication())
-    if (store.state.chatBackupsEnabled != backupsEnabled) {
-      store.update { it.copy(chatBackupsEnabled = backupsEnabled) }
+    if (store.state.localBackupsEnabled != backupsEnabled) {
+      store.update { it.copy(localBackupsEnabled = backupsEnabled) }
     }
   }
 }
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
new file mode 100644
index 0000000000..d1c0cd378c
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/chats/backups/RemoteBackupsSettingsFragment.kt
@@ -0,0 +1,571 @@
+/*
+ * Copyright 2024 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.thoughtcrime.securesms.components.settings.app.chats.backups
+
+import android.content.Intent
+import androidx.compose.foundation.background
+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.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.material3.AlertDialog
+import androidx.compose.material3.AlertDialogDefaults
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.SnackbarHostState
+import androidx.compose.material3.Text
+import androidx.compose.material3.TextButton
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.Stable
+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.unit.dp
+import androidx.navigation.fragment.findNavController
+import kotlinx.collections.immutable.persistentListOf
+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.Rows
+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.thoughtcrime.securesms.R
+import org.thoughtcrime.securesms.backup.v2.ui.subscription.MessageBackupsFlowActivity
+import org.thoughtcrime.securesms.backup.v2.ui.subscription.MessageBackupsFrequency
+import org.thoughtcrime.securesms.backup.v2.ui.subscription.MessageBackupsType
+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
+
+/**
+ * Remote backups settings fragment.
+ *
+ * TODO [message-backups] -- All copy in this file is non-final
+ */
+class RemoteBackupsSettingsFragment : ComposeFragment() {
+
+  private val viewModel by viewModel {
+    RemoteBackupsSettingsViewModel()
+  }
+
+  @Composable
+  override fun FragmentContent() {
+    val state by viewModel.state
+    val callbacks = remember { Callbacks() }
+
+    RemoteBackupsSettingsContent(
+      messageBackupsType = state.messageBackupsType,
+      lastBackupTimestamp = state.lastBackupTimestamp,
+      canBackUpUsingCellular = state.canBackUpUsingCellular,
+      backupsFrequency = state.backupsFrequency,
+      requestedDialog = state.dialog,
+      requestedSnackbar = state.snackbar,
+      contentCallbacks = callbacks
+    )
+  }
+
+  @Stable
+  private inner class Callbacks : ContentCallbacks {
+    override fun onNavigationClick() {
+      findNavController().popBackStack()
+    }
+
+    override fun onEnableBackupsClick() {
+      startActivity(Intent(requireContext(), MessageBackupsFlowActivity::class.java))
+    }
+
+    override fun onBackUpUsingCellularClick(canUseCellular: Boolean) {
+      viewModel.setCanBackUpUsingCellular(canUseCellular)
+    }
+
+    override fun onViewPaymentHistory() {
+      // TODO [message-backups] Navigate to payment history
+    }
+
+    override fun onBackupNowClick() {
+      // TODO [message-backups] Enqueue immediate backup
+    }
+
+    override fun onTurnOffAndDeleteBackupsClick() {
+      viewModel.requestDialog(RemoteBackupsSettingsState.Dialog.TURN_OFF_AND_DELETE_BACKUPS)
+    }
+
+    override fun onChangeBackupFrequencyClick() {
+      viewModel.requestDialog(RemoteBackupsSettingsState.Dialog.BACKUP_FREQUENCY)
+    }
+
+    override fun onDialogDismissed() {
+      viewModel.requestDialog(RemoteBackupsSettingsState.Dialog.NONE)
+    }
+
+    override fun onSnackbarDismissed() {
+      viewModel.requestSnackbar(RemoteBackupsSettingsState.Snackbar.NONE)
+    }
+
+    override fun onSelectBackupsFrequencyChange(newFrequency: MessageBackupsFrequency) {
+      viewModel.setBackupsFrequency(newFrequency)
+    }
+
+    override fun onTurnOffAndDeleteBackupsConfirm() {
+      viewModel.turnOffAndDeleteBackups()
+    }
+
+    override fun onBackupsTypeClick() {
+      findNavController().safeNavigate(R.id.action_remoteBackupsSettingsFragment_to_backupsTypeSettingsFragment)
+    }
+  }
+}
+
+/**
+ * Callback interface for RemoteBackupsSettingsContent composable.
+ */
+private interface ContentCallbacks {
+  fun onNavigationClick() = Unit
+  fun onEnableBackupsClick() = Unit
+  fun onBackupsTypeClick() = Unit
+  fun onBackUpUsingCellularClick(canUseCellular: Boolean) = Unit
+  fun onViewPaymentHistory() = Unit
+  fun onBackupNowClick() = Unit
+  fun onTurnOffAndDeleteBackupsClick() = Unit
+  fun onChangeBackupFrequencyClick() = Unit
+  fun onDialogDismissed() = Unit
+  fun onSnackbarDismissed() = Unit
+  fun onSelectBackupsFrequencyChange(newFrequency: MessageBackupsFrequency) = Unit
+  fun onTurnOffAndDeleteBackupsConfirm() = Unit
+}
+
+@Composable
+private fun RemoteBackupsSettingsContent(
+  messageBackupsType: MessageBackupsType?,
+  lastBackupTimestamp: Long,
+  canBackUpUsingCellular: Boolean,
+  backupsFrequency: MessageBackupsFrequency,
+  requestedDialog: RemoteBackupsSettingsState.Dialog,
+  requestedSnackbar: RemoteBackupsSettingsState.Snackbar,
+  contentCallbacks: ContentCallbacks
+) {
+  val snackbarHostState = remember {
+    SnackbarHostState()
+  }
+
+  Scaffolds.Settings(
+    title = "Signal Backups",
+    onNavigationClick = contentCallbacks::onNavigationClick,
+    navigationIconPainter = painterResource(id = R.drawable.symbol_arrow_left_24),
+    snackbarHost = {
+      Snackbars.Host(snackbarHostState = snackbarHostState)
+    }
+  ) {
+    LazyColumn(
+      modifier = Modifier
+        .padding(it)
+    ) {
+      item {
+        BackupTypeRow(
+          messageBackupsType = messageBackupsType,
+          onEnableBackupsClick = contentCallbacks::onEnableBackupsClick,
+          onChangeBackupsTypeClick = contentCallbacks::onBackupsTypeClick
+        )
+      }
+
+      if (messageBackupsType == null) {
+        item {
+          Rows.TextRow(
+            text = "Payment history",
+            onClick = contentCallbacks::onViewPaymentHistory
+          )
+        }
+      } else {
+        item {
+          Dividers.Default()
+        }
+
+        item {
+          Texts.SectionHeader(text = "Backup Details")
+        }
+
+        item {
+          LastBackupRow(
+            lastBackupTimestamp = lastBackupTimestamp,
+            onBackupNowClick = {}
+          )
+        }
+
+        item {
+          Rows.TextRow(text = {
+            Column {
+              Text(
+                text = "Backup size",
+                style = MaterialTheme.typography.bodyLarge,
+                color = MaterialTheme.colorScheme.onSurface
+              )
+              Text(
+                text = "2.3GB",
+                style = MaterialTheme.typography.bodyMedium,
+                color = MaterialTheme.colorScheme.onSurfaceVariant
+              )
+            }
+          })
+        }
+
+        item {
+          Rows.TextRow(
+            text = {
+              Column {
+                Text(
+                  text = "Backup frequency",
+                  style = MaterialTheme.typography.bodyLarge,
+                  color = MaterialTheme.colorScheme.onSurface
+                )
+                Text(
+                  text = getTextForFrequency(backupsFrequency = backupsFrequency),
+                  style = MaterialTheme.typography.bodyMedium,
+                  color = MaterialTheme.colorScheme.onSurfaceVariant
+                )
+              }
+            },
+            onClick = contentCallbacks::onChangeBackupFrequencyClick
+          )
+        }
+
+        item {
+          Rows.ToggleRow(
+            checked = canBackUpUsingCellular,
+            text = "Back up using cellular",
+            onCheckChanged = contentCallbacks::onBackUpUsingCellularClick
+          )
+        }
+
+        item {
+          Dividers.Default()
+        }
+
+        item {
+          Rows.TextRow(
+            text = "Turn off and delete backup",
+            foregroundTint = MaterialTheme.colorScheme.error,
+            onClick = contentCallbacks::onTurnOffAndDeleteBackupsClick
+          )
+        }
+      }
+    }
+  }
+
+  when (requestedDialog) {
+    RemoteBackupsSettingsState.Dialog.NONE -> {}
+    RemoteBackupsSettingsState.Dialog.TURN_OFF_AND_DELETE_BACKUPS -> {
+      TurnOffAndDeleteBackupsDialog(
+        onConfirm = contentCallbacks::onTurnOffAndDeleteBackupsConfirm,
+        onDismiss = contentCallbacks::onDialogDismissed
+      )
+    }
+
+    RemoteBackupsSettingsState.Dialog.BACKUP_FREQUENCY -> {
+      BackupFrequencyDialog(
+        selected = backupsFrequency,
+        onSelected = contentCallbacks::onSelectBackupsFrequencyChange,
+        onDismiss = contentCallbacks::onDialogDismissed
+      )
+    }
+  }
+
+  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"
+        )
+      }
+    }
+    contentCallbacks.onSnackbarDismissed()
+  }
+}
+
+@Composable
+private fun BackupTypeRow(
+  messageBackupsType: MessageBackupsType?,
+  onEnableBackupsClick: () -> Unit,
+  onChangeBackupsTypeClick: () -> Unit
+) {
+  Row(
+    modifier = Modifier
+      .fillMaxWidth()
+      .clickable(enabled = messageBackupsType != null, onClick = onChangeBackupsTypeClick)
+      .padding(horizontal = dimensionResource(id = R.dimen.core_ui__gutter))
+      .padding(top = 16.dp, bottom = 14.dp)
+  ) {
+    Column(
+      modifier = Modifier.weight(1f)
+    ) {
+      Text(
+        text = "Backup type",
+        style = MaterialTheme.typography.bodyLarge,
+        color = MaterialTheme.colorScheme.onSurface
+      )
+
+      if (messageBackupsType == null) {
+        Text(
+          text = "Backups disabled",
+          style = MaterialTheme.typography.bodyMedium,
+          color = MaterialTheme.colorScheme.onSurfaceVariant
+        )
+      } else {
+        val localResources = LocalContext.current.resources
+        val formattedCurrency = remember(messageBackupsType.pricePerMonth) {
+          FiatMoneyUtil.format(localResources, messageBackupsType.pricePerMonth, FiatMoneyUtil.formatOptions().trimZerosAfterDecimal())
+        }
+
+        Text(
+          text = "${messageBackupsType.title} · $formattedCurrency/month"
+        )
+      }
+    }
+
+    if (messageBackupsType == null) {
+      Buttons.Small(onClick = onEnableBackupsClick) {
+        Text(text = "Enable backups")
+      }
+    }
+  }
+}
+
+@Composable
+private fun LastBackupRow(
+  lastBackupTimestamp: Long,
+  onBackupNowClick: () -> Unit
+) {
+  Row(
+    modifier = Modifier
+      .padding(horizontal = dimensionResource(id = R.dimen.core_ui__gutter))
+      .padding(top = 16.dp, bottom = 14.dp)
+  ) {
+    Column(
+      modifier = Modifier.weight(1f)
+    ) {
+      Text(
+        text = "Last backup",
+        style = MaterialTheme.typography.bodyLarge,
+        color = MaterialTheme.colorScheme.onSurface
+      )
+
+      if (lastBackupTimestamp > 0) {
+        val context = LocalContext.current
+
+        val day = remember(lastBackupTimestamp) {
+          DateUtils.getDayPrecisionTimeString(context, Locale.getDefault(), lastBackupTimestamp)
+        }
+
+        val time = remember(lastBackupTimestamp) {
+          DateUtils.getOnlyTimeString(context, lastBackupTimestamp)
+        }
+
+        Text(
+          text = "$day at $time",
+          style = MaterialTheme.typography.bodyMedium,
+          color = MaterialTheme.colorScheme.onSurfaceVariant
+        )
+      } else {
+        Text(
+          text = "Never",
+          style = MaterialTheme.typography.bodyMedium,
+          color = MaterialTheme.colorScheme.onSurfaceVariant
+        )
+      }
+    }
+
+    Buttons.Small(onClick = onBackupNowClick) {
+      Text(text = "Back up now")
+    }
+  }
+}
+
+@Composable
+private fun TurnOffAndDeleteBackupsDialog(
+  onConfirm: () -> Unit,
+  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",
+    dismiss = stringResource(id = android.R.string.cancel),
+    confirmColor = MaterialTheme.colorScheme.error,
+    onConfirm = onConfirm,
+    onDismiss = onDismiss
+  )
+}
+
+@OptIn(ExperimentalMaterial3Api::class)
+@Composable
+private fun BackupFrequencyDialog(
+  selected: MessageBackupsFrequency,
+  onSelected: (MessageBackupsFrequency) -> Unit,
+  onDismiss: () -> Unit
+) {
+  AlertDialog(
+    onDismissRequest = onDismiss
+  ) {
+    Column(
+      modifier = Modifier
+        .background(
+          color = AlertDialogDefaults.containerColor,
+          shape = AlertDialogDefaults.shape
+        )
+        .fillMaxWidth()
+    ) {
+      Text(
+        text = "Backup frequency",
+        style = MaterialTheme.typography.headlineMedium,
+        modifier = Modifier.padding(24.dp)
+      )
+
+      MessageBackupsFrequency.values().forEach {
+        Rows.RadioRow(
+          selected = selected == it,
+          text = getTextForFrequency(backupsFrequency = it),
+          label = when (it) {
+            MessageBackupsFrequency.NEVER -> "By tapping \"Back up now\""
+            else -> null
+          },
+          modifier = Modifier
+            .padding(end = 24.dp)
+            .clickable(onClick = {
+              onSelected(it)
+              onDismiss()
+            })
+        )
+      }
+
+      Box(
+        contentAlignment = Alignment.CenterEnd,
+        modifier = Modifier
+          .fillMaxWidth()
+          .padding(horizontal = 24.dp)
+          .padding(bottom = 24.dp)
+      ) {
+        TextButton(onClick = onDismiss) {
+          Text(text = stringResource(id = android.R.string.cancel))
+        }
+      }
+    }
+  }
+}
+
+@Composable
+private fun getTextForFrequency(backupsFrequency: MessageBackupsFrequency): String {
+  return when (backupsFrequency) {
+    MessageBackupsFrequency.DAILY -> "Daily"
+    MessageBackupsFrequency.WEEKLY -> "Weekly"
+    MessageBackupsFrequency.MONTHLY -> "Monthly"
+    MessageBackupsFrequency.NEVER -> "Manually back up"
+  }
+}
+
+@SignalPreview
+@Composable
+private fun RemoteBackupsSettingsContentPreview() {
+  Previews.Preview {
+    RemoteBackupsSettingsContent(
+      messageBackupsType = null,
+      lastBackupTimestamp = -1,
+      canBackUpUsingCellular = false,
+      backupsFrequency = MessageBackupsFrequency.NEVER,
+      requestedDialog = RemoteBackupsSettingsState.Dialog.NONE,
+      requestedSnackbar = RemoteBackupsSettingsState.Snackbar.NONE,
+      contentCallbacks = object : ContentCallbacks {}
+    )
+  }
+}
+
+@SignalPreview
+@Composable
+private fun BackupTypeRowPreview() {
+  Previews.Preview {
+    BackupTypeRow(
+      messageBackupsType = MessageBackupsType(
+        title = "Text + all media",
+        pricePerMonth = FiatMoney(BigDecimal.valueOf(3L), Currency.getInstance(Locale.US)),
+        features = persistentListOf()
+      ),
+      onChangeBackupsTypeClick = {},
+      onEnableBackupsClick = {}
+    )
+  }
+}
+
+@SignalPreview
+@Composable
+private fun LastBackupRowPreview() {
+  Previews.Preview {
+    LastBackupRow(
+      lastBackupTimestamp = -1,
+      onBackupNowClick = {}
+    )
+  }
+}
+
+@SignalPreview
+@Composable
+private fun TurnOffAndDeleteBackupsDialogPreview() {
+  Previews.Preview {
+    TurnOffAndDeleteBackupsDialog(
+      onConfirm = {},
+      onDismiss = {}
+    )
+  }
+}
+
+@SignalPreview
+@Composable
+private fun BackupFrequencyDialogPreview() {
+  Previews.Preview {
+    BackupFrequencyDialog(
+      selected = MessageBackupsFrequency.DAILY,
+      onSelected = {},
+      onDismiss = {}
+    )
+  }
+}
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
new file mode 100644
index 0000000000..fedf62ab1e
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/chats/backups/RemoteBackupsSettingsState.kt
@@ -0,0 +1,33 @@
+/*
+ * Copyright 2024 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.thoughtcrime.securesms.components.settings.app.chats.backups
+
+import org.thoughtcrime.securesms.backup.v2.ui.subscription.MessageBackupsFrequency
+import org.thoughtcrime.securesms.backup.v2.ui.subscription.MessageBackupsType
+
+data class RemoteBackupsSettingsState(
+  val messageBackupsType: MessageBackupsType? = null,
+  val canBackUpUsingCellular: Boolean = false,
+  val backupSize: Long = 0,
+  val backupsFrequency: MessageBackupsFrequency = MessageBackupsFrequency.DAILY,
+  val lastBackupTimestamp: Long = 0,
+  val dialog: Dialog = Dialog.NONE,
+  val snackbar: Snackbar = Snackbar.NONE
+) {
+  enum class Dialog {
+    NONE,
+    TURN_OFF_AND_DELETE_BACKUPS,
+    BACKUP_FREQUENCY
+  }
+
+  enum class Snackbar {
+    NONE,
+    BACKUP_DELETED_AND_TURNED_OFF,
+    BACKUP_TYPE_CHANGED_AND_SUBSCRIPTION_CANCELLED,
+    SUBSCRIPTION_CANCELLED,
+    DOWNLOAD_COMPLETE
+  }
+}
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
new file mode 100644
index 0000000000..d4b6fc4967
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/chats/backups/RemoteBackupsSettingsViewModel.kt
@@ -0,0 +1,43 @@
+/*
+ * Copyright 2024 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.thoughtcrime.securesms.components.settings.app.chats.backups
+
+import androidx.compose.runtime.State
+import androidx.compose.runtime.mutableStateOf
+import androidx.lifecycle.ViewModel
+import org.thoughtcrime.securesms.backup.v2.ui.subscription.MessageBackupsFrequency
+
+/**
+ * ViewModel for state management of RemoteBackupsSettingsFragment
+ */
+class RemoteBackupsSettingsViewModel : ViewModel() {
+  private val internalState = mutableStateOf(RemoteBackupsSettingsState())
+
+  val state: State<RemoteBackupsSettingsState> = internalState
+
+  fun setCanBackUpUsingCellular(canBackUpUsingCellular: Boolean) {
+    // TODO [message-backups] -- Update via repository?
+    internalState.value = state.value.copy(canBackUpUsingCellular = canBackUpUsingCellular)
+  }
+
+  fun setBackupsFrequency(backupsFrequency: MessageBackupsFrequency) {
+    // TODO [message-backups] -- Update via repository?
+    internalState.value = state.value.copy(backupsFrequency = backupsFrequency)
+  }
+
+  fun requestDialog(dialog: RemoteBackupsSettingsState.Dialog) {
+    internalState.value = state.value.copy(dialog = dialog)
+  }
+
+  fun requestSnackbar(snackbar: RemoteBackupsSettingsState.Snackbar) {
+    internalState.value = state.value.copy(snackbar = snackbar)
+  }
+
+  fun turnOffAndDeleteBackups() {
+    // TODO [message-backups] -- Delete.
+    internalState.value = state.value.copy(snackbar = RemoteBackupsSettingsState.Snackbar.BACKUP_DELETED_AND_TURNED_OFF)
+  }
+}
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
new file mode 100644
index 0000000000..508b7c90d5
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/chats/backups/type/BackupsTypeSettingsFragment.kt
@@ -0,0 +1,197 @@
+/*
+ * Copyright 2024 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+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.getValue
+import androidx.compose.runtime.remember
+import androidx.compose.ui.Modifier
+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.core.util.money.FiatMoney
+//import org.signal.donations.PaymentSourceType
+import org.thoughtcrime.securesms.R
+import org.thoughtcrime.securesms.backup.v2.ui.subscription.MessageBackupsFlowActivity
+import org.thoughtcrime.securesms.backup.v2.ui.subscription.MessageBackupsType
+import org.thoughtcrime.securesms.compose.ComposeFragment
+import org.thoughtcrime.securesms.payments.FiatMoneyUtil
+import org.thoughtcrime.securesms.util.DateUtils
+import org.thoughtcrime.securesms.util.viewModel
+import java.math.BigDecimal
+import java.util.Currency
+import java.util.Locale
+
+/**
+ * Allows the user to modify their backup plan
+ */
+class BackupsTypeSettingsFragment : ComposeFragment() {
+
+  private val viewModel: BackupsTypeSettingsViewModel by viewModel {
+    BackupsTypeSettingsViewModel()
+  }
+
+  @Composable
+  override fun FragmentContent() {
+    val contentCallbacks = remember {
+      Callbacks()
+    }
+
+    val state by viewModel.state
+
+    BackupsTypeSettingsContent(
+      state = state,
+      contentCallbacks = contentCallbacks
+    )
+  }
+
+  private inner class Callbacks : ContentCallbacks {
+    override fun onNavigationClick() {
+      findNavController().popBackStack()
+    }
+
+    override fun onPaymentHistoryClick() {
+      // TODO [message-backups] Navigate to payment history
+    }
+
+    override fun onChangeOrCancelSubscriptionClick() {
+      startActivity(Intent(requireContext(), MessageBackupsFlowActivity::class.java))
+    }
+  }
+}
+
+private interface ContentCallbacks {
+  fun onNavigationClick() = Unit
+  fun onPaymentHistoryClick() = Unit
+  fun onChangeOrCancelSubscriptionClick() = Unit
+}
+
+@Composable
+private fun BackupsTypeSettingsContent(
+  state: BackupsTypeSettingsState,
+  contentCallbacks: ContentCallbacks
+) {
+  if (state.backupsType == null) {
+    return
+  }
+
+  Scaffolds.Settings(
+    title = "Backup Type",
+    onNavigationClick = contentCallbacks::onNavigationClick,
+    navigationIconPainter = painterResource(id = R.drawable.symbol_arrow_left_24)
+  ) {
+    LazyColumn(
+      modifier = Modifier.padding(it)
+    ) {
+      item {
+        BackupsTypeRow(
+          backupsType = state.backupsType,
+          nextRenewalTimestamp = state.nextRenewalTimestamp
+        )
+      }
+
+      item {
+//        PaymentSourceRow(
+//          paymentSourceType = state.paymentSourceType
+//        )
+      }
+
+      item {
+        Rows.TextRow(
+          text = "Change or cancel subscription", // TODO [message-backups] final copy
+          onClick = contentCallbacks::onChangeOrCancelSubscriptionClick
+        )
+      }
+
+      item {
+        Rows.TextRow(
+          text = "Payment history", // TODO [message-backups] final copy
+          onClick = contentCallbacks::onPaymentHistoryClick
+        )
+      }
+    }
+  }
+}
+
+@Composable
+private fun BackupsTypeRow(
+  backupsType: MessageBackupsType,
+  nextRenewalTimestamp: Long
+) {
+  val resources = LocalContext.current.resources
+  val formattedAmount = remember(backupsType.pricePerMonth) {
+    FiatMoneyUtil.format(resources, backupsType.pricePerMonth, FiatMoneyUtil.formatOptions().trimZerosAfterDecimal())
+  }
+
+  val renewal = remember(nextRenewalTimestamp) {
+    DateUtils.formatDateWithoutDayOfWeek(Locale.getDefault(), nextRenewalTimestamp)
+  }
+
+  Rows.TextRow(text = {
+    Column {
+      Text(text = backupsType.title)
+      Text(
+        text = "$formattedAmount/month . Renews $renewal", // TODO [message-backups] final copy
+        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
+private fun BackupsTypeSettingsContentPreview() {
+  Previews.Preview {
+    BackupsTypeSettingsContent(
+      state = BackupsTypeSettingsState(
+        backupsType = MessageBackupsType(
+          pricePerMonth = FiatMoney(BigDecimal.valueOf(3), Currency.getInstance("USD")),
+          title = "Text + all media",
+          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
new file mode 100644
index 0000000000..dbf19f0c67
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/chats/backups/type/BackupsTypeSettingsState.kt
@@ -0,0 +1,17 @@
+/*
+ * Copyright 2024 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+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.ui.subscription.MessageBackupsType
+
+@Stable
+data class BackupsTypeSettingsState(
+  val backupsType: 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
new file mode 100644
index 0000000000..c8ddcf34ea
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/chats/backups/type/BackupsTypeSettingsViewModel.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.type
+
+import androidx.compose.runtime.State
+import androidx.compose.runtime.mutableStateOf
+import androidx.lifecycle.ViewModel
+
+class BackupsTypeSettingsViewModel : ViewModel() {
+  private val internalState = mutableStateOf(BackupsTypeSettingsState())
+
+  val state: State<BackupsTypeSettingsState> = internalState
+}
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 b1ece67d5d..78563ed818 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
@@ -29,6 +29,11 @@ import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material3.Button
 import androidx.compose.material3.Checkbox
 import androidx.compose.material3.CircularProgressIndicator
+import androidx.compose.material3.DropdownMenu
+import androidx.compose.material3.DropdownMenuItem
+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.SnackbarHostState
@@ -37,6 +42,8 @@ import androidx.compose.material3.Switch
 import androidx.compose.material3.Tab
 import androidx.compose.material3.TabRow
 import androidx.compose.material3.Text
+import androidx.compose.material3.TextButton
+import androidx.compose.material3.TopAppBar
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
@@ -46,10 +53,12 @@ import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.fragment.app.viewModels
+import androidx.navigation.fragment.findNavController
 import org.signal.core.ui.Buttons
 import org.signal.core.ui.Dividers
 import org.signal.core.ui.Snackbars
@@ -57,10 +66,13 @@ import org.signal.core.ui.theme.SignalTheme
 import org.signal.core.util.bytes
 import org.signal.core.util.getLength
 import org.signal.core.util.roundedString
+import org.thoughtcrime.securesms.R
+import org.thoughtcrime.securesms.attachments.AttachmentId
 import org.thoughtcrime.securesms.components.settings.app.internal.backup.InternalBackupPlaygroundViewModel.BackupState
 import org.thoughtcrime.securesms.components.settings.app.internal.backup.InternalBackupPlaygroundViewModel.BackupUploadState
 import org.thoughtcrime.securesms.components.settings.app.internal.backup.InternalBackupPlaygroundViewModel.ScreenState
 import org.thoughtcrime.securesms.compose.ComposeFragment
+import org.thoughtcrime.securesms.keyvalue.SignalStore
 
 class InternalBackupPlaygroundFragment : ComposeFragment() {
 
@@ -114,6 +126,8 @@ class InternalBackupPlaygroundFragment : ComposeFragment() {
     }
 
     Tabs(
+      onBack = { findNavController().popBackStack() },
+      onDeleteAllArchivedMedia = { viewModel.deleteAllArchivedMedia() },
       mainContent = {
         Screen(
           state = state,
@@ -149,25 +163,32 @@ class InternalBackupPlaygroundFragment : ComposeFragment() {
             }
 
             validateFileLauncher.launch(intent)
-          }
+          },
+          onTriggerBackupJobClicked = { viewModel.triggerBackupJob() },
+          onRestoreFromRemoteClicked = { viewModel.restoreFromRemote() }
         )
       },
       mediaContent = { snackbarHostState ->
         MediaList(
+          enabled = SignalStore.backup().canReadWriteToArchiveCdn,
           state = mediaState,
           snackbarHostState = snackbarHostState,
-          backupAttachmentMedia = { viewModel.backupAttachmentMedia(it) },
-          deleteBackupAttachmentMedia = { viewModel.deleteBackupAttachmentMedia(it) },
-          batchBackupAttachmentMedia = { viewModel.backupAttachmentMedia(it) },
-          batchDeleteBackupAttachmentMedia = { viewModel.deleteBackupAttachmentMedia(it) }
+          archiveAttachmentMedia = { viewModel.archiveAttachmentMedia(it) },
+          deleteArchivedMedia = { viewModel.deleteArchivedMedia(it) },
+          batchArchiveAttachmentMedia = { viewModel.archiveAttachmentMedia(it) },
+          batchDeleteBackupAttachmentMedia = { viewModel.deleteArchivedMedia(it) },
+          restoreArchivedMedia = { viewModel.restoreArchivedMedia(it) }
         )
       }
     )
   }
 }
 
+@OptIn(ExperimentalMaterial3Api::class)
 @Composable
 fun Tabs(
+  onBack: () -> Unit,
+  onDeleteAllArchivedMedia: () -> Unit,
   mainContent: @Composable () -> Unit,
   mediaContent: @Composable (snackbarHostState: SnackbarHostState) -> Unit
 ) {
@@ -179,13 +200,36 @@ fun Tabs(
   Scaffold(
     snackbarHost = { Snackbars.Host(snackbarHostState) },
     topBar = {
-      TabRow(selectedTabIndex = tabIndex) {
-        tabs.forEachIndexed { index, tab ->
-          Tab(
-            text = { Text(tab) },
-            selected = index == tabIndex,
-            onClick = { tabIndex = index }
-          )
+      Column {
+        TopAppBar(
+          title = {
+            Text("Backup Playground")
+          },
+          navigationIcon = {
+            IconButton(onClick = onBack) {
+              Icon(
+                painter = painterResource(R.drawable.symbol_arrow_left_24),
+                tint = MaterialTheme.colorScheme.onSurface,
+                contentDescription = null
+              )
+            }
+          },
+          actions = {
+            if (tabIndex == 1 && SignalStore.backup().canReadWriteToArchiveCdn) {
+              TextButton(onClick = onDeleteAllArchivedMedia) {
+                Text(text = "Delete All")
+              }
+            }
+          }
+        )
+        TabRow(selectedTabIndex = tabIndex) {
+          tabs.forEachIndexed { index, tab ->
+            Tab(
+              text = { Text(tab) },
+              selected = index == tabIndex,
+              onClick = { tabIndex = index }
+            )
+          }
         }
       }
     }
@@ -209,7 +253,9 @@ fun Screen(
   onSaveToDiskClicked: () -> Unit = {},
   onValidateFileClicked: () -> Unit = {},
   onUploadToRemoteClicked: () -> Unit = {},
-  onCheckRemoteBackupStateClicked: () -> Unit = {}
+  onCheckRemoteBackupStateClicked: () -> Unit = {},
+  onTriggerBackupJobClicked: () -> Unit = {},
+  onRestoreFromRemoteClicked: () -> Unit = {}
 ) {
   Surface {
     Column(
@@ -239,6 +285,13 @@ fun Screen(
         Text("Export")
       }
 
+      Buttons.LargePrimary(
+        onClick = onTriggerBackupJobClicked,
+        enabled = !state.backupState.inProgress
+      ) {
+        Text("Trigger Backup Job")
+      }
+
       Dividers.Default()
 
       Buttons.LargeTonal(
@@ -280,6 +333,10 @@ fun Screen(
           }
         }
 
+        BackupState.BACKUP_JOB_DONE -> {
+          StateLabel("Backup complete and uploaded")
+        }
+
         BackupState.IMPORT_IN_PROGRESS -> {
           StateLabel("Import in progress...")
         }
@@ -324,6 +381,10 @@ fun Screen(
 
       Spacer(modifier = Modifier.height(8.dp))
 
+      Buttons.LargePrimary(onClick = onRestoreFromRemoteClicked) {
+        Text("Restore from remote")
+      }
+
       when (state.uploadState) {
         BackupUploadState.NONE -> {
           StateLabel("")
@@ -357,13 +418,24 @@ private fun StateLabel(text: String) {
 @OptIn(ExperimentalFoundationApi::class)
 @Composable
 fun MediaList(
+  enabled: Boolean,
   state: InternalBackupPlaygroundViewModel.MediaState,
   snackbarHostState: SnackbarHostState,
-  backupAttachmentMedia: (InternalBackupPlaygroundViewModel.BackupAttachment) -> Unit,
-  deleteBackupAttachmentMedia: (InternalBackupPlaygroundViewModel.BackupAttachment) -> Unit,
-  batchBackupAttachmentMedia: (Set<String>) -> Unit,
-  batchDeleteBackupAttachmentMedia: (Set<String>) -> Unit
+  archiveAttachmentMedia: (InternalBackupPlaygroundViewModel.BackupAttachment) -> Unit,
+  deleteArchivedMedia: (InternalBackupPlaygroundViewModel.BackupAttachment) -> Unit,
+  batchArchiveAttachmentMedia: (Set<AttachmentId>) -> Unit,
+  batchDeleteBackupAttachmentMedia: (Set<AttachmentId>) -> Unit,
+  restoreArchivedMedia: (InternalBackupPlaygroundViewModel.BackupAttachment) -> Unit
 ) {
+  if (!enabled) {
+    Text(
+      text = "You do not have read/write to archive cdn enabled via SignalStore.backup()",
+      modifier = Modifier
+        .padding(16.dp)
+    )
+    return
+  }
+
   LaunchedEffect(state.error?.id) {
     state.error?.let {
       snackbarHostState.showSnackbar(it.errorText)
@@ -384,51 +456,88 @@ fun MediaList(
             .combinedClickable(
               onClick = {
                 if (selectionState.selecting) {
-                  selectionState = selectionState.copy(selected = if (selectionState.selected.contains(attachment.mediaId)) selectionState.selected - attachment.mediaId else selectionState.selected + attachment.mediaId)
+                  selectionState = selectionState.copy(selected = if (selectionState.selected.contains(attachment.id)) selectionState.selected - attachment.id else selectionState.selected + attachment.id)
                 }
               },
               onLongClick = {
-                selectionState = if (selectionState.selecting) MediaMultiSelectState() else MediaMultiSelectState(selecting = true, selected = setOf(attachment.mediaId))
+                selectionState = if (selectionState.selecting) MediaMultiSelectState() else MediaMultiSelectState(selecting = true, selected = setOf(attachment.id))
               }
             )
             .padding(horizontal = 16.dp, vertical = 8.dp)
         ) {
           if (selectionState.selecting) {
             Checkbox(
-              checked = selectionState.selected.contains(attachment.mediaId),
+              checked = selectionState.selected.contains(attachment.id),
               onCheckedChange = { selected ->
-                selectionState = selectionState.copy(selected = if (selected) selectionState.selected + attachment.mediaId else selectionState.selected - attachment.mediaId)
+                selectionState = selectionState.copy(selected = if (selected) selectionState.selected + attachment.id else selectionState.selected - attachment.id)
               }
             )
           }
 
           Column(modifier = Modifier.weight(1f, true)) {
-            Text(text = "Attachment ${attachment.title}")
+            Text(text = attachment.title)
             Text(text = "State: ${attachment.state}")
           }
 
-          if (attachment.state == InternalBackupPlaygroundViewModel.BackupAttachment.State.INIT ||
-            attachment.state == InternalBackupPlaygroundViewModel.BackupAttachment.State.IN_PROGRESS
-          ) {
+          if (attachment.state == InternalBackupPlaygroundViewModel.BackupAttachment.State.IN_PROGRESS) {
             CircularProgressIndicator()
           } else {
             Button(
               enabled = !selectionState.selecting,
               onClick = {
                 when (attachment.state) {
-                  InternalBackupPlaygroundViewModel.BackupAttachment.State.LOCAL_ONLY -> backupAttachmentMedia(attachment)
-                  InternalBackupPlaygroundViewModel.BackupAttachment.State.UPLOADED -> deleteBackupAttachmentMedia(attachment)
+                  InternalBackupPlaygroundViewModel.BackupAttachment.State.ATTACHMENT_CDN,
+                  InternalBackupPlaygroundViewModel.BackupAttachment.State.LOCAL_ONLY -> archiveAttachmentMedia(attachment)
+
+                  InternalBackupPlaygroundViewModel.BackupAttachment.State.UPLOADED_UNDOWNLOADED,
+                  InternalBackupPlaygroundViewModel.BackupAttachment.State.UPLOADED_FINAL -> selectionState = selectionState.copy(expandedOption = attachment.dbAttachment.attachmentId)
+
                   else -> throw AssertionError("Unsupported state: ${attachment.state}")
                 }
               }
             ) {
               Text(
                 text = when (attachment.state) {
+                  InternalBackupPlaygroundViewModel.BackupAttachment.State.ATTACHMENT_CDN,
                   InternalBackupPlaygroundViewModel.BackupAttachment.State.LOCAL_ONLY -> "Backup"
-                  InternalBackupPlaygroundViewModel.BackupAttachment.State.UPLOADED -> "Remote Delete"
+
+                  InternalBackupPlaygroundViewModel.BackupAttachment.State.UPLOADED_UNDOWNLOADED,
+                  InternalBackupPlaygroundViewModel.BackupAttachment.State.UPLOADED_FINAL -> "Options..."
+
                   else -> throw AssertionError("Unsupported state: ${attachment.state}")
                 }
               )
+
+              DropdownMenu(
+                expanded = attachment.dbAttachment.attachmentId == selectionState.expandedOption,
+                onDismissRequest = { selectionState = selectionState.copy(expandedOption = null) }
+              ) {
+                DropdownMenuItem(
+                  text = { Text("Remote Delete") },
+                  onClick = {
+                    selectionState = selectionState.copy(expandedOption = null)
+                    deleteArchivedMedia(attachment)
+                  }
+                )
+
+                DropdownMenuItem(
+                  text = { Text("Pseudo Restore") },
+                  onClick = {
+                    selectionState = selectionState.copy(expandedOption = null)
+                    restoreArchivedMedia(attachment)
+                  }
+                )
+
+                if (attachment.dbAttachment.dataHash != null && attachment.state == InternalBackupPlaygroundViewModel.BackupAttachment.State.UPLOADED_UNDOWNLOADED) {
+                  DropdownMenuItem(
+                    text = { Text("Re-copy with hash") },
+                    onClick = {
+                      selectionState = selectionState.copy(expandedOption = null)
+                      archiveAttachmentMedia(attachment)
+                    }
+                  )
+                }
+              }
             }
           }
         }
@@ -451,7 +560,7 @@ fun MediaList(
           Text("Cancel")
         }
         Button(onClick = {
-          batchBackupAttachmentMedia(selectionState.selected)
+          batchArchiveAttachmentMedia(selectionState.selected)
           selectionState = MediaMultiSelectState()
         }) {
           Text("Backup")
@@ -469,7 +578,8 @@ fun MediaList(
 
 private data class MediaMultiSelectState(
   val selecting: Boolean = false,
-  val selected: Set<String> = emptySet()
+  val selected: Set<AttachmentId> = emptySet(),
+  val expandedOption: AttachmentId? = null
 )
 
 @Preview(name = "Light Theme", group = "screen", uiMode = Configuration.UI_MODE_NIGHT_NO)
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 c785ef55fc..63787909a0 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
@@ -10,30 +10,39 @@ 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.core.Completable
 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.Base64
 import org.signal.libsignal.zkgroup.profiles.ProfileKey
+import org.thoughtcrime.securesms.attachments.AttachmentId
 import org.thoughtcrime.securesms.attachments.DatabaseAttachment
 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.jobs.ArchiveAttachmentJob
+import org.thoughtcrime.securesms.jobs.AttachmentDownloadJob
+import org.thoughtcrime.securesms.jobs.AttachmentUploadJob
+import org.thoughtcrime.securesms.jobs.BackupMessagesJob
+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.mms.IncomingMessage
 import org.thoughtcrime.securesms.recipients.Recipient
 import org.whispersystems.signalservice.api.NetworkResult
-import org.whispersystems.signalservice.api.backup.BackupKey
+import org.whispersystems.signalservice.api.backup.MediaName
 import java.io.ByteArrayInputStream
 import java.io.InputStream
 import java.util.UUID
-import kotlin.random.Random
+import kotlin.time.Duration.Companion.seconds
 
 class InternalBackupPlaygroundViewModel : ViewModel() {
 
-  private val backupKey = SignalStore.svr().getOrCreateMasterKey().deriveBackupKey()
-
   var backupData: ByteArray? = null
 
   val disposables = CompositeDisposable()
@@ -57,6 +66,17 @@ class InternalBackupPlaygroundViewModel : ViewModel() {
       }
   }
 
+  fun triggerBackupJob() {
+    _state.value = _state.value.copy(backupState = BackupState.EXPORT_IN_PROGRESS)
+
+    disposables += Single.fromCallable { ApplicationDependencies.getJobManager().runSynchronously(BackupMessagesJob(), 120_000) }
+      .subscribeOn(Schedulers.io())
+      .observeOn(AndroidSchedulers.mainThread())
+      .subscribeBy {
+        _state.value = _state.value.copy(backupState = BackupState.BACKUP_JOB_DONE)
+      }
+  }
+
   fun import() {
     backupData?.let {
       _state.value = _state.value.copy(backupState = BackupState.IMPORT_IN_PROGRESS)
@@ -68,7 +88,7 @@ class InternalBackupPlaygroundViewModel : ViewModel() {
       disposables += Single.fromCallable { BackupRepository.import(it.size.toLong(), { ByteArrayInputStream(it) }, selfData, plaintext = plaintext) }
         .subscribeOn(Schedulers.io())
         .observeOn(AndroidSchedulers.mainThread())
-        .subscribe { nothing ->
+        .subscribeBy {
           backupData = null
           _state.value = _state.value.copy(backupState = BackupState.NONE)
         }
@@ -85,7 +105,7 @@ class InternalBackupPlaygroundViewModel : ViewModel() {
     disposables += Single.fromCallable { BackupRepository.import(length, inputStreamFactory, selfData, plaintext = plaintext) }
       .subscribeOn(Schedulers.io())
       .observeOn(AndroidSchedulers.mainThread())
-      .subscribe { nothing ->
+      .subscribeBy {
         backupData = null
         _state.value = _state.value.copy(backupState = BackupState.NONE)
       }
@@ -98,7 +118,7 @@ class InternalBackupPlaygroundViewModel : ViewModel() {
     disposables += Single.fromCallable { BackupRepository.validate(length, inputStreamFactory, selfData) }
       .subscribeOn(Schedulers.io())
       .observeOn(AndroidSchedulers.mainThread())
-      .subscribe { nothing ->
+      .subscribeBy {
         backupData = null
         _state.value = _state.value.copy(backupState = BackupState.NONE)
       }
@@ -142,47 +162,78 @@ class InternalBackupPlaygroundViewModel : ViewModel() {
       }
   }
 
+  fun restoreFromRemote() {
+    _state.value = _state.value.copy(backupState = BackupState.IMPORT_IN_PROGRESS)
+
+    disposables += Single.fromCallable {
+      ApplicationDependencies
+        .getJobManager()
+        .startChain(BackupRestoreJob())
+        .then(SyncArchivedMediaJob())
+        .then(BackupRestoreMediaJob())
+        .enqueueAndBlockUntilCompletion(120.seconds.inWholeMilliseconds)
+    }
+      .subscribeOn(Schedulers.io())
+      .observeOn(AndroidSchedulers.mainThread())
+      .subscribeBy {
+        _state.value = _state.value.copy(backupState = BackupState.NONE)
+      }
+  }
+
   fun loadMedia() {
     disposables += Single
       .fromCallable { SignalDatabase.attachments.debugGetLatestAttachments() }
       .subscribeOn(Schedulers.io())
       .observeOn(Schedulers.single())
       .subscribeBy {
-        _mediaState.set { update(attachments = it.map { a -> BackupAttachment.from(backupKey, a) }) }
+        _mediaState.set { update(attachments = it.map { a -> BackupAttachment(dbAttachment = a) }) }
       }
+  }
 
+  fun archiveAttachmentMedia(attachments: Set<AttachmentId>) {
     disposables += Single
-      .fromCallable { BackupRepository.debugGetArchivedMediaState() }
+      .fromCallable {
+        val toArchive = mediaState.value
+          .attachments
+          .filter { attachments.contains(it.dbAttachment.attachmentId) }
+          .map { it.dbAttachment }
+
+        BackupRepository.archiveMedia(toArchive)
+      }
       .subscribeOn(Schedulers.io())
       .observeOn(Schedulers.single())
+      .doOnSubscribe { _mediaState.set { update(inProgress = inProgressMediaIds + attachments) } }
+      .doOnTerminate { _mediaState.set { update(inProgress = inProgressMediaIds - attachments) } }
       .subscribeBy { result ->
         when (result) {
-          is NetworkResult.Success -> _mediaState.set { update(archiveStateLoaded = true, backedUpMediaIds = result.result.map { it.mediaId }.toSet()) }
+          is NetworkResult.Success -> {
+            loadMedia()
+            result
+              .result
+              .sourceNotFoundResponses
+              .forEach {
+                reUploadAndArchiveMedia(result.result.mediaIdToAttachmentId(it.mediaId))
+              }
+          }
           else -> _mediaState.set { copy(error = MediaStateError(errorText = "$result")) }
         }
       }
   }
 
-  fun backupAttachmentMedia(mediaIds: Set<String>) {
-    disposables += Single.fromCallable { mediaIds.mapNotNull { mediaState.value.idToAttachment[it]?.dbAttachment }.toList() }
-      .map { BackupRepository.archiveMedia(it) }
+  fun archiveAttachmentMedia(attachment: BackupAttachment) {
+    disposables += Single.fromCallable { BackupRepository.archiveMedia(attachment.dbAttachment) }
       .subscribeOn(Schedulers.io())
       .observeOn(Schedulers.single())
-      .doOnSubscribe { _mediaState.set { update(inProgressMediaIds = inProgressMediaIds + mediaIds) } }
-      .doOnTerminate { _mediaState.set { update(inProgressMediaIds = inProgressMediaIds - mediaIds) } }
+      .doOnSubscribe { _mediaState.set { update(inProgress = inProgressMediaIds + attachment.dbAttachment.attachmentId) } }
+      .doOnTerminate { _mediaState.set { update(inProgress = inProgressMediaIds - attachment.dbAttachment.attachmentId) } }
       .subscribeBy { result ->
         when (result) {
-          is NetworkResult.Success -> {
-            val response = result.result
-            val successes = response.responses.filter { it.status == 200 }
-            val failures = response.responses - successes.toSet()
-
-            _mediaState.set {
-              var updated = update(backedUpMediaIds = backedUpMediaIds + successes.map { it.mediaId })
-              if (failures.isNotEmpty()) {
-                updated = updated.copy(error = MediaStateError(errorText = failures.toString()))
-              }
-              updated
+          is NetworkResult.Success -> loadMedia()
+          is NetworkResult.StatusCodeError -> {
+            if (result.code == 410) {
+              reUploadAndArchiveMedia(attachment.id)
+            } else {
+              _mediaState.set { copy(error = MediaStateError(errorText = "$result")) }
             }
           }
 
@@ -191,49 +242,107 @@ class InternalBackupPlaygroundViewModel : ViewModel() {
       }
   }
 
-  fun backupAttachmentMedia(attachment: BackupAttachment) {
-    disposables += Single.fromCallable { BackupRepository.archiveMedia(attachment.dbAttachment) }
+  private fun reUploadAndArchiveMedia(attachmentId: AttachmentId) {
+    disposables += Single
+      .fromCallable {
+        ApplicationDependencies
+          .getJobManager()
+          .startChain(AttachmentUploadJob(attachmentId))
+          .then(ArchiveAttachmentJob(attachmentId))
+          .enqueueAndBlockUntilCompletion(15.seconds.inWholeMilliseconds)
+      }
       .subscribeOn(Schedulers.io())
       .observeOn(Schedulers.single())
-      .doOnSubscribe { _mediaState.set { update(inProgressMediaIds = inProgressMediaIds + attachment.mediaId) } }
-      .doOnTerminate { _mediaState.set { update(inProgressMediaIds = inProgressMediaIds - attachment.mediaId) } }
+      .doOnSubscribe { _mediaState.set { update(inProgress = inProgressMediaIds + attachmentId) } }
+      .doOnTerminate { _mediaState.set { update(inProgress = inProgressMediaIds - attachmentId) } }
       .subscribeBy {
-        when (it) {
-          is NetworkResult.Success -> {
-            _mediaState.set { update(backedUpMediaIds = backedUpMediaIds + attachment.mediaId) }
-          }
-
-          else -> _mediaState.set { copy(error = MediaStateError(errorText = "$it")) }
+        if (it.isPresent && it.get().isComplete) {
+          loadMedia()
+        } else {
+          _mediaState.set { copy(error = MediaStateError(errorText = "Reupload slow or failed, try again")) }
         }
       }
   }
 
-  fun deleteBackupAttachmentMedia(mediaIds: Set<String>) {
-    deleteBackupAttachmentMedia(mediaIds.mapNotNull { mediaState.value.idToAttachment[it] }.toList())
+  fun deleteArchivedMedia(attachmentIds: Set<AttachmentId>) {
+    deleteArchivedMedia(mediaState.value.attachments.filter { attachmentIds.contains(it.dbAttachment.attachmentId) })
   }
 
-  fun deleteBackupAttachmentMedia(attachment: BackupAttachment) {
-    deleteBackupAttachmentMedia(listOf(attachment))
+  fun deleteArchivedMedia(attachment: BackupAttachment) {
+    deleteArchivedMedia(listOf(attachment))
   }
 
-  private fun deleteBackupAttachmentMedia(attachments: List<BackupAttachment>) {
-    val ids = attachments.map { it.mediaId }.toSet()
+  private fun deleteArchivedMedia(attachments: List<BackupAttachment>) {
+    val ids = attachments.map { it.dbAttachment.attachmentId }.toSet()
     disposables += Single.fromCallable { BackupRepository.deleteArchivedMedia(attachments.map { it.dbAttachment }) }
       .subscribeOn(Schedulers.io())
       .observeOn(Schedulers.single())
-      .doOnSubscribe { _mediaState.set { update(inProgressMediaIds = inProgressMediaIds + ids) } }
-      .doOnTerminate { _mediaState.set { update(inProgressMediaIds = inProgressMediaIds - ids) } }
+      .doOnSubscribe { _mediaState.set { update(inProgress = inProgressMediaIds + ids) } }
+      .doOnTerminate { _mediaState.set { update(inProgress = inProgressMediaIds - ids) } }
       .subscribeBy {
         when (it) {
-          is NetworkResult.Success -> {
-            _mediaState.set { update(backedUpMediaIds = backedUpMediaIds - ids) }
-          }
-
+          is NetworkResult.Success -> loadMedia()
           else -> _mediaState.set { copy(error = MediaStateError(errorText = "$it")) }
         }
       }
   }
 
+  fun deleteAllArchivedMedia() {
+    disposables += Single
+      .fromCallable { BackupRepository.debugDeleteAllArchivedMedia() }
+      .subscribeOn(Schedulers.io())
+      .observeOn(Schedulers.single())
+      .subscribeBy { result ->
+        when (result) {
+          is NetworkResult.Success -> loadMedia()
+          else -> _mediaState.set { copy(error = MediaStateError(errorText = "$result")) }
+        }
+      }
+  }
+
+  fun restoreArchivedMedia(attachment: BackupAttachment) {
+    disposables += Completable
+      .fromCallable {
+        val recipientId = SignalStore.releaseChannelValues().releaseChannelRecipientId!!
+        val threadId = SignalDatabase.threads.getOrCreateThreadIdFor(Recipient.resolved(recipientId))
+
+        val message = IncomingMessage(
+          type = MessageType.NORMAL,
+          from = recipientId,
+          sentTimeMillis = System.currentTimeMillis(),
+          serverTimeMillis = System.currentTimeMillis(),
+          receivedTimeMillis = System.currentTimeMillis(),
+          body = "Restored from Archive!?",
+          serverGuid = UUID.randomUUID().toString()
+        )
+
+        val insertMessage = SignalDatabase.messages.insertMessageInbox(message, threadId).get()
+
+        SignalDatabase.attachments.debugCopyAttachmentForArchiveRestore(
+          insertMessage.messageId,
+          attachment.dbAttachment
+        )
+
+        val archivedAttachment = SignalDatabase.attachments.getAttachmentsForMessage(insertMessage.messageId).first()
+
+        ApplicationDependencies.getJobManager().add(
+          AttachmentDownloadJob(
+            messageId = insertMessage.messageId,
+            attachmentId = archivedAttachment.attachmentId,
+            manual = false,
+            forceArchiveDownload = true
+          )
+        )
+      }
+      .subscribeOn(Schedulers.io())
+      .observeOn(Schedulers.single())
+      .subscribeBy(
+        onError = {
+          _mediaState.set { copy(error = MediaStateError(errorText = "$it")) }
+        }
+      )
+  }
+
   override fun onCleared() {
     disposables.clear()
   }
@@ -246,7 +355,7 @@ class InternalBackupPlaygroundViewModel : ViewModel() {
   )
 
   enum class BackupState(val inProgress: Boolean = false) {
-    NONE, EXPORT_IN_PROGRESS(true), EXPORT_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) {
@@ -261,67 +370,59 @@ class InternalBackupPlaygroundViewModel : ViewModel() {
   }
 
   data class MediaState(
-    val backupStateLoaded: Boolean = false,
     val attachments: List<BackupAttachment> = emptyList(),
-    val backedUpMediaIds: Set<String> = emptySet(),
-    val inProgressMediaIds: Set<String> = emptySet(),
+    val inProgressMediaIds: Set<AttachmentId> = emptySet(),
     val error: MediaStateError? = null
   ) {
-    val idToAttachment: Map<String, BackupAttachment> = attachments.associateBy { it.mediaId }
-
     fun update(
-      archiveStateLoaded: Boolean = this.backupStateLoaded,
       attachments: List<BackupAttachment> = this.attachments,
-      backedUpMediaIds: Set<String> = this.backedUpMediaIds,
-      inProgressMediaIds: Set<String> = this.inProgressMediaIds
+      inProgress: Set<AttachmentId> = this.inProgressMediaIds
     ): MediaState {
-      val updatedAttachments = if (archiveStateLoaded) {
-        attachments.map {
-          val state = if (inProgressMediaIds.contains(it.mediaId)) {
-            BackupAttachment.State.IN_PROGRESS
-          } else if (backedUpMediaIds.contains(it.mediaId)) {
-            BackupAttachment.State.UPLOADED
+      val backupKey = SignalStore.svr().getOrCreateMasterKey().deriveBackupKey()
+
+      val updatedAttachments = attachments.map {
+        val state = if (inProgress.contains(it.dbAttachment.attachmentId)) {
+          BackupAttachment.State.IN_PROGRESS
+        } else if (it.dbAttachment.archiveMediaName != null) {
+          if (it.dbAttachment.remoteDigest != null) {
+            val mediaId = backupKey.deriveMediaId(MediaName(it.dbAttachment.archiveMediaName)).encode()
+            if (it.dbAttachment.archiveMediaId == mediaId) {
+              BackupAttachment.State.UPLOADED_FINAL
+            } else {
+              BackupAttachment.State.UPLOADED_UNDOWNLOADED
+            }
           } else {
-            BackupAttachment.State.LOCAL_ONLY
+            BackupAttachment.State.UPLOADED_UNDOWNLOADED
           }
-
-          it.copy(state = state)
+        } else if (it.dbAttachment.dataHash == null) {
+          BackupAttachment.State.ATTACHMENT_CDN
+        } else {
+          BackupAttachment.State.LOCAL_ONLY
         }
-      } else {
-        attachments
+
+        it.copy(state = state)
       }
 
       return copy(
-        backupStateLoaded = archiveStateLoaded,
-        attachments = updatedAttachments,
-        backedUpMediaIds = backedUpMediaIds
+        attachments = updatedAttachments
       )
     }
   }
 
   data class BackupAttachment(
     val dbAttachment: DatabaseAttachment,
-    val state: State = State.INIT,
-    val mediaId: String = Base64.encodeUrlSafeWithPadding(Random.nextBytes(15))
+    val state: State = State.LOCAL_ONLY
   ) {
-    val id: Any = dbAttachment.attachmentId
+    val id: AttachmentId = dbAttachment.attachmentId
     val title: String = dbAttachment.attachmentId.toString()
 
     enum class State {
-      INIT,
+      ATTACHMENT_CDN,
       LOCAL_ONLY,
-      UPLOADED,
+      UPLOADED_UNDOWNLOADED,
+      UPLOADED_FINAL,
       IN_PROGRESS
     }
-
-    companion object {
-      fun from(backupKey: BackupKey, dbAttachment: DatabaseAttachment): BackupAttachment {
-        return BackupAttachment(
-          dbAttachment = dbAttachment,
-          mediaId = backupKey.deriveMediaId(Base64.decode(dbAttachment.dataHash!!)).toString()
-        )
-      }
-    }
   }
 
   data class MediaStateError(
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 877117948b..10b24cfb5b 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
@@ -185,7 +185,7 @@ class PrivacySettingsFragment : DSLSettingsFragment(R.string.preferences__privac
 
       clickPref(
         title = DSLSettingsText.from(R.string.PrivacySettingsFragment__blocked),
-        summary = DSLSettingsText.from(getString(R.string.PrivacySettingsFragment__d_contacts, state.blockedCount)),
+        summary = DSLSettingsText.from(resources.getQuantityString(R.plurals.PrivacySettingsFragment__d_contacts, state.blockedCount, state.blockedCount)),
         onClick = {
           Navigation.findNavController(requireView())
             .safeNavigate(R.id.action_privacySettingsFragment_to_blockedUsersActivity)
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 84b7c0540d..4551e398ee 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
@@ -1,5 +1,6 @@
 package org.thoughtcrime.securesms.components.settings.conversation
 
+import android.Manifest
 import android.app.ActivityOptions
 import android.content.ActivityNotFoundException
 import android.content.Context
@@ -78,6 +79,7 @@ import org.thoughtcrime.securesms.mediaoverview.MediaOverviewActivity
 import org.thoughtcrime.securesms.mediapreview.MediaIntentFactory
 import org.thoughtcrime.securesms.messagerequests.MessageRequestRepository
 import org.thoughtcrime.securesms.nicknames.NicknameActivity
+import org.thoughtcrime.securesms.permissions.Permissions
 import org.thoughtcrime.securesms.profiles.edit.CreateProfileActivity
 import org.thoughtcrime.securesms.recipients.Recipient
 import org.thoughtcrime.securesms.recipients.RecipientExporter
@@ -197,6 +199,10 @@ class ConversationSettingsFragment : DSLSettingsFragment(
     }
   }
 
+  override fun onRequestPermissionsResult(requestCode: Int, permissions: Array<out String>, grantResults: IntArray) {
+    Permissions.onRequestPermissionsResult(this, requestCode, permissions, grantResults)
+  }
+
   override fun onOptionsItemSelected(item: MenuItem): Boolean {
     return if (item.itemId == R.id.action_edit) {
       val args = ConversationSettingsFragmentArgs.fromBundle(requireArguments())
@@ -410,7 +416,14 @@ class ConversationSettingsFragment : DSLSettingsFragment(
                 .setPositiveButton(android.R.string.ok) { d, _ -> d.dismiss() }
                 .show()
             } else {
-              addToGroupStoryDelegate.addToStory(state.recipient.id)
+              Permissions.with(this@ConversationSettingsFragment)
+                .request(Manifest.permission.CAMERA)
+                .ifNecessary()
+                .withRationaleDialog(getString(R.string.ConversationActivity_to_capture_photos_and_video_allow_signal_access_to_the_camera), R.drawable.symbol_camera_24)
+                .withPermanentDenialDialog(getString(R.string.ConversationActivity_signal_needs_the_camera_permission_to_take_photos_or_video))
+                .onAllGranted { addToGroupStoryDelegate.addToStory(state.recipient.id) }
+                .onAnyDenied { Toast.makeText(requireContext(), R.string.ConversationActivity_signal_needs_camera_permissions_to_take_photos_or_video, Toast.LENGTH_LONG).show() }
+                .execute()
             }
           },
           onVideoClick = {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/conversation/preferences/CallPreference.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/conversation/preferences/CallPreference.kt
index 28df51273f..42159fafdb 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/conversation/preferences/CallPreference.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/conversation/preferences/CallPreference.kt
@@ -1,6 +1,7 @@
 package org.thoughtcrime.securesms.components.settings.conversation.preferences
 
 import androidx.annotation.DrawableRes
+import androidx.annotation.StringRes
 import org.thoughtcrime.securesms.R
 import org.thoughtcrime.securesms.database.CallTable
 import org.thoughtcrime.securesms.database.MessageTypes
@@ -46,10 +47,10 @@ object CallPreference {
     private fun getCallIcon(call: CallTable.Call): Int {
       return when (call.messageType) {
         MessageTypes.MISSED_VIDEO_CALL_TYPE, MessageTypes.MISSED_AUDIO_CALL_TYPE -> R.drawable.symbol_missed_incoming_24
-        MessageTypes.INCOMING_AUDIO_CALL_TYPE, MessageTypes.INCOMING_VIDEO_CALL_TYPE -> R.drawable.symbol_arrow_downleft_24
+        MessageTypes.INCOMING_AUDIO_CALL_TYPE, MessageTypes.INCOMING_VIDEO_CALL_TYPE -> if (call.isDisplayedAsMissedCallInUi) R.drawable.symbol_missed_incoming_24 else R.drawable.symbol_arrow_downleft_24
         MessageTypes.OUTGOING_AUDIO_CALL_TYPE, MessageTypes.OUTGOING_VIDEO_CALL_TYPE -> R.drawable.symbol_arrow_upright_24
         MessageTypes.GROUP_CALL_TYPE -> when {
-          call.event.isMissedCall() -> R.drawable.symbol_missed_incoming_24
+          call.isDisplayedAsMissedCallInUi -> R.drawable.symbol_missed_incoming_24
           call.event == CallTable.Event.GENERIC_GROUP_CALL || call.event == CallTable.Event.JOINED -> R.drawable.symbol_group_24
           call.direction == CallTable.Direction.INCOMING -> R.drawable.symbol_arrow_downleft_24
           call.direction == CallTable.Direction.OUTGOING -> R.drawable.symbol_arrow_upright_24
@@ -61,15 +62,14 @@ object CallPreference {
 
     private fun getCallType(call: CallTable.Call): String {
       val id = when (call.messageType) {
-        MessageTypes.MISSED_AUDIO_CALL_TYPE -> if (call.event == CallTable.Event.MISSED) R.string.MessageRecord_missed_voice_call else R.string.MessageRecord_missed_voice_call_notification_profile
-        MessageTypes.MISSED_VIDEO_CALL_TYPE -> if (call.event == CallTable.Event.MISSED) R.string.MessageRecord_missed_video_call else R.string.MessageRecord_missed_video_call_notification_profile
-        MessageTypes.INCOMING_AUDIO_CALL_TYPE -> R.string.MessageRecord_incoming_voice_call
-        MessageTypes.INCOMING_VIDEO_CALL_TYPE -> R.string.MessageRecord_incoming_video_call
+        MessageTypes.MISSED_AUDIO_CALL_TYPE -> getMissedCallString(false, call.event)
+        MessageTypes.MISSED_VIDEO_CALL_TYPE -> getMissedCallString(true, call.event)
+        MessageTypes.INCOMING_AUDIO_CALL_TYPE -> if (call.isDisplayedAsMissedCallInUi) getMissedCallString(false, call.event) else R.string.MessageRecord_incoming_voice_call
+        MessageTypes.INCOMING_VIDEO_CALL_TYPE -> if (call.isDisplayedAsMissedCallInUi) getMissedCallString(true, call.event) else R.string.MessageRecord_incoming_video_call
         MessageTypes.OUTGOING_AUDIO_CALL_TYPE -> R.string.MessageRecord_outgoing_voice_call
         MessageTypes.OUTGOING_VIDEO_CALL_TYPE -> R.string.MessageRecord_outgoing_video_call
         MessageTypes.GROUP_CALL_TYPE -> when {
-          call.event == CallTable.Event.MISSED -> R.string.CallPreference__missed_group_call
-          call.event == CallTable.Event.MISSED_NOTIFICATION_PROFILE -> R.string.CallPreference__missed_group_call_notification_profile
+          call.isDisplayedAsMissedCallInUi -> if (call.event == CallTable.Event.MISSED_NOTIFICATION_PROFILE) R.string.CallPreference__missed_group_call_notification_profile else R.string.CallPreference__missed_group_call
           call.event == CallTable.Event.GENERIC_GROUP_CALL || call.event == CallTable.Event.JOINED -> R.string.CallPreference__group_call
           call.direction == CallTable.Direction.INCOMING -> R.string.CallPreference__incoming_group_call
           call.direction == CallTable.Direction.OUTGOING -> R.string.CallPreference__outgoing_group_call
@@ -81,6 +81,23 @@ object CallPreference {
       return context.getString(id)
     }
 
+    @StringRes
+    private fun getMissedCallString(isVideo: Boolean, callEvent: CallTable.Event): Int {
+      return if (callEvent == CallTable.Event.MISSED_NOTIFICATION_PROFILE) {
+        if (isVideo) {
+          R.string.MessageRecord_missed_video_call_notification_profile
+        } else {
+          R.string.MessageRecord_missed_voice_call_notification_profile
+        }
+      } else {
+        if (isVideo) {
+          R.string.MessageRecord_missed_video_call
+        } else {
+          R.string.MessageRecord_missed_voice_call
+        }
+      }
+    }
+
     private fun getCallTime(messageRecord: MessageRecord): String {
       return DateUtils.getOnlyTimeString(context, messageRecord.timestamp)
     }
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 5cf6a69700..b6cd842532 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
@@ -687,7 +687,7 @@ class TransferControlView @JvmOverloads constructor(context: Context, attrs: Att
       }
 
       Mode.DOWNLOADING_GALLERY, Mode.DOWNLOADING_SINGLE_ITEM, Mode.DOWNLOADING_VIDEO_PLAYABLE, Mode.UPLOADING_GALLERY, Mode.UPLOADING_SINGLE_ITEM -> {
-        if (currentState.networkProgress.sumCompleted() == 0L || isCompressing(currentState)) {
+        if (currentState.isUpload && (currentState.networkProgress.sumCompleted() == 0L || isCompressing(currentState))) {
           binding.secondaryDetailsText.updateLayoutParams {
             width = ViewGroup.LayoutParams.WRAP_CONTENT
           }
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 a0cea66faa..196b56a578 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
@@ -34,12 +34,16 @@
 
 import org.signal.core.util.concurrent.SignalExecutors;
 import org.signal.core.util.logging.Log;
+import org.thoughtcrime.securesms.attachments.AttachmentId;
+import org.thoughtcrime.securesms.attachments.DatabaseAttachment;
+import org.thoughtcrime.securesms.database.DatabaseObserver;
 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.jobs.MultiDeviceViewedUpdateJob;
 import org.thoughtcrime.securesms.jobs.SendViewedReceiptJob;
+import org.thoughtcrime.securesms.mms.PartUriParser;
 import org.thoughtcrime.securesms.recipients.RecipientId;
 import org.thoughtcrime.securesms.service.KeyCachingService;
 
@@ -65,6 +69,8 @@ public class VoiceNotePlaybackService extends MediaSessionService {
   private KeyClearedReceiver                   keyClearedReceiver;
   private VoiceNotePlayerCallback              voiceNotePlayerCallback;
 
+  private final DatabaseObserver.Observer attachmentDeletionObserver = this::onAttachmentDeleted;
+
   @Override
   public void onCreate() {
     super.onCreate();
@@ -85,6 +91,7 @@ public void onCreate() {
 
     setMediaNotificationProvider(new VoiceNoteMediaNotificationProvider(this));
     setListener(new MediaSessionServiceListener());
+    ApplicationDependencies.getDatabaseObserver().registerAttachmentObserver(attachmentDeletionObserver);
   }
 
   @Override
@@ -99,6 +106,7 @@ public void onTaskRemoved(Intent rootIntent) {
   public void onDestroy() {
     player.removeListener(playerEventListener);
     if (mediaSession != null) {
+      ApplicationDependencies.getDatabaseObserver().unregisterObserver(attachmentDeletionObserver);
       keyClearedReceiver.unregister();
       player.release();
       mediaSession.release();
@@ -195,6 +203,40 @@ public void onAudioAttributesChanged(AudioAttributes audioAttributes) {
     }
   }
 
+  private void onAttachmentDeleted() {
+    Log.d(TAG, "Database attachment observer invoked.");
+    ContextCompat.getMainExecutor(getApplicationContext()).execute(() -> {
+      if (player != null) {
+        final MediaItem currentItem = player.getCurrentMediaItem();
+        if (currentItem == null || currentItem.playbackProperties == null) {
+          Log.d(TAG, "Current item is null or playback properties are null.");
+          return;
+        }
+
+        final Uri currentlyPlayingUri = currentItem.playbackProperties.uri;
+
+        if (currentlyPlayingUri == VoiceNoteMediaItemFactory.NEXT_URI || currentlyPlayingUri == VoiceNoteMediaItemFactory.END_URI) {
+          Log.v(TAG, "Attachment deleted while voice note service was playing a system tone.");
+        }
+
+        try {
+          final AttachmentId       partId     = new PartUriParser(currentlyPlayingUri).getPartId();
+          final DatabaseAttachment attachment = SignalDatabase.attachments().getAttachment(partId);
+          if (attachment == null) {
+            player.stop();
+            int playingIndex = player.getCurrentMediaItemIndex();
+            player.removeMediaItem(playingIndex);
+            Log.d(TAG, "Currently playing item removed.");
+          } else {
+            Log.d(TAG, "Attachment was not null, therefore not deleted, therefore no action taken.");
+          }
+        } catch (NumberFormatException ex) {
+          Log.w(TAG, "Could not parse currently playing URI into an attachmentId.", ex);
+        }
+      }
+    });
+  }
+
   /**
    * Some devices, such as the ASUS Zenfone 8, erroneously report multiple broadcast receivers for {@value Intent#ACTION_MEDIA_BUTTON} in the package manager.
    * This triggers a failure within the {@link MediaSession} initialization and throws an {@link IllegalStateException}.
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 801438d234..0f5038bd1c 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
@@ -30,19 +30,15 @@ class CallOverflowPopupWindow(private val activity: FragmentActivity, parentView
   LayoutInflater.from(activity).inflate(R.layout.call_overflow_holder, parentViewGroup, false),
   activity.resources.getDimension(R.dimen.calling_reaction_popup_menu_width).toInt(),
   activity.resources.getDimension(R.dimen.calling_reaction_popup_menu_height).toInt()
-
 ) {
   private val raiseHandLabel: TextView = (contentView as LinearLayout).findViewById(R.id.raise_hand_label)
 
   init {
     val root = (contentView as LinearLayout)
-    if (FeatureFlags.groupCallReactions()) {
-      val reactionScrubber = root.findViewById<CallReactionScrubber>(R.id.reaction_scrubber)
-      reactionScrubber.visible = true
-      reactionScrubber.initialize(activity.supportFragmentManager) {
-        ApplicationDependencies.getSignalCallManager().react(it)
-        dismiss()
-      }
+    val reactionScrubber = root.findViewById<CallReactionScrubber>(R.id.reaction_scrubber)
+    reactionScrubber.initialize(activity.supportFragmentManager) {
+      ApplicationDependencies.getSignalCallManager().react(it)
+      dismiss()
     }
     if (FeatureFlags.groupCallRaiseHand()) {
       val raiseHand = root.findViewById<ConstraintLayout>(R.id.raise_hand_layout_parent)
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/CallParticipantsListUpdatePopupWindow.java b/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/CallParticipantsListUpdatePopupWindow.java
index 7dfd77463a..fdc387cc3d 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/CallParticipantsListUpdatePopupWindow.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/CallParticipantsListUpdatePopupWindow.java
@@ -11,6 +11,7 @@
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.annotation.PluralsRes;
 import androidx.annotation.StringRes;
 
 import org.thoughtcrime.securesms.R;
@@ -141,7 +142,7 @@ private void setDescriptionForRecipients(@NonNull Set<CallParticipantListUpdate.
         description = context.getString(getThreeMemberDescriptionResourceId(isAdded), getNextDisplayName(iterator), getNextDisplayName(iterator), getNextDisplayName(iterator));
         break;
       default:
-        description = context.getString(getManyMemberDescriptionResourceId(isAdded), getNextDisplayName(iterator), getNextDisplayName(iterator), recipients.size() - 2);
+        description = context.getResources().getQuantityString(getManyMemberDescriptionResourceId(isAdded), recipients.size() - 2, getNextDisplayName(iterator), getNextDisplayName(iterator), recipients.size() - 2);
     }
 
     descriptionTextView.setText(description);
@@ -181,11 +182,11 @@ private void setDescriptionForRecipients(@NonNull Set<CallParticipantListUpdate.
     }
   }
 
-  private static @StringRes int getManyMemberDescriptionResourceId(boolean isAdded) {
+  private static @PluralsRes int getManyMemberDescriptionResourceId(boolean isAdded) {
     if (isAdded) {
-      return R.string.CallParticipantsListUpdatePopupWindow__s_s_and_d_others_joined;
+      return R.plurals.CallParticipantsListUpdatePopupWindow__s_s_and_d_others_joined;
     } else {
-      return R.string.CallParticipantsListUpdatePopupWindow__s_s_and_d_others_left;
+      return R.plurals.CallParticipantsListUpdatePopupWindow__s_s_and_d_others_left;
     }
   }
 }
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 fb2809a8a1..d071003e0a 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
@@ -20,6 +20,16 @@ class CallReactionScrubber @JvmOverloads constructor(
   attrs: AttributeSet? = null,
   defStyleAttr: Int = 0
 ) : ConstraintLayout(context, attrs, defStyleAttr) {
+  companion object {
+    const val CUSTOM_REACTION_BOTTOM_SHEET_TAG = "CallReaction"
+
+    @JvmStatic
+    fun dismissCustomEmojiBottomSheet(fm: FragmentManager) {
+      val bottomSheet = fm.findFragmentByTag(CUSTOM_REACTION_BOTTOM_SHEET_TAG) as? ReactWithAnyEmojiBottomSheetDialogFragment
+
+      bottomSheet?.dismissNow()
+    }
+  }
 
   private val emojiViews: Array<EmojiImageView>
   private var customEmojiIndex = 0
@@ -48,7 +58,7 @@ class CallReactionScrubber @JvmOverloads constructor(
         view.setImageDrawable(ContextCompat.getDrawable(context, R.drawable.ic_any_emoji_32))
         view.setOnClickListener {
           val bottomSheet = ReactWithAnyEmojiBottomSheetDialogFragment.createForCallingReactions()
-          bottomSheet.show(fragmentManager, "CallReaction")
+          bottomSheet.show(fragmentManager, CUSTOM_REACTION_BOTTOM_SHEET_TAG)
         }
       } else {
         val preferredVariation = SignalStore.emojiValues().getPreferredVariation(emojis[i])
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 01565857a6..ea190d0996 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
@@ -96,6 +96,7 @@ public class WebRtcCallView extends InsetAwareConstraintLayout {
   private RecipientId                   recipientId;
   private ImageView                     answer;
   private TextView                      answerWithoutVideoLabel;
+  private ImageView                     cameraDirectionToggle;
   private AccessibleToggleButton        ringToggle;
   private PictureInPictureGestureHelper pictureInPictureGestureHelper;
   private ImageView                     overflow;
@@ -177,6 +178,7 @@ protected void onFinishInflate() {
     incomingRingStatus            = findViewById(R.id.call_screen_incoming_ring_status);
     answer                        = findViewById(R.id.call_screen_answer_call);
     answerWithoutVideoLabel       = findViewById(R.id.call_screen_answer_without_video_label);
+    cameraDirectionToggle         = findViewById(R.id.call_screen_camera_direction_toggle);
     ringToggle                    = findViewById(R.id.call_screen_audio_ring_toggle);
     overflow                      = findViewById(R.id.call_screen_overflow_button);
     hangup                        = findViewById(R.id.call_screen_end_call);
@@ -271,6 +273,7 @@ public void onPageSelected(int position) {
       runIfNonNull(controlsListener, listener -> listener.onRingGroupChanged(isOn, ringToggle.isActivated()));
     });
 
+    cameraDirectionToggle.setOnClickListener(v -> runIfNonNull(controlsListener, ControlsListener::onCameraDirectionChanged));
     smallLocalRender.findViewById(R.id.call_participant_switch_camera).setOnClickListener(v -> runIfNonNull(controlsListener, ControlsListener::onCameraDirectionChanged));
 
     overflow.setOnClickListener(v -> {
@@ -352,6 +355,7 @@ public void onPageSelected(int position) {
     rotatableControls.add(audioToggle);
     rotatableControls.add(micToggle);
     rotatableControls.add(videoToggle);
+    rotatableControls.add(cameraDirectionToggle);
     rotatableControls.add(decline);
     rotatableControls.add(smallLocalAudioIndicator);
     rotatableControls.add(ringToggle);
@@ -917,6 +921,7 @@ private static <T> void runIfNonNull(@Nullable T listener, @NonNull Consumer<T>
   }
 
   private void updateButtonStateForLargeButtons() {
+    cameraDirectionToggle.setImageResource(R.drawable.webrtc_call_screen_camera_toggle);
     hangup.setImageResource(R.drawable.webrtc_call_screen_hangup);
     overflow.setImageResource(R.drawable.webrtc_call_screen_overflow_menu);
     micToggle.setBackgroundResource(R.drawable.webrtc_call_screen_mic_toggle);
@@ -927,6 +932,7 @@ private void updateButtonStateForLargeButtons() {
   }
 
   private void updateButtonStateForSmallButtons() {
+    cameraDirectionToggle.setImageResource(R.drawable.webrtc_call_screen_camera_toggle_small);
     hangup.setImageResource(R.drawable.webrtc_call_screen_hangup_small);
     overflow.setImageResource(R.drawable.webrtc_call_screen_overflow_menu_small);
     micToggle.setBackgroundResource(R.drawable.webrtc_call_screen_mic_toggle_small);
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 7559176cb0..3fce3a64ce 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
@@ -159,7 +159,7 @@ public boolean displayEndCall() {
   }
 
   public boolean displayOverflow() {
-    return (FeatureFlags.groupCallReactions() || FeatureFlags.groupCallRaiseHand()) && isAtLeastOutgoing() && hasAtLeastOneRemote && isGroupCall();
+    return isAtLeastOutgoing() && hasAtLeastOneRemote && isGroupCall();
   }
 
   public boolean displayMuteAudio() {
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 ed924592c6..8b8dfd8f21 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
@@ -34,12 +34,11 @@ import androidx.compose.runtime.rxjava3.subscribeAsState
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.platform.LocalInspectionMode
+import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.pluralStringResource
 import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.res.vectorResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.viewinterop.AndroidView
@@ -183,7 +182,7 @@ private fun CallInfo(
       item {
         Rows.TextRow(
           text = stringResource(id = R.string.CallLinkDetailsFragment__share_link),
-          icon = ImageVector.vectorResource(id = R.drawable.symbol_link_24),
+          icon = painterResource(id = R.drawable.symbol_link_24),
           iconModifier = Modifier
             .background(
               color = MaterialTheme.colorScheme.surfaceVariant,
@@ -446,7 +445,7 @@ private fun CallParticipantRow(
 
     if (showIcons && showHandRaised) {
       Icon(
-        imageVector = ImageVector.vectorResource(id = R.drawable.symbol_raise_hand_24),
+        painter = painterResource(id = R.drawable.symbol_raise_hand_24),
         contentDescription = null,
         modifier = Modifier.align(Alignment.CenterVertically)
       )
@@ -454,7 +453,7 @@ private fun CallParticipantRow(
 
     if (showIcons && !isVideoEnabled) {
       Icon(
-        imageVector = ImageVector.vectorResource(id = R.drawable.symbol_video_slash_24),
+        painter = painterResource(id = R.drawable.symbol_video_slash_24),
         contentDescription = null,
         modifier = Modifier.align(Alignment.CenterVertically)
       )
@@ -466,7 +465,7 @@ private fun CallParticipantRow(
       }
 
       Icon(
-        imageVector = ImageVector.vectorResource(id = R.drawable.symbol_mic_slash_24),
+        painter = painterResource(id = R.drawable.symbol_mic_slash_24),
         contentDescription = null,
         modifier = Modifier.align(Alignment.CenterVertically)
       )
@@ -478,7 +477,7 @@ private fun CallParticipantRow(
       }
 
       Icon(
-        imageVector = ImageVector.vectorResource(id = R.drawable.symbol_minus_circle_24),
+        painter = painterResource(id = R.drawable.symbol_minus_circle_24),
         contentDescription = null,
         modifier = Modifier
           .clickable(onClick = onBlockClicked)
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 9d64922890..4a3fed6ee7 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
@@ -209,7 +209,7 @@ class ControlsAndInfoController(
       }
   }
 
-  private fun onControlTopChanged() {
+  fun onControlTopChanged() {
     val guidelineTop = max(frame.top, coordinator.height - behavior.peekHeight)
     aboveControlsGuideline.setGuidelineBegin(guidelineTop)
     webRtcCallView.onControlTopChanged()
@@ -321,6 +321,7 @@ 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)
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 c4648fd7da..9f64fa0f9e 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
@@ -5,7 +5,6 @@
 
 package org.thoughtcrime.securesms.components.webrtc.controls
 
-import android.content.Context
 import androidx.compose.animation.AnimatedVisibility
 import androidx.compose.animation.animateContentSize
 import androidx.compose.animation.expandIn
@@ -44,7 +43,6 @@ import androidx.compose.ui.res.vectorResource
 import androidx.compose.ui.semantics.Role
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
-import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import io.reactivex.rxjava3.core.BackpressureStrategy
 import kotlinx.coroutines.delay
 import org.signal.core.ui.theme.SignalTheme
@@ -160,7 +158,7 @@ private fun RaiseHand(
                 val context = LocalContext.current
                 TextButton(
                   onClick = {
-                    showLowerHandDialog(context)
+                    ApplicationDependencies.getSignalCallManager().raiseHand(false)
                   },
                   modifier = Modifier.wrapContentWidth(Alignment.End)
                 ) {
@@ -182,16 +180,6 @@ private fun RaiseHand(
   }
 }
 
-private fun showLowerHandDialog(context: Context) {
-  MaterialAlertDialogBuilder(context)
-    .setTitle(R.string.CallOverflowPopupWindow__lower_your_hand)
-    .setPositiveButton(
-      R.string.CallOverflowPopupWindow__lower_hand
-    ) { _, _ -> ApplicationDependencies.getSignalCallManager().raiseHand(false) }
-    .setNegativeButton(R.string.CallOverflowPopupWindow__cancel, null)
-    .show()
-}
-
 @Composable
 private fun getSnackbarText(state: RaiseHandState): String {
   if (state.isEmpty) {
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 5911cacedb..10aea686a8 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
@@ -23,11 +23,10 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Alignment.Companion.CenterVertically
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.platform.LocalInspectionMode
+import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.res.vectorResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.viewinterop.AndroidView
@@ -165,7 +164,7 @@ private fun CallLinkIncomingRequestSheetContent(
     item {
       Rows.TextRow(
         text = stringResource(id = R.string.CallLinkIncomingRequestSheet__approve_entry),
-        icon = ImageVector.vectorResource(R.drawable.symbol_check_circle_24),
+        icon = painterResource(R.drawable.symbol_check_circle_24),
         onClick = onApproveEntry
       )
     }
@@ -173,7 +172,7 @@ private fun CallLinkIncomingRequestSheetContent(
     item {
       Rows.TextRow(
         text = stringResource(id = R.string.CallLinkIncomingRequestSheet__deny_entry),
-        icon = ImageVector.vectorResource(R.drawable.symbol_x_circle_24),
+        icon = painterResource(R.drawable.symbol_x_circle_24),
         onClick = onDenyEntry
       )
     }
@@ -219,7 +218,7 @@ private fun Title(
         style = MaterialTheme.typography.headlineMedium
       )
       Icon(
-        imageVector = ImageVector.vectorResource(id = R.drawable.symbol_person_circle_24),
+        painter = painterResource(id = R.drawable.symbol_person_circle_24),
         contentDescription = null,
         modifier = Modifier
           .padding(start = 6.dp)
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 5560f8735a..a44dbd1395 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationItem.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationItem.java
@@ -39,6 +39,7 @@
 import android.text.style.URLSpan;
 import android.util.AttributeSet;
 import android.util.TypedValue;
+import android.view.GestureDetector;
 import android.view.MotionEvent;
 import android.view.TouchDelegate;
 import android.view.View;
@@ -227,6 +228,7 @@ public final class ConversationItem extends RelativeLayout implements BindableCo
   private                Stub<Button>                            callToActionStub;
   private                Stub<PaymentMessageView>                paymentViewStub;
   private @Nullable      EventListener                           eventListener;
+  private @Nullable      GestureDetector                         gestureDetector;
 
   private int     defaultBubbleColor;
   private int     defaultBubbleColorForWallpaper;
@@ -247,6 +249,7 @@ public final class ConversationItem extends RelativeLayout implements BindableCo
   private final UrlClickListener                urlClickListener                = new UrlClickListener();
   private final Rect                            thumbnailMaskingRect            = new Rect();
   private final TouchDelegateChangedListener    touchDelegateChangedListener    = new TouchDelegateChangedListener();
+  private final DoubleTapEditTouchListener      doubleTapEditTouchListener      = new DoubleTapEditTouchListener();
 
   private final Context context;
 
@@ -340,6 +343,7 @@ protected void onFinishInflate() {
 
     setOnClickListener(new ClickListener(null));
 
+    bodyText.setOnTouchListener(doubleTapEditTouchListener);
     bodyText.setOnLongClickListener(passthroughClickListener);
     bodyText.setOnClickListener(passthroughClickListener);
     footer.setOnTouchDelegateChangedListener(touchDelegateChangedListener);
@@ -485,6 +489,11 @@ public void setEventListener(@Nullable EventListener eventListener) {
     this.eventListener = eventListener;
   }
 
+  @Override
+  public void setGestureDetector(GestureDetector gestureDetector) {
+    this.gestureDetector = gestureDetector;
+  }
+
   public boolean disallowSwipe(float downX, float downY) {
     if (!hasAudio(messageRecord)) return false;
 
@@ -2370,6 +2379,16 @@ public void onClick(final View view) {
     }
   }
 
+  private class DoubleTapEditTouchListener implements View.OnTouchListener {
+    @Override
+    public boolean onTouch(View v, MotionEvent event) {
+      if (gestureDetector != null && batchSelected.isEmpty()) {
+        return gestureDetector.onTouchEvent(event);
+      }
+      return false;
+    }
+  }
+
   private class AttachmentDownloadClickListener implements SlidesClickedListener {
     @Override
     public void onClick(View v, final List<Slide> slides) {
@@ -2382,7 +2401,8 @@ public void onClick(View v, final List<Slide> slides) {
         for (Slide slide : slides) {
           ApplicationDependencies.getJobManager().add(new AttachmentDownloadJob(messageRecord.getId(),
                                                                                 ((DatabaseAttachment) slide.asAttachment()).attachmentId,
-                                                                                true));
+                                                                                true,
+                                                                                false));
         }
       }
     }
@@ -2408,7 +2428,8 @@ public void onClick(View v, Slide slide) {
           setup(v, slide);
           jobManager.add(new AttachmentDownloadJob(messageRecord.getId(),
                                                    attachmentId,
-                                                   true));
+                                                   true,
+                                                   false));
           jobManager.addListener(queue, (job, jobState) -> {
             if (jobState.isComplete()) {
               cleanup();
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 585a39958b..5c696cdc85 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationUpdateItem.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationUpdateItem.java
@@ -40,6 +40,7 @@
 import org.thoughtcrime.securesms.database.model.LiveUpdateMessage;
 import org.thoughtcrime.securesms.database.model.MessageRecord;
 import org.thoughtcrime.securesms.database.model.UpdateDescription;
+import org.thoughtcrime.securesms.database.model.databaseprotos.GroupCallUpdateDetails;
 import org.thoughtcrime.securesms.groups.LiveGroup;
 import org.thoughtcrime.securesms.keyvalue.SignalStore;
 import org.thoughtcrime.securesms.recipients.LiveRecipient;
@@ -456,11 +457,14 @@ private void present(@NonNull ConversationMessage conversationMessage,
         }
       });
     } else if (conversationMessage.getMessageRecord().isGroupCall()) {
-      UpdateDescription updateDescription = MessageRecord.getGroupCallUpdateDescription(getContext(), conversationMessage.getMessageRecord().getBody(), true);
-      Collection<ACI>   acis              = updateDescription.getMentioned();
+      GroupCallUpdateDetails groupCallUpdateDetails = GroupCallUpdateDetailsUtil.parse(conversationMessage.getMessageRecord().getBody());
+      boolean                isRingingOnLocalDevice = groupCallUpdateDetails.isRingingOnLocalDevice;
+      boolean                endedRecently          = GroupCallUpdateDetailsUtil.checkCallEndedRecently(groupCallUpdateDetails);
+      UpdateDescription      updateDescription      = MessageRecord.getGroupCallUpdateDescription(getContext(), conversationMessage.getMessageRecord().getBody(), true);
+      Collection<ACI>        acis                   = updateDescription.getMentioned();
 
       int text = 0;
-      if (Util.hasItems(acis)) {
+      if (Util.hasItems(acis) || isRingingOnLocalDevice) {
         if (acis.contains(SignalStore.account().requireAci())) {
           text = R.string.ConversationUpdateItem_return_to_call;
         } else if (GroupCallUpdateDetailsUtil.parse(conversationMessage.getMessageRecord().getBody()).isCallFull) {
@@ -468,6 +472,8 @@ private void present(@NonNull ConversationMessage conversationMessage,
         } else {
           text = R.string.ConversationUpdateItem_join_call;
         }
+      } else if (endedRecently) {
+        text = R.string.ConversationUpdateItem_call_back;
       }
 
       if (text != 0 && conversationRecipient.isGroup() && conversationRecipient.isActiveGroup()) {
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 a9a85ba131..b2d747cca3 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/MarkReadHelper.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/MarkReadHelper.java
@@ -28,6 +28,7 @@
 import org.thoughtcrime.securesms.util.Debouncer;
 import org.thoughtcrime.securesms.util.concurrent.SerialMonoLifoExecutor;
 
+import java.util.Collections;
 import java.util.List;
 import java.util.Optional;
 import java.util.concurrent.Executor;
@@ -67,6 +68,7 @@ public void onViewsRevealed(long timestamp) {
 
         ApplicationDependencies.getMessageNotifier().updateNotification(context);
         MarkReadReceiver.process(infos);
+        MarkReadReceiver.processCallEvents(Collections.singletonList(conversationId), timestamp);
       });
     });
   }
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 63745bf458..7a392466ce 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/ScheduledMessagesBottomSheet.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/ScheduledMessagesBottomSheet.kt
@@ -276,6 +276,7 @@ class ScheduledMessagesBottomSheet : FixedRoundedCornerBottomSheetDialogFragment
     override fun onShowSafetyTips(forGroup: Boolean) = Unit
     override fun onReportSpamLearnMoreClicked() = Unit
     override fun onMessageRequestAcceptOptionsClicked() = Unit
+    override fun onItemDoubleClick(item: MultiselectPart) = Unit
   }
 
   companion object {
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 b31c7bae18..a0bebf4333 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
@@ -256,6 +256,7 @@ class MessageQuotesBottomSheet : FixedRoundedCornerBottomSheetDialogFragment() {
     override fun onShowSafetyTips(forGroup: Boolean) = Unit
     override fun onReportSpamLearnMoreClicked() = Unit
     override fun onMessageRequestAcceptOptionsClicked() = Unit
+    override fun onItemDoubleClick(item: MultiselectPart) = Unit
   }
 
   companion object {
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 5d2cb6f318..e5a7b416dc 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
@@ -167,6 +167,7 @@ class EditMessageHistoryDialog : FixedRoundedCornerBottomSheetDialogFragment() {
     override fun onShowSafetyTips(forGroup: Boolean) = Unit
     override fun onReportSpamLearnMoreClicked() = Unit
     override fun onMessageRequestAcceptOptionsClicked() = Unit
+    override fun onItemDoubleClick(item: MultiselectPart) = Unit
   }
 
   companion object {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/ui/inlinequery/InlineQuery.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/ui/inlinequery/InlineQuery.kt
index b14631d181..09e2b3d1d8 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/ui/inlinequery/InlineQuery.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/ui/inlinequery/InlineQuery.kt
@@ -5,6 +5,6 @@ package org.thoughtcrime.securesms.conversation.ui.inlinequery
  */
 sealed class InlineQuery(val query: String) {
   object NoQuery : InlineQuery("")
-  class Emoji(query: String, val keywordSearch: Boolean) : InlineQuery(query.replace('_', ' '))
+  class Emoji(query: String) : InlineQuery(query.replace('_', ' '))
   class Mention(query: String) : InlineQuery(query)
 }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/ui/inlinequery/InlineQueryEmojiResult.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/ui/inlinequery/InlineQueryEmojiResult.kt
index 4d2bc37b8c..866cb6ba2a 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/ui/inlinequery/InlineQueryEmojiResult.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/ui/inlinequery/InlineQueryEmojiResult.kt
@@ -12,7 +12,7 @@ import org.thoughtcrime.securesms.util.adapter.mapping.MappingViewHolder
  */
 object InlineQueryEmojiResult {
 
-  class Model(val canonicalEmoji: String, val preferredEmoji: String, val keywordSearch: Boolean) : MappingModel<Model> {
+  class Model(val canonicalEmoji: String, val preferredEmoji: String) : MappingModel<Model> {
     override fun areItemsTheSame(newItem: Model): Boolean {
       return canonicalEmoji == newItem.canonicalEmoji
     }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/ui/inlinequery/InlineQueryReplacement.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/ui/inlinequery/InlineQueryReplacement.kt
index 83f2d72c17..09408061f6 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/ui/inlinequery/InlineQueryReplacement.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/ui/inlinequery/InlineQueryReplacement.kt
@@ -10,16 +10,16 @@ import org.thoughtcrime.securesms.recipients.Recipient
 /**
  * Encapsulate how to replace a query with a user selected result.
  */
-sealed class InlineQueryReplacement(@get:JvmName("isKeywordSearch") val keywordSearch: Boolean = false) {
-  abstract fun toCharSequence(context: Context): CharSequence
+sealed interface InlineQueryReplacement {
+  fun toCharSequence(context: Context): CharSequence
 
-  class Emoji(private val emoji: String, keywordSearch: Boolean) : InlineQueryReplacement(keywordSearch) {
+  class Emoji(private val emoji: String) : InlineQueryReplacement {
     override fun toCharSequence(context: Context): CharSequence {
       return emoji
     }
   }
 
-  class Mention(private val recipient: Recipient, keywordSearch: Boolean) : InlineQueryReplacement(keywordSearch) {
+  class Mention(private val recipient: Recipient) : InlineQueryReplacement {
     override fun toCharSequence(context: Context): CharSequence {
       val builder = SpannableStringBuilder().apply {
         append(MentionUtil.MENTION_STARTER)
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 149725ca22..dd4343d2bf 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
@@ -44,7 +44,7 @@ class InlineQueryViewModel(
   private fun queryEmoji(query: InlineQuery.Emoji): Observable<List<AnyMappingModel>> {
     return emojiSearchRepository
       .submitQuery(query.query)
-      .map { r -> toMappingModels(r, query.keywordSearch) }
+      .map { r -> toMappingModels(r) }
       .toObservable()
   }
 
@@ -52,21 +52,20 @@ class InlineQueryViewModel(
     when (model) {
       is InlineQueryEmojiResult.Model -> {
         recentEmojis.onCodePointSelected(model.preferredEmoji)
-        selectionSubject.onNext(InlineQueryReplacement.Emoji(model.preferredEmoji, model.keywordSearch))
+        selectionSubject.onNext(InlineQueryReplacement.Emoji(model.preferredEmoji))
       }
     }
   }
 
   companion object {
-    fun toMappingModels(emojiWithLabels: List<String>, keywordSearch: Boolean): List<AnyMappingModel> {
+    fun toMappingModels(emojiWithLabels: List<String>): List<AnyMappingModel> {
       val emojiValues = SignalStore.emojiValues()
       return emojiWithLabels
         .distinct()
         .map { emoji ->
           InlineQueryEmojiResult.Model(
             canonicalEmoji = emoji,
-            preferredEmoji = emojiValues.getPreferredVariation(emoji),
-            keywordSearch = keywordSearch
+            preferredEmoji = emojiValues.getPreferredVariation(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 6939d52bbc..48a247bdb8 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
@@ -54,7 +54,7 @@ class InlineQueryViewModelV2(
   private fun queryEmoji(query: InlineQuery.Emoji): Observable<Results> {
     return emojiSearchRepository
       .submitQuery(query.query)
-      .map { r -> if (r.isEmpty()) None else EmojiResults(toMappingModels(r, query.keywordSearch)) }
+      .map { r -> if (r.isEmpty()) None else EmojiResults(toMappingModels(r)) }
       .toObservable()
   }
 
@@ -77,10 +77,10 @@ class InlineQueryViewModelV2(
     when (model) {
       is InlineQueryEmojiResult.Model -> {
         recentEmojis.onCodePointSelected(model.preferredEmoji)
-        selectionSubject.onNext(InlineQueryReplacement.Emoji(model.preferredEmoji, model.keywordSearch))
+        selectionSubject.onNext(InlineQueryReplacement.Emoji(model.preferredEmoji))
       }
       is MentionViewState -> {
-        selectionSubject.onNext(InlineQueryReplacement.Mention(model.recipient, false))
+        selectionSubject.onNext(InlineQueryReplacement.Mention(model.recipient))
       }
     }
   }
@@ -90,15 +90,14 @@ class InlineQueryViewModelV2(
   }
 
   companion object {
-    fun toMappingModels(emojiWithLabels: List<String>, keywordSearch: Boolean): List<AnyMappingModel> {
+    fun toMappingModels(emojiWithLabels: List<String>): List<AnyMappingModel> {
       val emojiValues = SignalStore.emojiValues()
       return emojiWithLabels
         .distinct()
         .map { emoji ->
           InlineQueryEmojiResult.Model(
             canonicalEmoji = emoji,
-            preferredEmoji = emojiValues.getPreferredVariation(emoji),
-            keywordSearch = keywordSearch
+            preferredEmoji = emojiValues.getPreferredVariation(emoji)
           )
         }
     }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityResultContracts.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityResultContracts.kt
index e38cadc7b8..1b3c845b00 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityResultContracts.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityResultContracts.kt
@@ -109,7 +109,9 @@ class ConversationActivityResultContracts(private val fragment: Fragment, privat
       Permissions.with(fragment)
         .request(Manifest.permission.ACCESS_FINE_LOCATION, Manifest.permission.ACCESS_COARSE_LOCATION)
         .ifNecessary()
-        .withPermanentDenialDialog(fragment.getString(R.string.AttachmentManager_signal_requires_location_information_in_order_to_attach_a_location))
+        .withRationaleDialog(fragment.getString(R.string.AttachmentManager_signal_allow_access_location), fragment.getString(R.string.AttachmentManager_signal_allow_signal_access_location), R.drawable.symbol_location_white_24)
+        .withPermanentDenialDialog(fragment.getString(R.string.AttachmentManager_signal_requires_location_information_in_order_to_attach_a_location), null, R.string.AttachmentManager_signal_allow_access_location, R.string.AttachmentManager_signal_to_send_location, fragment.parentFragmentManager)
+        .onAnyDenied { Toast.makeText(fragment.requireContext(), R.string.AttachmentManager_signal_needs_location_access, Toast.LENGTH_LONG).show() }
         .onSomeGranted { selectLocationLauncher.launch(chatColors) }
         .execute()
     }
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 c36368c4eb..a2e2e62c4d 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
@@ -6,6 +6,9 @@
 package org.thoughtcrime.securesms.conversation.v2
 
 import android.text.TextUtils
+import android.view.GestureDetector
+import android.view.GestureDetector.SimpleOnGestureListener
+import android.view.MotionEvent
 import android.view.View
 import android.view.ViewGroup
 import androidx.core.text.HtmlCompat
@@ -382,8 +385,22 @@ class ConversationAdapterV2(
   }
 
   private inner class OutgoingMediaViewHolder(itemView: View) : ConversationViewHolder<OutgoingMedia>(itemView) {
+    val gestureDetector = GestureDetector(
+      context,
+      object : SimpleOnGestureListener() {
+        override fun onDoubleTap(e: MotionEvent): Boolean {
+          if (clickListener != null) {
+            clickListener.onItemDoubleClick(getMultiselectPartForLatestTouch())
+            return true
+          }
+          return false
+        }
+      }
+    )
+
     override fun bind(model: OutgoingMedia) {
       bindable.setEventListener(clickListener)
+      bindable.setGestureDetector(gestureDetector)
 
       if (bindPayloadsIfAvailable()) {
         return
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationBannerView.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationBannerView.kt
index 258783f16e..738e0d7a44 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationBannerView.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationBannerView.kt
@@ -120,6 +120,7 @@ class ConversationBannerView @JvmOverloads constructor(
 
       setOnHideListener {
         clearRequestReview()
+        listener?.onDismissReview()
         true
       }
     }
@@ -194,5 +195,6 @@ class ConversationBannerView @JvmOverloads constructor(
     fun onUnverifiedBannerDismissed(unverifiedIdentities: List<IdentityRecord>)
     fun onRequestReviewIndividual(recipientId: RecipientId)
     fun onReviewGroupMembers(groupId: GroupId.V2)
+    fun onDismissReview()
   }
 }
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 0cdf7dcf91..9a1501dc2d 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
@@ -344,7 +344,8 @@ class ConversationFragment :
   ConversationBottomSheetCallback,
   SafetyNumberBottomSheet.Callbacks,
   EnableCallNotificationSettingsDialog.Callback,
-  MultiselectForwardBottomSheet.Callback {
+  MultiselectForwardBottomSheet.Callback,
+  DoubleTapEditEducationSheet.Callback {
 
   companion object {
     private val TAG = Log.tag(ConversationFragment::class.java)
@@ -416,7 +417,7 @@ class ConversationFragment :
 
   private val conversationGroupViewModel: ConversationGroupViewModel by viewModels(
     factoryProducer = {
-      ConversationGroupViewModel.Factory(args.threadId, conversationRecipientRepository)
+      ConversationGroupViewModel.Factory(conversationRecipientRepository)
     }
   )
 
@@ -640,6 +641,10 @@ class ConversationFragment :
 
     conversationGroupViewModel.updateGroupStateIfNeeded()
 
+    if (inputPanel.voiceNoteDraft != null) {
+      updateToggleButtonState()
+    }
+
     if (SignalStore.rateLimit().needsRecaptcha()) {
       RecaptchaProofBottomSheetFragment.show(childFragmentManager)
     }
@@ -2719,6 +2724,20 @@ class ConversationFragment :
       RecipientBottomSheetDialogFragment.show(childFragmentManager, recipientId, groupId)
     }
 
+    override fun onItemDoubleClick(item: MultiselectPart) {
+      Log.d(TAG, "onItemDoubleClick")
+      if (!isValidEditMessageSend(item.getMessageRecord(), System.currentTimeMillis())) {
+        return
+      }
+
+      if (SignalStore.uiHints().hasSeenDoubleTapEditEducationSheet) {
+        onDoubleTapEditEducationSheetNext(item.conversationMessage)
+        return
+      }
+
+      DoubleTapEditEducationSheet(item).show(childFragmentManager, DoubleTapEditEducationSheet.KEY)
+    }
+
     override fun onMessageWithErrorClicked(messageRecord: MessageRecord) {
       val recipientId = viewModel.recipientSnapshot?.id ?: return
       if (messageRecord.isIdentityMismatchFailure) {
@@ -3019,7 +3038,7 @@ class ConversationFragment :
               }
 
               override fun onHide() {
-                if (!lifecycle.currentState.isAtLeast(Lifecycle.State.INITIALIZED)) {
+                if (!lifecycle.currentState.isAtLeast(Lifecycle.State.STARTED) || activity == null || activity?.isFinishing == true) {
                   return
                 }
 
@@ -3028,10 +3047,8 @@ class ConversationFragment :
                   getVoiceNoteMediaController().resumePlayback(selectedConversationModel.audioUri, messageRecord.getId())
                 }
 
-                if (activity != null) {
-                  WindowUtil.setLightStatusBarFromTheme(requireActivity())
-                  WindowUtil.setLightNavigationBarFromTheme(requireActivity())
-                }
+                WindowUtil.setLightStatusBarFromTheme(requireActivity())
+                WindowUtil.setLightNavigationBarFromTheme(requireActivity())
 
                 clearFocusedItem()
 
@@ -3640,6 +3657,10 @@ class ConversationFragment :
     override fun onReviewGroupMembers(groupId: GroupId.V2) {
       ReviewCardDialogFragment.createForReviewMembers(groupId).show(childFragmentManager, null)
     }
+
+    override fun onDismissReview() {
+      viewModel.onDismissReview()
+    }
   }
 
   //endregion
@@ -3892,8 +3913,9 @@ class ConversationFragment :
         .with(this@ConversationFragment)
         .request(Manifest.permission.RECORD_AUDIO)
         .ifNecessary()
-        .withRationaleDialog(getString(R.string.ConversationActivity_to_send_audio_messages_allow_signal_access_to_your_microphone), R.drawable.ic_mic_solid_24)
-        .withPermanentDenialDialog(getString(R.string.ConversationActivity_signal_requires_the_microphone_permission_in_order_to_send_audio_messages))
+        .withRationaleDialog(getString(R.string.ConversationActivity_allow_access_microphone), getString(R.string.ConversationActivity_to_send_voice_messages_allow_signal_access_to_your_microphone), R.drawable.ic_mic_24)
+        .withPermanentDenialDialog(getString(R.string.ConversationActivity_signal_requires_the_microphone_permission_in_order_to_send_audio_messages), null, R.string.ConversationActivity_allow_access_microphone, R.string.ConversationActivity_signal_to_send_audio_messages, this@ConversationFragment.parentFragmentManager)
+        .onAnyDenied { Toast.makeText(this@ConversationFragment.requireContext(), R.string.ConversationActivity_signal_needs_microphone_access_voice_message, Toast.LENGTH_LONG).show() }
         .execute()
     }
 
@@ -4235,4 +4257,8 @@ class ConversationFragment :
       }
     }
   }
+
+  override fun onDoubleTapEditEducationSheetNext(conversationMessage: ConversationMessage) {
+    handleEditMessage(conversationMessage)
+  }
 }
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 b0ee8e6ec1..a403faa587 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
@@ -82,7 +82,7 @@ import org.thoughtcrime.securesms.mms.PartAuthority
 import org.thoughtcrime.securesms.mms.QuoteModel
 import org.thoughtcrime.securesms.mms.Slide
 import org.thoughtcrime.securesms.mms.SlideDeck
-import org.thoughtcrime.securesms.profiles.spoofing.ReviewUtil
+import org.thoughtcrime.securesms.profiles.spoofing.ReviewRecipient
 import org.thoughtcrime.securesms.providers.BlobProvider
 import org.thoughtcrime.securesms.recipients.Recipient
 import org.thoughtcrime.securesms.recipients.RecipientId
@@ -363,6 +363,12 @@ class ConversationRepository(
     }.subscribeOn(Schedulers.io())
   }
 
+  fun dismissRequestReviewState(threadRecipientId: RecipientId) {
+    SignalExecutors.BOUNDED_IO.execute {
+      SignalDatabase.nameCollisions.markCollisionsForThreadRecipientDismissed(threadRecipientId)
+    }
+  }
+
   fun getRequestReviewState(recipient: Recipient, group: GroupRecord?, messageRequest: MessageRequestState): Single<RequestReviewState> {
     return Single.fromCallable {
       if (group == null && messageRequest.state != MessageRequestState.State.INDIVIDUAL) {
@@ -370,12 +376,12 @@ class ConversationRepository(
       }
 
       if (group == null) {
-        val recipientsToReview = ReviewUtil.getRecipientsToPromptForReview(recipient.id)
-        if (recipientsToReview.size > 0) {
+        val recipientsToReview = SignalDatabase.nameCollisions.getCollisionsForThreadRecipientId(recipient.id)
+        if (recipientsToReview.isNotEmpty()) {
           return@fromCallable RequestReviewState(
             individualReviewState = IndividualReviewState(
               target = recipient,
-              firstDuplicate = Recipient.resolvedList(recipientsToReview)[0]
+              firstDuplicate = recipientsToReview.first().recipient
             )
           )
         }
@@ -383,14 +389,14 @@ class ConversationRepository(
 
       if (group != null && group.isV2Group) {
         val groupId = group.id.requireV2()
-        val duplicateRecipients: List<Recipient> = ReviewUtil.getDuplicatedRecipients(groupId).map { it.recipient }
+        val duplicateRecipients: List<ReviewRecipient> = SignalDatabase.nameCollisions.getCollisionsForThreadRecipientId(group.recipientId)
 
         if (duplicateRecipients.isNotEmpty()) {
           return@fromCallable RequestReviewState(
             groupReviewState = GroupReviewState(
               groupId,
-              duplicateRecipients[0],
-              duplicateRecipients[1],
+              duplicateRecipients[0].recipient,
+              duplicateRecipients[1].recipient,
               duplicateRecipients.size
             )
           )
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 1fc923cd49..d378454ed6 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
@@ -290,6 +290,11 @@ class ConversationViewModel(
     refreshReminder.onNext(Unit)
   }
 
+  fun onDismissReview() {
+    val recipientId = recipientSnapshot?.id ?: return
+    repository.dismissRequestReviewState(recipientId)
+  }
+
   override fun onCleared() {
     disposables.clear()
     startExpiration.onComplete()
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
new file mode 100644
index 0000000000..95a82a7b74
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/DoubleTapEditEducationSheet.kt
@@ -0,0 +1,48 @@
+package org.thoughtcrime.securesms.conversation.v2
+
+import android.content.DialogInterface
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+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() {
+
+  companion object {
+    const val KEY = "DOUBLE_TAP_EDIT_EDU"
+  }
+
+  override val peekHeightPercentage: Float = 1f
+
+  override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+    return inflater.inflate(R.layout.conversation_item_double_tap_edit_education_sheet, container, false)
+  }
+
+  override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+    SignalStore.uiHints().hasSeenDoubleTapEditEducationSheet = true
+
+    view.findViewById<MaterialButton>(R.id.got_it).setOnClickListener {
+      requireListener<Callback>().onDoubleTapEditEducationSheetNext(item.conversationMessage)
+      dismissAllowingStateLoss()
+    }
+  }
+
+  override fun onCancel(dialog: DialogInterface) {
+    super.onCancel(dialog)
+    requireListener<Callback>().onDoubleTapEditEducationSheetNext(item.conversationMessage)
+  }
+
+  interface Callback {
+    fun onDoubleTapEditEducationSheetNext(conversationMessage: ConversationMessage)
+  }
+}
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 317e4d6907..c2411d314a 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
@@ -10,6 +10,7 @@ import org.signal.core.util.Stopwatch
 import org.signal.core.util.logging.Log
 import org.signal.core.util.toInt
 import org.signal.paging.PagedDataSource
+import org.thoughtcrime.securesms.backup.v2.BackupRestoreManager
 import org.thoughtcrime.securesms.conversation.ConversationData
 import org.thoughtcrime.securesms.conversation.ConversationMessage
 import org.thoughtcrime.securesms.conversation.ConversationMessage.ConversationMessageFactory
@@ -20,8 +21,10 @@ import org.thoughtcrime.securesms.database.model.InMemoryMessageRecord.Universal
 import org.thoughtcrime.securesms.database.model.MessageRecord
 import org.thoughtcrime.securesms.database.model.MmsMessageRecord
 import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+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.adapter.mapping.MappingModel
 
 private typealias ConversationElement = MappingModel<*>
@@ -122,6 +125,11 @@ class ConversationDataSource(
     records = MessageDataFetcher.updateModelsWithData(records, extraData).toMutableList()
     stopwatch.split("models")
 
+    if (FeatureFlags.messageBackups() && SignalStore.backup().restoreState.inProgress) {
+      BackupRestoreManager.prioritizeAttachmentsIfNeeded(records)
+      stopwatch.split("restore")
+    }
+
     val messages = records.map { record ->
       ConversationMessageFactory.createWithUnresolvedData(
         localContext,
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 ebbd92d065..4c965aaf3d 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
@@ -4,7 +4,6 @@ import androidx.lifecycle.ViewModel
 import androidx.lifecycle.ViewModelProvider
 import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
 import io.reactivex.rxjava3.core.Maybe
-import io.reactivex.rxjava3.core.Observable
 import io.reactivex.rxjava3.core.Single
 import io.reactivex.rxjava3.disposables.CompositeDisposable
 import io.reactivex.rxjava3.kotlin.addTo
@@ -25,21 +24,23 @@ import org.thoughtcrime.securesms.groups.v2.GroupManagementRepository
 import org.thoughtcrime.securesms.jobs.ForceUpdateGroupV2Job
 import org.thoughtcrime.securesms.jobs.GroupV2UpdateSelfProfileKeyJob
 import org.thoughtcrime.securesms.jobs.RequestGroupV2InfoJob
-import org.thoughtcrime.securesms.profiles.spoofing.ReviewUtil
 import org.thoughtcrime.securesms.recipients.Recipient
 
 /**
  * Manages group state and actions for conversations.
  */
 class ConversationGroupViewModel(
-  private val threadId: Long,
   private val groupManagementRepository: GroupManagementRepository = GroupManagementRepository(),
   private val recipientRepository: ConversationRecipientRepository
 ) : ViewModel() {
 
   private val disposables = CompositeDisposable()
-  private val _groupRecord: BehaviorSubject<GroupRecord>
-  private val _reviewState: Subject<ConversationGroupReviewState>
+
+  private val _groupRecord: BehaviorSubject<GroupRecord> = recipientRepository
+    .groupRecord
+    .filter { it.isPresent }
+    .map { it.get() }
+    .subscribeWithSubject(BehaviorSubject.create(), disposables)
 
   private val _groupActiveState: Subject<ConversationGroupActiveState> = BehaviorSubject.create()
   private val _memberLevel: BehaviorSubject<ConversationGroupMemberLevel> = BehaviorSubject.create()
@@ -50,28 +51,6 @@ class ConversationGroupViewModel(
     get() = _groupRecord.value
 
   init {
-    _groupRecord = recipientRepository
-      .groupRecord
-      .filter { it.isPresent }
-      .map { it.get() }
-      .subscribeWithSubject(BehaviorSubject.create(), disposables)
-
-    val duplicates = _groupRecord.map { groupRecord ->
-      if (groupRecord.isV2Group) {
-        ReviewUtil.getDuplicatedRecipients(groupRecord.id.requireV2()).map { it.recipient }
-      } else {
-        emptyList()
-      }
-    }
-
-    _reviewState = Observable.combineLatest(_groupRecord, duplicates) { record, dupes ->
-      if (dupes.isEmpty()) {
-        ConversationGroupReviewState.EMPTY
-      } else {
-        ConversationGroupReviewState(record.id.requireV2(), dupes[0], dupes.size)
-      }
-    }.subscribeWithSubject(BehaviorSubject.create(), disposables)
-
     disposables += _groupRecord.subscribe { groupRecord ->
       _groupActiveState.onNext(ConversationGroupActiveState(groupRecord.isActive, groupRecord.isV2Group))
       _memberLevel.onNext(ConversationGroupMemberLevel(groupRecord.memberLevel(Recipient.self()), groupRecord.isAnnouncementGroup))
@@ -154,9 +133,9 @@ class ConversationGroupViewModel(
       .addTo(disposables)
   }
 
-  class Factory(private val threadId: Long, private val recipientRepository: ConversationRecipientRepository) : ViewModelProvider.Factory {
+  class Factory(private val recipientRepository: ConversationRecipientRepository) : ViewModelProvider.Factory {
     override fun <T : ViewModel> create(modelClass: Class<T>): T {
-      return modelClass.cast(ConversationGroupViewModel(threadId, recipientRepository = recipientRepository)) as T
+      return modelClass.cast(ConversationGroupViewModel(recipientRepository = recipientRepository)) as T
     }
   }
 }
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 5ec98f4424..998ab89aa0 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
@@ -18,6 +18,8 @@ import android.text.style.ClickableSpan
 import android.text.style.ForegroundColorSpan
 import android.text.style.URLSpan
 import android.util.TypedValue
+import android.view.GestureDetector
+import android.view.MotionEvent
 import android.view.View
 import android.view.ViewGroup
 import androidx.core.content.ContextCompat
@@ -110,6 +112,19 @@ open class V2ConversationItemTextOnlyViewHolder<Model : MappingModel<Model>>(
   private val senderDrawable = ChatColorsDrawable(conversationContext::getChatColorsData)
   private val bodyBubbleLayoutTransition = BodyBubbleLayoutTransition()
 
+  private val gestureDetector = GestureDetector(
+    context,
+    object : GestureDetector.SimpleOnGestureListener() {
+      override fun onDoubleTap(e: MotionEvent): Boolean {
+        if (conversationContext.selectedItems.isEmpty()) {
+          conversationContext.clickListener.onItemDoubleClick(getMultiselectPartForLatestTouch())
+          return true
+        }
+        return false
+      }
+    }
+  )
+
   protected lateinit var shape: V2ConversationItemShape.MessageShape
 
   private val replyDelegate = object : V2ConversationItemLayout.OnMeasureListener {
@@ -139,6 +154,7 @@ open class V2ConversationItemTextOnlyViewHolder<Model : MappingModel<Model>>(
         )
     }
 
+    binding.body.setOnTouchListener { _, event -> gestureDetector.onTouchEvent(event) }
     binding.root.setOnClickListener { onBubbleClicked() }
     binding.root.setOnLongClickListener {
       conversationContext.clickListener.onItemLongClick(binding.root, getMultiselectPartForLatestTouch())
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 9e181b7b6d..7ce6e5808c 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/database/AttachmentTable.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/AttachmentTable.kt
@@ -52,13 +52,16 @@ import org.signal.core.util.requireInt
 import org.signal.core.util.requireLong
 import org.signal.core.util.requireNonNullBlob
 import org.signal.core.util.requireNonNullString
+import org.signal.core.util.requireObject
 import org.signal.core.util.requireString
 import org.signal.core.util.select
 import org.signal.core.util.toInt
 import org.signal.core.util.update
 import org.signal.core.util.withinTransaction
+import org.thoughtcrime.securesms.attachments.ArchivedAttachment
 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.audio.AudioHash
 import org.thoughtcrime.securesms.blurhash.BlurHash
@@ -94,7 +97,6 @@ import java.security.NoSuchAlgorithmException
 import java.util.LinkedList
 import java.util.Optional
 import java.util.UUID
-import kotlin.time.Duration.Companion.days
 
 class AttachmentTable(
   context: Context,
@@ -139,6 +141,11 @@ class AttachmentTable(
     const val TRANSFORM_PROPERTIES = "transform_properties"
     const val DISPLAY_ORDER = "display_order"
     const val UPLOAD_TIMESTAMP = "upload_timestamp"
+    const val ARCHIVE_CDN = "archive_cdn"
+    const val ARCHIVE_MEDIA_NAME = "archive_media_name"
+    const val ARCHIVE_MEDIA_ID = "archive_media_id"
+    const val ARCHIVE_TRANSFER_FILE = "archive_transfer_file"
+    const val ARCHIVE_TRANSFER_STATE = "archive_transfer_state"
 
     const val ATTACHMENT_JSON_ALIAS = "attachment_json"
 
@@ -149,6 +156,8 @@ class AttachmentTable(
     const val TRANSFER_PROGRESS_PENDING = 2
     const val TRANSFER_PROGRESS_FAILED = 3
     const val TRANSFER_PROGRESS_PERMANENT_FAILURE = 4
+    const val TRANSFER_NEEDS_RESTORE = 5
+    const val TRANSFER_RESTORE_IN_PROGRESS = 6
     const val PREUPLOAD_MESSAGE_ID: Long = -8675309
 
     private val PROJECTION = arrayOf(
@@ -184,10 +193,15 @@ class AttachmentTable(
       DISPLAY_ORDER,
       UPLOAD_TIMESTAMP,
       DATA_HASH_START,
-      DATA_HASH_END
+      DATA_HASH_END,
+      ARCHIVE_CDN,
+      ARCHIVE_MEDIA_NAME,
+      ARCHIVE_MEDIA_ID,
+      ARCHIVE_TRANSFER_FILE
     )
 
-    const val CREATE_TABLE = """
+    @JvmField
+    val CREATE_TABLE = """
       CREATE TABLE $TABLE_NAME (
         $ID INTEGER PRIMARY KEY AUTOINCREMENT,
         $MESSAGE_ID INTEGER,
@@ -221,7 +235,12 @@ class AttachmentTable(
         $DISPLAY_ORDER INTEGER DEFAULT 0,
         $UPLOAD_TIMESTAMP INTEGER DEFAULT 0,
         $DATA_HASH_START TEXT DEFAULT NULL,
-        $DATA_HASH_END TEXT DEFAULT NULL
+        $DATA_HASH_END TEXT DEFAULT NULL,
+        $ARCHIVE_CDN INTEGER DEFAULT 0,
+        $ARCHIVE_MEDIA_NAME TEXT DEFAULT NULL,
+        $ARCHIVE_MEDIA_ID TEXT DEFAULT NULL,
+        $ARCHIVE_TRANSFER_FILE TEXT DEFAULT NULL,
+        $ARCHIVE_TRANSFER_STATE INTEGER DEFAULT ${ArchiveTransferState.NONE.value}
       )
       """
 
@@ -232,13 +251,11 @@ class AttachmentTable(
       "CREATE INDEX IF NOT EXISTS attachment_sticker_pack_id_index ON $TABLE_NAME ($STICKER_PACK_ID);",
       "CREATE INDEX IF NOT EXISTS attachment_data_hash_start_index ON $TABLE_NAME ($DATA_HASH_START);",
       "CREATE INDEX IF NOT EXISTS attachment_data_hash_end_index ON $TABLE_NAME ($DATA_HASH_END);",
-      "CREATE INDEX IF NOT EXISTS attachment_data_index ON $TABLE_NAME ($DATA_FILE);"
+      "CREATE INDEX IF NOT EXISTS attachment_data_index ON $TABLE_NAME ($DATA_FILE);",
+      "CREATE INDEX IF NOT EXISTS attachment_archive_media_id_index ON $TABLE_NAME ($ARCHIVE_MEDIA_ID);"
     )
 
-    val ATTACHMENT_POINTER_REUSE_THRESHOLD = 7.days.inWholeMilliseconds
-
     @JvmStatic
-    @JvmOverloads
     @Throws(IOException::class)
     fun newDataFile(context: Context): File {
       val partsDirectory = context.getDir(DIRECTORY, Context.MODE_PRIVATE)
@@ -387,6 +404,99 @@ class AttachmentTable(
       .flatten()
   }
 
+  fun getArchivableAttachments(): Cursor {
+    return readableDatabase
+      .select(*PROJECTION)
+      .from(TABLE_NAME)
+      .where("$ARCHIVE_MEDIA_ID IS NULL AND $REMOTE_DIGEST IS NOT NULL AND ($TRANSFER_STATE = ? OR $TRANSFER_STATE = ?)", TRANSFER_PROGRESS_DONE.toString(), TRANSFER_NEEDS_RESTORE.toString())
+      .orderBy("$ID DESC")
+      .run()
+  }
+
+  fun getRestorableAttachments(batchSize: Int): List<DatabaseAttachment> {
+    return readableDatabase
+      .select(*PROJECTION)
+      .from(TABLE_NAME)
+      .where("$TRANSFER_STATE = ?", TRANSFER_NEEDS_RESTORE.toString())
+      .limit(batchSize)
+      .orderBy("$ID DESC")
+      .run().readToList {
+        it.readAttachments()
+      }.flatten()
+  }
+
+  /**
+   * Finds the next eligible attachment that needs to be uploaded to the archive service.
+   * If it exists, it'll also atomically be marked as [ArchiveTransferState.BACKFILL_UPLOAD_IN_PROGRESS].
+   */
+  fun getNextAttachmentToArchiveAndMarkUploadInProgress(): DatabaseAttachment? {
+    return writableDatabase.withinTransaction {
+      val record: DatabaseAttachment? = readableDatabase
+        .select(*PROJECTION)
+        .from(TABLE_NAME)
+        .where("$ARCHIVE_TRANSFER_STATE = ? AND $DATA_FILE NOT NULL AND $TRANSFER_STATE = $TRANSFER_PROGRESS_DONE", ArchiveTransferState.NONE.value)
+        .orderBy("$ID DESC")
+        .limit(1)
+        .run()
+        .readToSingleObject { it.readAttachment() }
+
+      if (record != null) {
+        writableDatabase
+          .update(TABLE_NAME)
+          .values(ARCHIVE_TRANSFER_STATE to ArchiveTransferState.BACKFILL_UPLOAD_IN_PROGRESS.value)
+          .where("$ID = ?", record.attachmentId)
+          .run()
+      }
+
+      record
+    }
+  }
+
+  /**
+   * Returns the current archive transfer state, if the attachment can be found.
+   */
+  fun getArchiveTransferState(id: AttachmentId): ArchiveTransferState? {
+    return readableDatabase
+      .select(ARCHIVE_TRANSFER_STATE)
+      .from(TABLE_NAME)
+      .where("$ID = ?", id.id)
+      .run()
+      .readToSingleObject { ArchiveTransferState.deserialize(it.requireInt(ARCHIVE_TRANSFER_STATE)) }
+  }
+
+  /**
+   * Sets the archive transfer state for the given attachment and all other attachments that share the same data file.
+   */
+  fun setArchiveTransferState(id: AttachmentId, state: ArchiveTransferState) {
+    writableDatabase.withinTransaction {
+      val dataFile: String = readableDatabase
+        .select(DATA_FILE)
+        .from(TABLE_NAME)
+        .where("$ID = ?", id.id)
+        .run()
+        .readToSingleObject { it.requireString(DATA_FILE) } ?: return@withinTransaction
+
+      writableDatabase
+        .update(TABLE_NAME)
+        .values(ARCHIVE_TRANSFER_STATE to state.value)
+        .where("$DATA_FILE = ?", dataFile)
+        .run()
+    }
+  }
+
+  /**
+   * Resets any in-progress archive backfill states to [ArchiveTransferState.NONE], returning the number that had to be reset.
+   * This should only be called if you believe the backfill process has finished. In this case, if this returns a value > 0,
+   * it indicates that state was mis-tracked and you should try uploading again.
+   */
+  fun resetPendingArchiveBackfills(): Int {
+    return writableDatabase
+      .update(TABLE_NAME)
+      .values(ARCHIVE_TRANSFER_STATE to ArchiveTransferState.NONE.value)
+      .where("$ARCHIVE_TRANSFER_STATE == ${ArchiveTransferState.BACKFILL_UPLOAD_IN_PROGRESS.value} || $ARCHIVE_TRANSFER_STATE == ${ArchiveTransferState.BACKFILL_UPLOADED.value}")
+      .run()
+  }
+
   fun deleteAttachmentsForMessage(mmsId: Long): Boolean {
     Log.d(TAG, "[deleteAttachmentsForMessage] mmsId: $mmsId")
 
@@ -678,6 +788,7 @@ class AttachmentTable(
       values.put(TRANSFER_STATE, TRANSFER_PROGRESS_DONE)
       values.put(TRANSFER_FILE, null as String?)
       values.put(TRANSFORM_PROPERTIES, TransformProperties.forSkipTransform().serialize())
+      values.put(ARCHIVE_TRANSFER_FILE, null as String?)
 
       db.update(TABLE_NAME)
         .values(values)
@@ -733,7 +844,7 @@ class AttachmentTable(
 
     val values = contentValuesOf(
       TRANSFER_STATE to TRANSFER_PROGRESS_DONE,
-      CDN_NUMBER to attachment.cdnNumber,
+      CDN_NUMBER to attachment.cdn.serialize(),
       REMOTE_LOCATION to attachment.remoteLocation,
       REMOTE_DIGEST to attachment.remoteDigest,
       REMOTE_INCREMENTAL_DIGEST to attachment.incrementalDigest,
@@ -773,7 +884,7 @@ class AttachmentTable(
         DATA_SIZE to sourceDataInfo.length,
         DATA_RANDOM to sourceDataInfo.random,
         TRANSFER_STATE to sourceAttachment.transferState,
-        CDN_NUMBER to sourceAttachment.cdnNumber,
+        CDN_NUMBER to sourceAttachment.cdn.serialize(),
         REMOTE_LOCATION to sourceAttachment.remoteLocation,
         REMOTE_DIGEST to sourceAttachment.remoteDigest,
         REMOTE_INCREMENTAL_DIGEST to sourceAttachment.incrementalDigest,
@@ -864,7 +975,11 @@ class AttachmentTable(
       val attachmentId = if (attachment.uri != null) {
         insertAttachmentWithData(mmsId, attachment, attachment.quote)
       } else {
-        insertUndownloadedAttachment(mmsId, attachment, attachment.quote)
+        if (attachment is ArchivedAttachment) {
+          insertArchivedAttachment(mmsId, attachment, attachment.quote)
+        } else {
+          insertUndownloadedAttachment(mmsId, attachment, attachment.quote)
+        }
       }
 
       insertedAttachments[attachment] = attachmentId
@@ -889,6 +1004,75 @@ class AttachmentTable(
     return insertedAttachments
   }
 
+  fun debugCopyAttachmentForArchiveRestore(
+    mmsId: Long,
+    attachment: DatabaseAttachment
+  ) {
+    val copy =
+      """
+      INSERT INTO $TABLE_NAME
+        (
+          $MESSAGE_ID,
+          $CONTENT_TYPE,
+          $TRANSFER_STATE,
+          $CDN_NUMBER,
+          $REMOTE_LOCATION,
+          $REMOTE_DIGEST,
+          $REMOTE_INCREMENTAL_DIGEST,
+          $REMOTE_INCREMENTAL_DIGEST_CHUNK_SIZE,
+          $REMOTE_KEY,
+          $FILE_NAME,
+          $DATA_SIZE,
+          $VOICE_NOTE,
+          $BORDERLESS,
+          $VIDEO_GIF,
+          $WIDTH,
+          $HEIGHT,
+          $CAPTION,
+          $UPLOAD_TIMESTAMP,
+          $BLUR_HASH,
+          $DATA_SIZE,
+          $DATA_RANDOM,
+          $DATA_HASH_START,
+          $DATA_HASH_END,
+          $ARCHIVE_MEDIA_ID,
+          $ARCHIVE_MEDIA_NAME,
+          $ARCHIVE_CDN
+        )
+      SELECT
+          $mmsId,
+          $CONTENT_TYPE,
+          $TRANSFER_PROGRESS_PENDING,
+          $CDN_NUMBER,
+          $REMOTE_LOCATION,
+          $REMOTE_DIGEST,
+          $REMOTE_INCREMENTAL_DIGEST,
+          $REMOTE_INCREMENTAL_DIGEST_CHUNK_SIZE,
+          $REMOTE_KEY,
+          $FILE_NAME,
+          $DATA_SIZE,
+          $VOICE_NOTE,
+          $BORDERLESS,
+          $VIDEO_GIF,
+          $WIDTH,
+          $HEIGHT,
+          $CAPTION,
+          ${System.currentTimeMillis()},
+          $BLUR_HASH,
+          $DATA_SIZE,
+          $DATA_RANDOM,
+          $DATA_HASH_START,
+          $DATA_HASH_END,
+          "${attachment.archiveMediaId}",
+          "${attachment.archiveMediaName}",
+          ${attachment.archiveCdn}
+        FROM $TABLE_NAME
+        WHERE $ID = ${attachment.attachmentId.id}
+    """
+
+    writableDatabase.execSQL(copy)
+  }
+
   /**
    * Updates the data stored for an existing attachment. This happens after transformations, like transcoding.
    */
@@ -955,6 +1139,24 @@ class AttachmentTable(
     return transferFile
   }
 
+  @Throws(IOException::class)
+  fun getOrCreateArchiveTransferFile(attachmentId: AttachmentId): File {
+    val existing = getArchiveTransferFile(writableDatabase, attachmentId)
+    if (existing != null) {
+      return existing
+    }
+
+    val transferFile = newTransferFile()
+
+    writableDatabase
+      .update(TABLE_NAME)
+      .values(ARCHIVE_TRANSFER_FILE to transferFile.absolutePath)
+      .where("$ID = ?", attachmentId.id)
+      .run()
+
+    return transferFile
+  }
+
   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)
@@ -1086,7 +1288,7 @@ class AttachmentTable(
               transferProgress = jsonObject.getInt(TRANSFER_STATE),
               size = jsonObject.getLong(DATA_SIZE),
               fileName = jsonObject.getString(FILE_NAME),
-              cdnNumber = jsonObject.getInt(CDN_NUMBER),
+              cdn = Cdn.deserialize(jsonObject.getInt(CDN_NUMBER)),
               location = jsonObject.getString(REMOTE_LOCATION),
               key = jsonObject.getString(REMOTE_KEY),
               digest = null,
@@ -1115,7 +1317,10 @@ class AttachmentTable(
               transformProperties = TransformProperties.parse(jsonObject.getString(TRANSFORM_PROPERTIES)),
               displayOrder = jsonObject.getInt(DISPLAY_ORDER),
               uploadTimestamp = jsonObject.getLong(UPLOAD_TIMESTAMP),
-              dataHash = jsonObject.getString(DATA_HASH_END)
+              dataHash = jsonObject.getString(DATA_HASH_END),
+              archiveCdn = jsonObject.getInt(ARCHIVE_CDN),
+              archiveMediaName = jsonObject.getString(ARCHIVE_MEDIA_NAME),
+              archiveMediaId = jsonObject.getString(ARCHIVE_MEDIA_ID)
             )
           }
         }
@@ -1155,6 +1360,56 @@ class AttachmentTable(
     return readableDatabase.rawQuery(query, null)
   }
 
+  fun setArchiveData(attachmentId: AttachmentId, archiveCdn: Int, archiveMediaName: String, archiveMediaId: String) {
+    writableDatabase
+      .update(TABLE_NAME)
+      .values(
+        ARCHIVE_CDN to archiveCdn,
+        ARCHIVE_MEDIA_ID to archiveMediaId,
+        ARCHIVE_MEDIA_NAME to archiveMediaName,
+        ARCHIVE_TRANSFER_STATE to ArchiveTransferState.FINISHED.value
+      )
+      .where("$ID = ?", attachmentId.id)
+      .run()
+  }
+
+  fun updateArchiveCdnByMediaId(archiveMediaId: String, archiveCdn: Int): Int {
+    return writableDatabase
+      .update(TABLE_NAME)
+      .values(
+        ARCHIVE_CDN to archiveCdn
+      )
+      .where("$ARCHIVE_MEDIA_ID = ?", archiveMediaId)
+      .run()
+  }
+
+  fun clearArchiveData(attachmentIds: List<AttachmentId>) {
+    SqlUtil.buildCollectionQuery(ID, attachmentIds.map { it.id })
+      .forEach { query ->
+        writableDatabase
+          .update(TABLE_NAME)
+          .values(
+            ARCHIVE_CDN to 0,
+            ARCHIVE_MEDIA_ID to null,
+            ARCHIVE_MEDIA_NAME to null
+          )
+          .where(query.where, query.whereArgs)
+          .run()
+      }
+  }
+
+  fun clearAllArchiveData() {
+    writableDatabase
+      .update(TABLE_NAME)
+      .values(
+        ARCHIVE_CDN to 0,
+        ARCHIVE_MEDIA_ID to null,
+        ARCHIVE_MEDIA_NAME to null
+      )
+      .where("$ARCHIVE_CDN > 0 OR $ARCHIVE_MEDIA_ID IS NOT NULL OR $ARCHIVE_MEDIA_NAME IS NOT NULL")
+      .run()
+  }
+
   /**
    * Deletes the data file if there's no strong references to other attachments.
    * If deleted, it will also clear all weak references (i.e. quotes) of the attachment.
@@ -1331,7 +1586,7 @@ class AttachmentTable(
         put(MESSAGE_ID, messageId)
         put(CONTENT_TYPE, attachment.contentType)
         put(TRANSFER_STATE, attachment.transferState)
-        put(CDN_NUMBER, attachment.cdnNumber)
+        put(CDN_NUMBER, attachment.cdn.serialize())
         put(REMOTE_LOCATION, attachment.remoteLocation)
         put(REMOTE_DIGEST, attachment.remoteDigest)
         put(REMOTE_INCREMENTAL_DIGEST, attachment.incrementalDigest)
@@ -1366,6 +1621,59 @@ class AttachmentTable(
     return attachmentId
   }
 
+  /**
+   * Attachments need records in the database even if they haven't been downloaded yet. That allows us to store the info we need to download it, what message
+   * it's associated with, etc. We treat this case separately from attachments with data (see [insertAttachmentWithData]) because it's much simpler,
+   * and splitting the two use cases makes the code easier to understand.
+   *
+   * Callers are expected to later call [finalizeAttachmentAfterDownload] once they have downloaded the data for this attachment.
+   */
+  @Throws(MmsException::class)
+  private fun insertArchivedAttachment(messageId: Long, attachment: ArchivedAttachment, quote: Boolean): AttachmentId {
+    Log.d(TAG, "[insertAttachment] Inserting attachment for messageId $messageId.")
+
+    val attachmentId: AttachmentId = writableDatabase.withinTransaction { db ->
+      val contentValues = ContentValues().apply {
+        put(MESSAGE_ID, messageId)
+        put(CONTENT_TYPE, attachment.contentType)
+        put(TRANSFER_STATE, attachment.transferState)
+        put(CDN_NUMBER, attachment.cdn.serialize())
+        put(REMOTE_LOCATION, attachment.remoteLocation)
+        put(REMOTE_DIGEST, attachment.remoteDigest)
+        put(REMOTE_INCREMENTAL_DIGEST, attachment.incrementalDigest)
+        put(REMOTE_INCREMENTAL_DIGEST_CHUNK_SIZE, attachment.incrementalMacChunkSize)
+        put(REMOTE_KEY, attachment.remoteKey)
+        put(FILE_NAME, StorageUtil.getCleanFileName(attachment.fileName))
+        put(DATA_SIZE, attachment.size)
+        put(FAST_PREFLIGHT_ID, attachment.fastPreflightId)
+        put(VOICE_NOTE, attachment.voiceNote.toInt())
+        put(BORDERLESS, attachment.borderless.toInt())
+        put(VIDEO_GIF, attachment.videoGif.toInt())
+        put(WIDTH, attachment.width)
+        put(HEIGHT, attachment.height)
+        put(QUOTE, quote)
+        put(CAPTION, attachment.caption)
+        put(UPLOAD_TIMESTAMP, attachment.uploadTimestamp)
+        put(ARCHIVE_CDN, attachment.archiveCdn)
+        put(ARCHIVE_MEDIA_NAME, attachment.archiveMediaName)
+        put(ARCHIVE_MEDIA_ID, attachment.archiveMediaId)
+
+        attachment.stickerLocator?.let { sticker ->
+          put(STICKER_PACK_ID, sticker.packId)
+          put(STICKER_PACK_KEY, sticker.packKey)
+          put(STICKER_ID, sticker.stickerId)
+          put(STICKER_EMOJI, sticker.emoji)
+        }
+      }
+
+      val rowId = db.insert(TABLE_NAME, null, contentValues)
+      AttachmentId(rowId)
+    }
+
+    notifyAttachmentListeners()
+    return attachmentId
+  }
+
   /**
    * Inserts an attachment with existing data. This is likely an outgoing attachment that we're in the process of sending.
    */
@@ -1455,7 +1763,7 @@ class AttachmentTable(
       contentValues.put(MESSAGE_ID, messageId)
       contentValues.put(CONTENT_TYPE, uploadTemplate?.contentType ?: attachment.contentType)
       contentValues.put(TRANSFER_STATE, attachment.transferState) // Even if we have a template, we let AttachmentUploadJob have the final say so it can re-check and make sure the template is still valid
-      contentValues.put(CDN_NUMBER, uploadTemplate?.cdnNumber ?: 0)
+      contentValues.put(CDN_NUMBER, uploadTemplate?.cdn?.serialize() ?: Cdn.CDN_0.serialize())
       contentValues.put(REMOTE_LOCATION, uploadTemplate?.remoteLocation)
       contentValues.put(REMOTE_DIGEST, uploadTemplate?.remoteDigest)
       contentValues.put(REMOTE_INCREMENTAL_DIGEST, uploadTemplate?.incrementalDigest)
@@ -1513,6 +1821,18 @@ class AttachmentTable(
       }
   }
 
+  private fun getArchiveTransferFile(db: SQLiteDatabase, attachmentId: AttachmentId): File? {
+    return db
+      .select(ARCHIVE_TRANSFER_FILE)
+      .from(TABLE_NAME)
+      .where("$ID = ?", attachmentId.id)
+      .limit(1)
+      .run()
+      .readToSingleObject { cursor ->
+        cursor.requireString(ARCHIVE_TRANSFER_FILE)?.let { File(it) }
+      }
+  }
+
   private fun getAttachment(cursor: Cursor): DatabaseAttachment {
     val contentType = cursor.requireString(CONTENT_TYPE)
 
@@ -1525,7 +1845,7 @@ class AttachmentTable(
       transferProgress = cursor.requireInt(TRANSFER_STATE),
       size = cursor.requireLong(DATA_SIZE),
       fileName = cursor.requireString(FILE_NAME),
-      cdnNumber = cursor.requireInt(CDN_NUMBER),
+      cdn = cursor.requireObject(CDN_NUMBER, Cdn.Serializer),
       location = cursor.requireString(REMOTE_LOCATION),
       key = cursor.requireString(REMOTE_KEY),
       digest = cursor.requireBlob(REMOTE_DIGEST),
@@ -1545,7 +1865,10 @@ class AttachmentTable(
       transformProperties = TransformProperties.parse(cursor.requireString(TRANSFORM_PROPERTIES)),
       displayOrder = cursor.requireInt(DISPLAY_ORDER),
       uploadTimestamp = cursor.requireLong(UPLOAD_TIMESTAMP),
-      dataHash = cursor.requireString(DATA_HASH_END)
+      dataHash = cursor.requireString(DATA_HASH_END),
+      archiveCdn = cursor.requireInt(ARCHIVE_CDN),
+      archiveMediaName = cursor.requireString(ARCHIVE_MEDIA_NAME),
+      archiveMediaId = cursor.requireString(ARCHIVE_MEDIA_ID)
     )
   }
 
@@ -1596,7 +1919,7 @@ class AttachmentTable(
     return readableDatabase
       .select(*PROJECTION)
       .from(TABLE_NAME)
-      .where("$TRANSFER_STATE == $TRANSFER_PROGRESS_DONE AND $REMOTE_LOCATION IS NOT NULL AND $DATA_HASH_END IS NOT NULL")
+      .where("$REMOTE_LOCATION IS NOT NULL AND $REMOTE_KEY IS NOT NULL")
       .orderBy("$ID DESC")
       .limit(30)
       .run()
@@ -1736,4 +2059,44 @@ class AttachmentTable(
       }
     }
   }
+
+  /**
+   * This maintains two different state paths for uploading attachments to the archive.
+   *
+   * The first is the backfill process, which will happen after newly-enabling backups. That process will go:
+   * 1. [NONE]
+   * 2. [BACKFILL_UPLOAD_IN_PROGRESS]
+   * 3. [BACKFILL_UPLOADED]
+   * 4. [FINISHED] or [PERMANENT_FAILURE]
+   *
+   * The second is when newly sending/receiving an attachment after enabling backups. That process will go:
+   * 1. [NONE]
+   * 2. [ATTACHMENT_TRANSFER_PENDING]
+   * 3. [FINISHED] or [PERMANENT_FAILURE]
+   */
+  enum class ArchiveTransferState(val value: Int) {
+    /** Not backed up at all. */
+    NONE(0),
+
+    /** The upload to the attachment service is in progress. */
+    BACKFILL_UPLOAD_IN_PROGRESS(1),
+
+    /** Successfully uploaded to the attachment service during the backfill process. Still need to tell the service to move the file over to the archive service. */
+    BACKFILL_UPLOADED(2),
+
+    /** Completely finished backing up the attachment. */
+    FINISHED(3),
+
+    /** It is impossible to upload this attachment. */
+    PERMANENT_FAILURE(4),
+
+    /** We sent/received this attachment after enabling backups, but still need to transfer the file to the archive service. */
+    ATTACHMENT_TRANSFER_PENDING(5);
+
+    companion object {
+      fun deserialize(value: Int): ArchiveTransferState {
+        return values().firstOrNull { it.value == value } ?: NONE
+      }
+    }
+  }
 }
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 d06e4ea1f6..202d350c49 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/database/CallLinkTable.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/CallLinkTable.kt
@@ -377,7 +377,7 @@ class CallLinkTable(context: Context, databaseHelper: SignalDatabase) : Database
     val statement = """
       SELECT $projection
       FROM $TABLE_NAME
-      WHERE $noCallEvent AND NOT $REVOKED ${searchFilter?.where ?: ""}
+      WHERE $noCallEvent AND NOT $REVOKED ${searchFilter?.where ?: ""} AND $ROOT_KEY IS NOT NULL
       ORDER BY $ID DESC
       $limitOffset
     """.trimIndent()
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 01667d9589..606522606d 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/database/CallTable.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/CallTable.kt
@@ -18,11 +18,13 @@ import org.signal.core.util.readToList
 import org.signal.core.util.readToMap
 import org.signal.core.util.readToSingleLong
 import org.signal.core.util.readToSingleObject
+import org.signal.core.util.requireBoolean
 import org.signal.core.util.requireLong
 import org.signal.core.util.requireNonNullString
 import org.signal.core.util.requireObject
 import org.signal.core.util.requireString
 import org.signal.core.util.select
+import org.signal.core.util.toInt
 import org.signal.core.util.toSingleLine
 import org.signal.core.util.update
 import org.signal.core.util.withinTransaction
@@ -64,6 +66,22 @@ class CallTable(context: Context, databaseHelper: SignalDatabase) : DatabaseTabl
     const val DELETION_TIMESTAMP = "deletion_timestamp"
     const val READ = "read"
 
+    /**
+     * Whether a given call event was joined by the local user
+     *
+     * Used to determine if a group call in the "GENERIC_GROUP_CALL" state is to be
+     * displayed as a missed call in the ui
+     */
+    const val LOCAL_JOINED = "local_joined"
+
+    /**
+     * Whether a given call event is currently considered active.
+     *
+     * Used to determine if a group call in the "GENERIC_GROUP_CALL" state is to be
+     * displayed as a missed call in the ui
+     */
+    const val GROUP_CALL_ACTIVE = "group_call_active"
+
     //language=sql
     const val CREATE_TABLE = """
       CREATE TABLE $TABLE_NAME (
@@ -78,6 +96,8 @@ class CallTable(context: Context, databaseHelper: SignalDatabase) : DatabaseTabl
         $RINGER INTEGER DEFAULT NULL,
         $DELETION_TIMESTAMP INTEGER DEFAULT 0,
         $READ INTEGER DEFAULT 1,
+        $LOCAL_JOINED INTEGER DEFAULT 0,
+        $GROUP_CALL_ACTIVE INTEGER DEFAULT 0,
         UNIQUE ($CALL_ID, $PEER) ON CONFLICT FAIL
       )
     """
@@ -98,6 +118,30 @@ class CallTable(context: Context, databaseHelper: SignalDatabase) : DatabaseTabl
     notifyConversationListListeners()
   }
 
+  fun markAllCallEventsWithPeerBeforeTimestampRead(peer: RecipientId, timestamp: Long): Call? {
+    val latestCallAsOfTimestamp = writableDatabase.withinTransaction { db ->
+      val updated = db.update(TABLE_NAME)
+        .values(READ to ReadState.serialize(ReadState.READ))
+        .where("$PEER = ? AND $TIMESTAMP <= ?", peer.toLong(), timestamp)
+        .run()
+
+      if (updated == 0) {
+        null
+      } else {
+        db.select()
+          .from(TABLE_NAME)
+          .where("$PEER = ? AND $TIMESTAMP <= ?", peer.toLong(), timestamp)
+          .orderBy("$TIMESTAMP DESC")
+          .limit(1)
+          .run()
+          .readToSingleObject(Call.Deserializer)
+      }
+    }
+
+    notifyConversationListListeners()
+    return latestCallAsOfTimestamp
+  }
+
   fun getUnreadMissedCallCount(): Long {
     return readableDatabase
       .count()
@@ -485,6 +529,7 @@ class CallTable(context: Context, databaseHelper: SignalDatabase) : DatabaseTabl
           timestamp,
           "",
           emptyList(),
+          false,
           false
         )
       } else {
@@ -501,7 +546,8 @@ class CallTable(context: Context, databaseHelper: SignalDatabase) : DatabaseTabl
           TYPE to Type.serialize(type),
           DIRECTION to Direction.serialize(direction),
           TIMESTAMP to timestamp,
-          RINGER to ringer
+          RINGER to ringer,
+          LOCAL_JOINED to true
         )
         .run(SQLiteDatabase.CONFLICT_ABORT)
     }
@@ -525,6 +571,7 @@ class CallTable(context: Context, databaseHelper: SignalDatabase) : DatabaseTabl
           timestamp,
           "",
           emptyList(),
+          false,
           false
         )
       } else {
@@ -541,7 +588,8 @@ class CallTable(context: Context, databaseHelper: SignalDatabase) : DatabaseTabl
           TYPE to Type.serialize(type),
           DIRECTION to Direction.serialize(Direction.INCOMING),
           TIMESTAMP to timestamp,
-          RINGER to null
+          RINGER to null,
+          LOCAL_JOINED to false
         )
         .run(SQLiteDatabase.CONFLICT_ABORT)
     }
@@ -618,7 +666,8 @@ class CallTable(context: Context, databaseHelper: SignalDatabase) : DatabaseTabl
           call.messageId,
           peekGroupCallEraId,
           peekJoinedUuids,
-          isCallFull
+          isCallFull,
+          call.event == Event.RINGING
         )
       } else {
         SignalDatabase.messages.insertGroupCall(
@@ -627,16 +676,19 @@ class CallTable(context: Context, databaseHelper: SignalDatabase) : DatabaseTabl
           timestamp,
           peekGroupCallEraId,
           peekJoinedUuids,
-          isCallFull
+          isCallFull,
+          false
         )
       }
 
       insertCallEventFromGroupUpdate(
-        callId,
-        messageId,
-        sender,
-        groupRecipient.id,
-        timestamp
+        callId = callId,
+        messageId = messageId,
+        sender = sender,
+        groupRecipientId = groupRecipient.id,
+        timestamp = timestamp,
+        didLocalUserJoin = peekJoinedUuids.contains(Recipient.self().requireServiceId().rawUuid),
+        isGroupCallActive = peekJoinedUuids.isNotEmpty()
       )
     }
   }
@@ -677,7 +729,9 @@ class CallTable(context: Context, databaseHelper: SignalDatabase) : DatabaseTabl
     messageId: MessageId?,
     sender: RecipientId,
     groupRecipientId: RecipientId,
-    timestamp: Long
+    timestamp: Long,
+    didLocalUserJoin: Boolean,
+    isGroupCallActive: Boolean
   ) {
     if (messageId != null) {
       val call = getCallById(callId, groupRecipientId)
@@ -694,7 +748,9 @@ class CallTable(context: Context, databaseHelper: SignalDatabase) : DatabaseTabl
             TYPE to Type.serialize(Type.GROUP_CALL),
             DIRECTION to Direction.serialize(direction),
             TIMESTAMP to timestamp,
-            RINGER to null
+            RINGER to null,
+            LOCAL_JOINED to didLocalUserJoin,
+            GROUP_CALL_ACTIVE to isGroupCallActive
           )
           .run(SQLiteDatabase.CONFLICT_ABORT)
 
@@ -709,6 +765,8 @@ class CallTable(context: Context, databaseHelper: SignalDatabase) : DatabaseTabl
           setMessageId(callId, messageId)
           Log.d(TAG, "Updated call event message id for newly inserted group call state: $callId")
         }
+
+        updateGroupCallState(call, didLocalUserJoin, isGroupCallActive)
       }
     } else {
       Log.d(TAG, "Skipping call event processing for null era id.")
@@ -718,7 +776,7 @@ class CallTable(context: Context, databaseHelper: SignalDatabase) : DatabaseTabl
   }
 
   /**
-   * Since this does not alter the call table, we can simply pass this directly through to the old handler.
+   * Update necessary call info from peek
    */
   fun updateGroupCallFromPeek(
     threadId: Long,
@@ -727,7 +785,27 @@ class CallTable(context: Context, databaseHelper: SignalDatabase) : DatabaseTabl
     isCallFull: Boolean,
     expiresIn: Long,
   ): Boolean {
-    val sameEraId = SignalDatabase.messages.updatePreviousGroupCall(threadId, peekGroupCallEraId, peekJoinedUuids, isCallFull, expiresIn)
+    val callId = peekGroupCallEraId?.let { CallId.fromEra(it) }
+    val recipientId = SignalDatabase.threads.getRecipientIdForThreadId(threadId)
+    val call = if (callId != null && recipientId != null) {
+      getCallById(callId.longValue(), recipientId)
+    } else {
+      null
+    }
+
+    val sameEraId = SignalDatabase.messages.updatePreviousGroupCall(
+      threadId = threadId,
+      peekGroupCallEraId = peekGroupCallEraId,
+      peekJoinedUuids = peekJoinedUuids,
+      isCallFull = isCallFull,
+      isRingingOnLocalDevice = call?.event == Event.RINGING,
+      expiresIn = expiresIn,
+    )
+
+    if (call != null) {
+      updateGroupCallState(call, peekJoinedUuids)
+    }
+
     ApplicationDependencies.getDatabaseObserver().notifyCallUpdateObservers()
     return sameEraId
   }
@@ -760,6 +838,35 @@ class CallTable(context: Context, databaseHelper: SignalDatabase) : DatabaseTabl
     return call.event != Event.RINGING && call.event != Event.GENERIC_GROUP_CALL
   }
 
+  private fun updateGroupCallState(
+    call: Call,
+    peekJoinedUuids: Collection<UUID>
+  ) {
+    updateGroupCallState(
+      call,
+      peekJoinedUuids.contains(Recipient.self().requireServiceId().rawUuid),
+      peekJoinedUuids.isNotEmpty()
+    )
+  }
+
+  private fun updateGroupCallState(
+    call: Call,
+    hasLocalUserJoined: Boolean,
+    isGroupCallActive: Boolean
+  ) {
+    writableDatabase.update(TABLE_NAME)
+      .values(
+        LOCAL_JOINED to (call.didLocalUserJoin || hasLocalUserJoined),
+        GROUP_CALL_ACTIVE to isGroupCallActive
+      )
+      .where(
+        "$CALL_ID = ? AND $PEER = ?",
+        call.callId,
+        call.peer.toLong()
+      )
+      .run()
+  }
+
   private fun handleGroupRingState(
     ringId: Long,
     groupRecipientId: RecipientId,
@@ -911,7 +1018,8 @@ class CallTable(context: Context, databaseHelper: SignalDatabase) : DatabaseTabl
         timestamp = timestamp,
         eraId = "",
         joinedUuids = emptyList(),
-        isCallFull = false
+        isCallFull = false,
+        isIncomingGroupCallRingingOnLocalDevice = event == Event.RINGING
       )
 
       db
@@ -1092,9 +1200,10 @@ class CallTable(context: Context, databaseHelper: SignalDatabase) : DatabaseTabl
   // endregion
 
   private fun getCallsCursor(isCount: Boolean, offset: Int, limit: Int, searchTerm: String?, filter: CallLogFilter): Cursor {
+    val isMissedGenericGroupCall = "$EVENT = ${Event.serialize(Event.GENERIC_GROUP_CALL)} AND $LOCAL_JOINED = ${false.toInt()} AND $GROUP_CALL_ACTIVE = ${false.toInt()}"
     val filterClause: SqlUtil.Query = when (filter) {
       CallLogFilter.ALL -> SqlUtil.buildQuery("$DELETION_TIMESTAMP = 0")
-      CallLogFilter.MISSED -> SqlUtil.buildQuery("($EVENT = ${Event.serialize(Event.MISSED)} OR $EVENT = ${Event.serialize(Event.MISSED_NOTIFICATION_PROFILE)}) AND $DELETION_TIMESTAMP = 0")
+      CallLogFilter.MISSED -> SqlUtil.buildQuery("($EVENT = ${Event.serialize(Event.MISSED)} OR $EVENT = ${Event.serialize(Event.MISSED_NOTIFICATION_PROFILE)} OR $EVENT = ${Event.serialize(Event.NOT_ACCEPTED)} OR $EVENT = ${Event.serialize(Event.DECLINED)} OR ($isMissedGenericGroupCall)) AND $DELETION_TIMESTAMP = 0")
       CallLogFilter.AD_HOC -> SqlUtil.buildQuery("$TYPE = ${Type.serialize(Type.AD_HOC_CALL)} AND $DELETION_TIMESTAMP = 0")
     }
 
@@ -1130,16 +1239,28 @@ class CallTable(context: Context, databaseHelper: SignalDatabase) : DatabaseTabl
     val projection = if (isCount) {
       "COUNT(*),"
     } else {
-      "p.$ID, p.$TIMESTAMP, $EVENT, $DIRECTION, $PEER, p.$TYPE, $CALL_ID, $MESSAGE_ID, $RINGER, children, in_period, ${MessageTable.BODY},"
+      "p.$ID, p.$TIMESTAMP, $EVENT, $DIRECTION, $PEER, p.$TYPE, $CALL_ID, $MESSAGE_ID, $RINGER, $LOCAL_JOINED, $GROUP_CALL_ACTIVE, children, in_period, ${MessageTable.BODY},"
     }
 
+    // Group call events by those we consider missed or not missed to build out our call log aggregation.
     val eventTypeSubQuery = """
-      ($TABLE_NAME.$EVENT = c.$EVENT AND ($TABLE_NAME.$EVENT = ${Event.serialize(Event.MISSED)} OR $TABLE_NAME.$EVENT = ${Event.serialize(Event.MISSED_NOTIFICATION_PROFILE)})) OR
-      (
+      ($TABLE_NAME.$EVENT = c.$EVENT AND (
+        $TABLE_NAME.$EVENT = ${Event.serialize(Event.MISSED)} OR 
+        $TABLE_NAME.$EVENT = ${Event.serialize(Event.MISSED_NOTIFICATION_PROFILE)} OR
+        $TABLE_NAME.$EVENT = ${Event.serialize(Event.NOT_ACCEPTED)} OR
+        $TABLE_NAME.$EVENT = ${Event.serialize(Event.DECLINED)} OR
+        ($TABLE_NAME.$isMissedGenericGroupCall)
+      )) OR (
         $TABLE_NAME.$EVENT != ${Event.serialize(Event.MISSED)} AND 
         c.$EVENT != ${Event.serialize(Event.MISSED)} AND 
         $TABLE_NAME.$EVENT != ${Event.serialize(Event.MISSED_NOTIFICATION_PROFILE)} AND 
-        c.$EVENT != ${Event.serialize(Event.MISSED_NOTIFICATION_PROFILE)}
+        c.$EVENT != ${Event.serialize(Event.MISSED_NOTIFICATION_PROFILE)} AND
+        $TABLE_NAME.$EVENT != ${Event.serialize(Event.NOT_ACCEPTED)} AND
+        c.$EVENT != ${Event.serialize(Event.NOT_ACCEPTED)} AND
+        $TABLE_NAME.$EVENT != ${Event.serialize(Event.DECLINED)} AND
+        c.$EVENT != ${Event.serialize(Event.DECLINED)} AND
+        (NOT ($TABLE_NAME.$isMissedGenericGroupCall)) AND
+        (NOT (c.$isMissedGenericGroupCall))
       )
       """
 
@@ -1149,6 +1270,8 @@ class CallTable(context: Context, databaseHelper: SignalDatabase) : DatabaseTabl
         LOWER(
           COALESCE(
             NULLIF(${GroupTable.TABLE_NAME}.${GroupTable.TITLE}, ''),
+            NULLIF(${RecipientTable.TABLE_NAME}.${RecipientTable.NICKNAME_JOINED_NAME}, ''),
+            NULLIF(${RecipientTable.TABLE_NAME}.${RecipientTable.NICKNAME_GIVEN_NAME}, ''),
             NULLIF(${RecipientTable.TABLE_NAME}.${RecipientTable.SYSTEM_JOINED_NAME}, ''),
             NULLIF(${RecipientTable.TABLE_NAME}.${RecipientTable.SYSTEM_GIVEN_NAME}, ''),
             NULLIF(${RecipientTable.TABLE_NAME}.${RecipientTable.PROFILE_JOINED_NAME}, ''),
@@ -1159,7 +1282,7 @@ class CallTable(context: Context, databaseHelper: SignalDatabase) : DatabaseTabl
       FROM (
         WITH cte AS (
           SELECT
-            $ID, $TIMESTAMP, $EVENT, $DIRECTION, $PEER, $TYPE, $CALL_ID, $MESSAGE_ID, $RINGER,
+            $ID, $TIMESTAMP, $EVENT, $DIRECTION, $PEER, $TYPE, $CALL_ID, $MESSAGE_ID, $RINGER, $LOCAL_JOINED, $GROUP_CALL_ACTIVE,
             (
               SELECT
                 $ID
@@ -1243,10 +1366,20 @@ class CallTable(context: Context, databaseHelper: SignalDatabase) : DatabaseTabl
   }
 
   fun markRingingCallsAsMissed() {
-    writableDatabase.update(TABLE_NAME)
-      .values(EVENT to Event.serialize(Event.MISSED))
-      .where("$EVENT = ?", Event.serialize(Event.RINGING))
-      .run()
+    writableDatabase.withinTransaction { db ->
+      val messageIds: List<Long> = db.select(MESSAGE_ID)
+        .from(TABLE_NAME)
+        .where("$EVENT = ? AND $MESSAGE_ID != NULL", Event.serialize(Event.RINGING))
+        .run()
+        .readToList { it.requireLong(MESSAGE_ID) }
+
+      db.update(TABLE_NAME)
+        .values(EVENT to Event.serialize(Event.MISSED))
+        .where("$EVENT = ?", Event.serialize(Event.RINGING))
+        .run()
+
+      SignalDatabase.messages.clearIsRingingOnLocalDeviceFlag(messageIds)
+    }
   }
 
   fun getCallsCount(searchTerm: String?, filter: CallLogFilter): Int {
@@ -1306,6 +1439,10 @@ class CallTable(context: Context, databaseHelper: SignalDatabase) : DatabaseTabl
       .run()
   }
 
+  /**
+   * @param isGroupCallActive - Whether the group call currently contains users. Only valid for group calls.
+   * @param didLocalUserJoin   - Determines whether the local user joined this call. Only valid for group calls.
+   */
   data class Call(
     val callId: Long,
     val peer: RecipientId,
@@ -1314,11 +1451,20 @@ class CallTable(context: Context, databaseHelper: SignalDatabase) : DatabaseTabl
     val event: Event,
     val messageId: Long?,
     val timestamp: Long,
-    val ringerRecipient: RecipientId?
+    val ringerRecipient: RecipientId?,
+    val isGroupCallActive: Boolean,
+    val didLocalUserJoin: Boolean
   ) {
     val messageType: Long = getMessageType(type, direction, event)
 
+    val isDisplayedAsMissedCallInUi = isDisplayedAsMissedCallInUi(this)
+
     companion object Deserializer : Serializer<Call, Cursor> {
+
+      private fun isDisplayedAsMissedCallInUi(call: Call): Boolean {
+        return call.direction == Direction.INCOMING && (call.event in Event.DISPLAY_AS_MISSED_CALL || (call.event == Event.GENERIC_GROUP_CALL && !call.didLocalUserJoin && !call.isGroupCallActive))
+      }
+
       fun getMessageType(type: Type, direction: Direction, event: Event): Long {
         if (type == Type.GROUP_CALL || type == Type.AD_HOC_CALL) {
           return MessageTypes.GROUP_CALL_TYPE
@@ -1352,7 +1498,9 @@ class CallTable(context: Context, databaseHelper: SignalDatabase) : DatabaseTabl
             } else {
               null
             }
-          }
+          },
+          isGroupCallActive = data.requireBoolean(GROUP_CALL_ACTIVE),
+          didLocalUserJoin = data.requireBoolean(LOCAL_JOINED)
         )
       }
     }
@@ -1500,6 +1648,14 @@ class CallTable(context: Context, databaseHelper: SignalDatabase) : DatabaseTabl
     }
 
     companion object Serializer : IntSerializer<Event> {
+
+      val DISPLAY_AS_MISSED_CALL = listOf(
+        MISSED,
+        MISSED_NOTIFICATION_PROFILE,
+        DECLINED,
+        NOT_ACCEPTED
+      )
+
       override fun serialize(data: Event): Int = data.code
 
       override fun deserialize(data: Int): Event {
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 30aef7bd34..637e89018b 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/database/GroupTable.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/GroupTable.kt
@@ -56,6 +56,7 @@ import org.whispersystems.signalservice.api.groupsv2.findRequestingByAci
 import org.whispersystems.signalservice.api.groupsv2.toAciList
 import org.whispersystems.signalservice.api.groupsv2.toAciListWithUnknowns
 import org.whispersystems.signalservice.api.messages.SignalServiceAttachmentPointer
+import org.whispersystems.signalservice.api.messages.SignalServiceAttachmentRemoteId
 import org.whispersystems.signalservice.api.push.DistributionId
 import org.whispersystems.signalservice.api.push.ServiceId
 import org.whispersystems.signalservice.api.push.ServiceId.ACI
@@ -711,7 +712,7 @@ class GroupTable(context: Context?, databaseHelper: SignalDatabase?) : DatabaseT
     values.put(MMS, groupId.isMms)
 
     if (avatar != null) {
-      values.put(AVATAR_ID, avatar.remoteId.v2.get())
+      values.put(AVATAR_ID, (avatar.remoteId as SignalServiceAttachmentRemoteId.V2).cdnId)
       values.put(AVATAR_KEY, avatar.key)
       values.put(AVATAR_CONTENT_TYPE, avatar.contentType)
       values.put(AVATAR_DIGEST, avatar.digest.orElse(null))
@@ -777,6 +778,10 @@ class GroupTable(context: Context?, databaseHelper: SignalDatabase?) : DatabaseT
     Recipient.live(groupRecipientId).refresh()
     notifyConversationListListeners()
 
+    if (groupId.isV2) {
+      SignalDatabase.nameCollisions.handleGroupNameCollisions(groupId.requireV2(), members.toSet())
+    }
+
     return true
   }
 
@@ -787,7 +792,7 @@ class GroupTable(context: Context?, databaseHelper: SignalDatabase?) : DatabaseT
       }
 
       if (avatar != null) {
-        put(AVATAR_ID, avatar.remoteId.v2.get())
+        put(AVATAR_ID, (avatar.remoteId as SignalServiceAttachmentRemoteId.V2).cdnId)
         put(AVATAR_CONTENT_TYPE, avatar.contentType)
         put(AVATAR_KEY, avatar.key)
         put(AVATAR_DIGEST, avatar.digest.orElse(null))
@@ -845,7 +850,7 @@ class GroupTable(context: Context?, databaseHelper: SignalDatabase?) : DatabaseT
 
     val groupMembers = getV2GroupMembers(decryptedGroup, true)
 
-    if (existingGroup.isPresent && existingGroup.get().isV2Group) {
+    val addedMembers: List<RecipientId> = if (existingGroup.isPresent && existingGroup.get().isV2Group) {
       val change = GroupChangeReconstruct.reconstructGroupChange(existingGroup.get().requireV2GroupProperties().decryptedGroup, decryptedGroup)
       val removed: List<ServiceId> = DecryptedGroupUtil.removedMembersServiceIdList(change)
 
@@ -862,6 +867,10 @@ class GroupTable(context: Context?, databaseHelper: SignalDatabase?) : DatabaseT
           e164 = null
         )
       }
+
+      change.newMembers.toAciList().toRecipientIds()
+    } else {
+      groupMembers
     }
 
     writableDatabase.withinTransaction { database ->
@@ -884,6 +893,10 @@ class GroupTable(context: Context?, databaseHelper: SignalDatabase?) : DatabaseT
 
     Recipient.live(groupRecipientId).refresh()
     notifyConversationListListeners()
+
+    if (groupId.isV2 && addedMembers.isNotEmpty()) {
+      SignalDatabase.nameCollisions.handleGroupNameCollisions(groupId.requireV2(), addedMembers.toSet())
+    }
   }
 
   fun updateTitle(groupId: GroupId.V1, title: String?) {
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 600a746024..f8fea47e96 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/database/MediaTable.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/MediaTable.kt
@@ -50,6 +50,9 @@ class MediaTable internal constructor(context: Context?, databaseHelper: SignalD
         ${AttachmentTable.TABLE_NAME}.${AttachmentTable.REMOTE_INCREMENTAL_DIGEST}, 
         ${AttachmentTable.TABLE_NAME}.${AttachmentTable.REMOTE_INCREMENTAL_DIGEST_CHUNK_SIZE},
         ${AttachmentTable.TABLE_NAME}.${AttachmentTable.DATA_HASH_END},
+        ${AttachmentTable.TABLE_NAME}.${AttachmentTable.ARCHIVE_CDN},
+        ${AttachmentTable.TABLE_NAME}.${AttachmentTable.ARCHIVE_MEDIA_NAME},
+        ${AttachmentTable.TABLE_NAME}.${AttachmentTable.ARCHIVE_MEDIA_ID},
         ${MessageTable.TABLE_NAME}.${MessageTable.TYPE}, 
         ${MessageTable.TABLE_NAME}.${MessageTable.DATE_SENT}, 
         ${MessageTable.TABLE_NAME}.${MessageTable.DATE_RECEIVED}, 
@@ -94,7 +97,8 @@ class MediaTable internal constructor(context: Context?, databaseHelper: SignalD
       """
         ${AttachmentTable.DATA_FILE} IS NOT NULL AND
         ${AttachmentTable.CONTENT_TYPE} NOT LIKE 'image/svg%' AND 
-        (${AttachmentTable.CONTENT_TYPE} LIKE 'image/%' OR ${AttachmentTable.CONTENT_TYPE} LIKE 'video/%')
+        (${AttachmentTable.CONTENT_TYPE} LIKE 'image/%' OR ${AttachmentTable.CONTENT_TYPE} LIKE 'video/%') AND
+        ${MessageTable.LINK_PREVIEWS} IS NULL
       """
     )
 
@@ -103,7 +107,8 @@ class MediaTable internal constructor(context: Context?, databaseHelper: SignalD
       """
         (${AttachmentTable.DATA_FILE} IS NOT NULL OR (${AttachmentTable.CONTENT_TYPE} LIKE 'video/%' AND ${AttachmentTable.REMOTE_INCREMENTAL_DIGEST} IS NOT NULL)) AND
         ${AttachmentTable.CONTENT_TYPE} NOT LIKE 'image/svg%' AND 
-        (${AttachmentTable.CONTENT_TYPE} LIKE 'image/%' OR ${AttachmentTable.CONTENT_TYPE} LIKE 'video/%')
+        (${AttachmentTable.CONTENT_TYPE} LIKE 'image/%' OR ${AttachmentTable.CONTENT_TYPE} LIKE 'video/%') AND
+        ${MessageTable.LINK_PREVIEWS} IS NULL
       """
     )
 
@@ -115,7 +120,14 @@ class MediaTable internal constructor(context: Context?, databaseHelper: SignalD
       """
     )
 
-    private val ALL_MEDIA_QUERY = String.format(BASE_MEDIA_QUERY, "${AttachmentTable.DATA_FILE} IS NOT NULL AND ${AttachmentTable.CONTENT_TYPE} NOT LIKE 'text/x-signal-plain'")
+    private val ALL_MEDIA_QUERY = String.format(
+      BASE_MEDIA_QUERY,
+      """
+        ${AttachmentTable.DATA_FILE} IS NOT NULL AND
+        ${AttachmentTable.CONTENT_TYPE} NOT LIKE 'text/x-signal-plain' AND
+        ${MessageTable.LINK_PREVIEWS} IS NULL
+      """
+    )
 
     private val DOCUMENT_MEDIA_QUERY = String.format(
       BASE_MEDIA_QUERY,
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 0bb0be82f6..12870f9fc4 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/database/MessageTable.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/MessageTable.kt
@@ -376,7 +376,11 @@ open class MessageTable(context: Context?, databaseHelper: SignalDatabase) : Dat
             '${AttachmentTable.BLUR_HASH}', ${AttachmentTable.TABLE_NAME}.${AttachmentTable.BLUR_HASH},
             '${AttachmentTable.TRANSFORM_PROPERTIES}', ${AttachmentTable.TABLE_NAME}.${AttachmentTable.TRANSFORM_PROPERTIES},
             '${AttachmentTable.DISPLAY_ORDER}', ${AttachmentTable.TABLE_NAME}.${AttachmentTable.DISPLAY_ORDER},
-            '${AttachmentTable.UPLOAD_TIMESTAMP}', ${AttachmentTable.TABLE_NAME}.${AttachmentTable.UPLOAD_TIMESTAMP}
+            '${AttachmentTable.UPLOAD_TIMESTAMP}', ${AttachmentTable.TABLE_NAME}.${AttachmentTable.UPLOAD_TIMESTAMP},
+            '${AttachmentTable.DATA_HASH_END}', ${AttachmentTable.TABLE_NAME}.${AttachmentTable.DATA_HASH_END},
+            '${AttachmentTable.ARCHIVE_CDN}', ${AttachmentTable.TABLE_NAME}.${AttachmentTable.ARCHIVE_CDN},
+            '${AttachmentTable.ARCHIVE_MEDIA_NAME}', ${AttachmentTable.TABLE_NAME}.${AttachmentTable.ARCHIVE_MEDIA_NAME},
+            '${AttachmentTable.ARCHIVE_MEDIA_ID}', ${AttachmentTable.TABLE_NAME}.${AttachmentTable.ARCHIVE_MEDIA_ID}
           )
         ) AS ${AttachmentTable.ATTACHMENT_JSON_ALIAS}
       """.toSingleLine()
@@ -429,6 +433,12 @@ open class MessageTable(context: Context?, databaseHelper: SignalDatabase) : Dat
       ($TYPE = ${MessageTypes.GROUP_CALL_TYPE})
     )"""
 
+    private const val IS_MISSED_CALL_TYPE_CLAUSE = """(
+      ($TYPE = ${MessageTypes.MISSED_AUDIO_CALL_TYPE})
+      OR
+      ($TYPE = ${MessageTypes.MISSED_VIDEO_CALL_TYPE})
+    )"""
+
     private val outgoingTypeClause: String by lazy {
       MessageTypes.OUTGOING_MESSAGE_TYPES
         .map { "($TABLE_NAME.$TYPE & ${MessageTypes.BASE_TYPE_MASK} = $it)" }
@@ -825,7 +835,8 @@ open class MessageTable(context: Context?, databaseHelper: SignalDatabase) : Dat
     timestamp: Long,
     eraId: String,
     joinedUuids: Collection<UUID>,
-    isCallFull: Boolean
+    isCallFull: Boolean,
+    isIncomingGroupCallRingingOnLocalDevice: Boolean
   ): MessageId {
     val recipient = Recipient.resolved(groupRecipientId)
     val threadId = threads.getOrCreateThreadIdFor(recipient)
@@ -837,7 +848,9 @@ open class MessageTable(context: Context?, databaseHelper: SignalDatabase) : Dat
         startedCallUuid = Recipient.resolved(sender).requireServiceId().toString(),
         startedCallTimestamp = timestamp,
         inCallUuids = joinedUuids.map { it.toString() },
-        isCallFull = isCallFull
+        isCallFull = isCallFull,
+        localUserJoined = joinedUuids.contains(Recipient.self().requireServiceId().rawUuid),
+        isRingingOnLocalDevice = isIncomingGroupCallRingingOnLocalDevice
       ).encode()
 
       val values = contentValuesOf(
@@ -890,11 +903,46 @@ open class MessageTable(context: Context?, databaseHelper: SignalDatabase) : Dat
     }
   }
 
+  /**
+   * Clears the flag in GroupCallUpdateDetailsUtil that specifies that the call is ringing on the local device.
+   * Called when cleaning up the call ringing state (which can get out of sync in the case of an application crash)
+   */
+  fun clearIsRingingOnLocalDeviceFlag(messageIds: Collection<Long>) {
+    writableDatabase.withinTransaction { db ->
+      val queries = SqlUtil.buildCollectionQuery(ID, messageIds)
+
+      for (query in queries) {
+        val messageIdBodyPairs = db.select(ID, BODY)
+          .from(TABLE_NAME)
+          .where(query.where, query.whereArgs)
+          .run()
+          .readToList { cursor ->
+            cursor.requireLong(ID) to cursor.requireString(BODY)
+          }
+
+        for ((messageId, body) in messageIdBodyPairs) {
+          val oldBody = GroupCallUpdateDetailsUtil.parse(body)
+          if (!oldBody.isRingingOnLocalDevice) {
+            continue
+          }
+
+          val newBody = GroupCallUpdateDetailsUtil.createUpdatedBody(oldBody, oldBody.inCallUuids, oldBody.isCallFull, false)
+
+          db.update(TABLE_NAME)
+            .values(BODY to newBody)
+            .where(ID_WHERE, messageId)
+            .run()
+        }
+      }
+    }
+  }
+
   fun updateGroupCall(
     messageId: Long,
     eraId: String,
     joinedUuids: Collection<UUID>,
-    isCallFull: Boolean
+    isCallFull: Boolean,
+    isRingingOnLocalDevice: Boolean
   ): MessageId {
     writableDatabase.withinTransaction { db ->
       val message = try {
@@ -908,7 +956,7 @@ open class MessageTable(context: Context?, databaseHelper: SignalDatabase) : Dat
       val sameEraId = updateDetail.eraId == eraId && !Util.isEmpty(eraId)
       val inCallUuids = if (sameEraId) joinedUuids.map { it.toString() } else emptyList()
       val contentValues = contentValuesOf(
-        BODY to GroupCallUpdateDetailsUtil.createUpdatedBody(updateDetail, inCallUuids, isCallFull)
+        BODY to GroupCallUpdateDetailsUtil.createUpdatedBody(updateDetail, inCallUuids, isCallFull, isRingingOnLocalDevice)
       )
 
       if (sameEraId && containsSelf) {
@@ -926,7 +974,14 @@ open class MessageTable(context: Context?, databaseHelper: SignalDatabase) : Dat
     return MessageId(messageId)
   }
 
-  fun updatePreviousGroupCall(threadId: Long, peekGroupCallEraId: String?, peekJoinedUuids: Collection<UUID>, isCallFull: Boolean, expiresIn: Long): Boolean {
+  fun updatePreviousGroupCall(
+    threadId: Long,
+    peekGroupCallEraId: String?,
+    peekJoinedUuids: Collection<UUID>,
+    isCallFull: Boolean,
+    isRingingOnLocalDevice: Boolean,
+    expiresIn: Long,
+  ): Boolean {
     return writableDatabase.withinTransaction { db ->
       val cursor = db
         .select(*MMS_PROJECTION)
@@ -949,7 +1004,7 @@ open class MessageTable(context: Context?, databaseHelper: SignalDatabase) : Dat
         }
 
         val contentValues = contentValuesOf(
-          BODY to GroupCallUpdateDetailsUtil.createUpdatedBody(groupCallUpdateDetails, inCallUuids, isCallFull)
+          BODY to GroupCallUpdateDetailsUtil.createUpdatedBody(groupCallUpdateDetails, inCallUuids, isCallFull, isRingingOnLocalDevice)
         )
 
         if (inCallUuids.isEmpty()) {
@@ -1035,6 +1090,10 @@ open class MessageTable(context: Context?, databaseHelper: SignalDatabase) : Dat
           notifyConversationListeners(threadId)
           TrimThreadJob.enqueueAsync(threadId)
         }
+
+      groupRecords.filter { it.isV2Group }.forEach {
+        SignalDatabase.nameCollisions.handleGroupNameCollisions(it.id.requireV2(), setOf(recipient.id))
+      }
     }
   }
 
@@ -4609,7 +4668,19 @@ open class MessageTable(context: Context?, databaseHelper: SignalDatabase) : Dat
     return readableDatabase
       .select(*MMS_PROJECTION)
       .from(TABLE_NAME)
-      .where("$NOTIFIED = 0 AND $STORY_TYPE = 0 AND $LATEST_REVISION_ID IS NULL AND ($READ = 0 OR $REACTIONS_UNREAD = 1 ${if (stickyQuery.isNotEmpty()) "OR ($stickyQuery)" else ""})")
+      .where(
+        """
+        $NOTIFIED = 0 
+        AND $STORY_TYPE = 0 
+        AND $LATEST_REVISION_ID IS NULL 
+        AND (
+          $READ = 0 
+          OR $REACTIONS_UNREAD = 1 
+          ${if (stickyQuery.isNotEmpty()) "OR ($stickyQuery)" else ""}
+          OR ($IS_MISSED_CALL_TYPE_CLAUSE AND EXISTS (SELECT 1 FROM ${CallTable.TABLE_NAME} WHERE ${CallTable.MESSAGE_ID} = $TABLE_NAME.$ID AND ${CallTable.EVENT} = ${CallTable.Event.serialize(CallTable.Event.MISSED)} AND ${CallTable.READ} = 0)) 
+        )
+        """.trimIndent()
+      )
       .orderBy("$DATE_RECEIVED ASC")
       .run()
   }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/NameCollisionTables.kt b/app/src/main/java/org/thoughtcrime/securesms/database/NameCollisionTables.kt
new file mode 100644
index 0000000000..4430eae814
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/NameCollisionTables.kt
@@ -0,0 +1,475 @@
+/*
+ * Copyright 2024 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.thoughtcrime.securesms.database
+
+import android.content.Context
+import androidx.annotation.WorkerThread
+import androidx.core.content.contentValuesOf
+import net.zetetic.database.sqlcipher.SQLiteDatabase
+import org.signal.core.util.Base64
+import org.signal.core.util.Hex
+import org.signal.core.util.SqlUtil
+import org.signal.core.util.delete
+import org.signal.core.util.exists
+import org.signal.core.util.insertInto
+import org.signal.core.util.orNull
+import org.signal.core.util.readToList
+import org.signal.core.util.readToSet
+import org.signal.core.util.readToSingleLong
+import org.signal.core.util.readToSingleObject
+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.requireString
+import org.signal.core.util.select
+import org.signal.core.util.toInt
+import org.signal.core.util.update
+import org.signal.core.util.withinTransaction
+import org.thoughtcrime.securesms.database.model.MessageRecord
+import org.thoughtcrime.securesms.database.model.databaseprotos.ProfileChangeDetails
+import org.thoughtcrime.securesms.groups.GroupId
+import org.thoughtcrime.securesms.groups.GroupId.V2
+import org.thoughtcrime.securesms.profiles.spoofing.ReviewRecipient
+import org.thoughtcrime.securesms.recipients.Recipient
+import org.thoughtcrime.securesms.recipients.RecipientId
+import java.io.IOException
+import java.security.MessageDigest
+import java.security.NoSuchAlgorithmException
+import kotlin.time.Duration.Companion.days
+
+/**
+ * Tables to help manage the state of name collisions.
+ */
+class NameCollisionTables(
+  context: Context,
+  database: SignalDatabase
+) : DatabaseTable(context, database) {
+
+  companion object {
+    private const val ID = "_id"
+
+    private val PROFILE_CHANGE_TIMEOUT = 1.days
+
+    fun createTables(db: SQLiteDatabase) {
+      db.execSQL(NameCollisionTable.CREATE_TABLE)
+      db.execSQL(NameCollisionMembershipTable.CREATE_TABLE)
+    }
+
+    fun createIndexes(db: SQLiteDatabase) {
+      NameCollisionMembershipTable.CREATE_INDEXES.forEach {
+        db.execSQL(it)
+      }
+    }
+  }
+
+  /**
+   * Represents a detected name collision which can involve one or more recipients.
+   */
+  private object NameCollisionTable {
+    const val TABLE_NAME = "name_collision"
+
+    /**
+     * The thread id of the conversation to display this collision for.
+     */
+    const val THREAD_ID = "thread_id"
+
+    /**
+     * Whether the user has manually dismissed the collision.
+     */
+    const val DISMISSED = "dismissed"
+
+    /**
+     * The hash representing the latest known display name state.
+     */
+    const val HASH = "hash"
+
+    const val CREATE_TABLE = """
+      CREATE TABLE $TABLE_NAME (
+        $ID INTEGER PRIMARY KEY AUTOINCREMENT,
+        $THREAD_ID INTEGER UNIQUE NOT NULL,
+        $DISMISSED INTEGER DEFAULT 0,
+        $HASH STRING DEFAULT NULL
+      )
+    """
+  }
+
+  /**
+   * Represents a recipient who is involved in a name collision.
+   */
+  private object NameCollisionMembershipTable {
+    const val TABLE_NAME = "name_collision_membership"
+
+    /**
+     * FK Reference to a name_collision
+     */
+    const val COLLISION_ID = "collision_id"
+
+    /**
+     * FK Reference to the recipient involved
+     */
+    const val RECIPIENT_ID = "recipient_id"
+
+    /**
+     * Proto containing group profile change details. Only present for entries tied to group collisions.
+     */
+    const val PROFILE_CHANGE_DETAILS = "profile_change_details"
+
+    const val CREATE_TABLE = """
+      CREATE TABLE $TABLE_NAME (
+        $ID INTEGER PRIMARY KEY AUTOINCREMENT,
+        $COLLISION_ID INTEGER NOT NULL REFERENCES ${NameCollisionTable.TABLE_NAME} ($ID) ON DELETE CASCADE,
+        $RECIPIENT_ID INTEGER NOT NULL REFERENCES ${RecipientTable.TABLE_NAME} ($ID) ON DELETE CASCADE,
+        $PROFILE_CHANGE_DETAILS BLOB DEFAULT NULL,
+        UNIQUE ($COLLISION_ID, $RECIPIENT_ID)
+      )
+    """
+
+    val CREATE_INDEXES = arrayOf(
+      "CREATE INDEX name_collision_membership_collision_id_index ON $TABLE_NAME ($COLLISION_ID)",
+      "CREATE INDEX name_collision_membership_recipient_id_index ON $TABLE_NAME ($RECIPIENT_ID)"
+    )
+  }
+
+  /**
+   * Marks the relevant collisions dismissed according to the given thread recipient.
+   */
+  @WorkerThread
+  fun markCollisionsForThreadRecipientDismissed(threadRecipientId: RecipientId) {
+    writableDatabase.withinTransaction { db ->
+      val threadId = SignalDatabase.threads.getThreadIdFor(threadRecipientId) ?: return@withinTransaction
+
+      db.update(NameCollisionTable.TABLE_NAME)
+        .values(NameCollisionTable.DISMISSED to 1)
+        .where("${NameCollisionTable.THREAD_ID} = ?", threadId)
+        .run()
+    }
+  }
+
+  /**
+   * @return A flattened list of similar recipients.
+   */
+  @WorkerThread
+  fun getCollisionsForThreadRecipientId(recipientId: RecipientId): List<ReviewRecipient> {
+    val threadId = SignalDatabase.threads.getThreadIdFor(recipientId) ?: return emptyList()
+    val collisionId = readableDatabase
+      .select(ID)
+      .from(NameCollisionTable.TABLE_NAME)
+      .where("${NameCollisionTable.THREAD_ID} = ? AND ${NameCollisionTable.DISMISSED} = 0", threadId)
+      .run()
+      .readToSingleLong()
+
+    if (collisionId <= 0) {
+      return emptyList()
+    }
+
+    val collisions = readableDatabase
+      .select()
+      .from(NameCollisionMembershipTable.TABLE_NAME)
+      .where("${NameCollisionMembershipTable.COLLISION_ID} = ?", collisionId)
+      .run()
+      .readToList { cursor ->
+        ReviewRecipient(
+          Recipient.resolved(RecipientId.from(cursor.requireLong(NameCollisionMembershipTable.RECIPIENT_ID))),
+          cursor.requireBlob(NameCollisionMembershipTable.PROFILE_CHANGE_DETAILS)?.let { ProfileChangeDetails.ADAPTER.decode(it) }
+        )
+      }.toMutableList()
+
+    val groups = collisions.groupBy { SqlUtil.buildCaseInsensitiveGlobPattern(it.recipient.getDisplayName(context)) }
+    val toDelete: List<ReviewRecipient> = groups.values.filter { it.size < 2 }.flatten()
+    val toReturn: List<ReviewRecipient> = groups.values.filter { it.size >= 2 }.flatten()
+
+    if (toDelete.isNotEmpty()) {
+      writableDatabase.withinTransaction { db ->
+        val queries = SqlUtil.buildCollectionQuery(
+          column = NameCollisionMembershipTable.RECIPIENT_ID,
+          values = toDelete.map { it.recipient.id }
+        )
+
+        for (query in queries) {
+          db.delete(NameCollisionMembershipTable.TABLE_NAME)
+            .where("${NameCollisionMembershipTable.COLLISION_ID} = ? AND ${query.where}", SqlUtil.appendArgs(arrayOf(collisionId.toString()), query.whereArgs))
+            .run()
+        }
+
+        pruneCollisions()
+      }
+    }
+
+    return toReturn
+  }
+
+  /**
+   * Update the collision *only* for the given individual.
+   */
+  @WorkerThread
+  fun handleIndividualNameCollision(recipientId: RecipientId) {
+    writableDatabase.withinTransaction { db ->
+      val similarRecipients = SignalDatabase.recipients.getSimilarRecipientIds(Recipient.resolved(recipientId))
+
+      db.delete(NameCollisionMembershipTable.TABLE_NAME)
+        .where("${NameCollisionMembershipTable.RECIPIENT_ID} = ?", recipientId)
+        .run()
+
+      if (similarRecipients.size == 1) {
+        val threadId = SignalDatabase.threads.getThreadIdFor(recipientId) ?: -1
+        if (threadId > 0L) {
+          db.delete(NameCollisionTable.TABLE_NAME)
+            .where("${NameCollisionTable.THREAD_ID} = ?", threadId)
+            .run()
+        }
+      }
+
+      similarRecipients.forEach { threadRecipientId ->
+        handleNameCollisions(
+          threadRecipientId = threadRecipientId,
+          getCollisionRecipients = {
+            val recipients = Recipient.resolvedList(similarRecipients)
+
+            recipients.map { ReviewRecipient(it) }.toSet()
+          }
+        )
+      }
+
+      pruneCollisions()
+    }
+  }
+
+  /**
+   * Update the collisions for the given group
+   */
+  @WorkerThread
+  fun handleGroupNameCollisions(groupId: GroupId.V2, changed: Set<RecipientId>) {
+    writableDatabase.withinTransaction {
+      val threadRecipientId = SignalDatabase.recipients.getByGroupId(groupId).orNull() ?: return@withinTransaction
+      handleNameCollisions(
+        threadRecipientId = threadRecipientId,
+        getCollisionRecipients = { getDuplicatedGroupRecipients(groupId, changed).toSet() }
+      )
+
+      pruneCollisions()
+    }
+  }
+
+  private fun handleNameCollisions(
+    threadRecipientId: RecipientId,
+    getCollisionRecipients: () -> Set<ReviewRecipient>
+  ) {
+    check(writableDatabase.inTransaction())
+
+    val resolved = Recipient.resolved(threadRecipientId)
+    val collisionRecipients: Set<ReviewRecipient> = getCollisionRecipients()
+
+    if (collisionRecipients.size < 2 && !collisionExists(threadRecipientId)) {
+      return
+    }
+
+    val collision: NameCollision = getOrCreateCollision(resolved)
+    val hash: String = calculateHash(collisionRecipients)
+
+    updateCollision(
+      collision.copy(
+        members = collisionRecipients,
+        hash = hash,
+        dismissed = if (!collision.dismissed) false else collision.hash == hash
+      )
+    )
+  }
+
+  private fun collisionExists(threadRecipientId: RecipientId): Boolean {
+    val threadId = SignalDatabase.threads.getThreadIdFor(threadRecipientId) ?: return false
+    return writableDatabase
+      .exists(NameCollisionTable.TABLE_NAME)
+      .where("${NameCollisionTable.THREAD_ID} = ?", threadId)
+      .run()
+  }
+
+  private fun getOrCreateCollision(threadRecipient: Recipient): NameCollision {
+    check(writableDatabase.inTransaction())
+    val threadId = SignalDatabase.threads.getOrCreateThreadIdFor(threadRecipient)
+
+    val collision = writableDatabase
+      .select()
+      .from(NameCollisionTable.TABLE_NAME)
+      .where("${NameCollisionTable.THREAD_ID} = ?", threadId)
+      .run()
+      .readToSingleObject { nameCollisionCursor ->
+        NameCollision(
+          id = nameCollisionCursor.requireLong(ID),
+          threadId = threadId,
+          members = writableDatabase
+            .select(NameCollisionMembershipTable.RECIPIENT_ID, NameCollisionMembershipTable.PROFILE_CHANGE_DETAILS)
+            .from(NameCollisionMembershipTable.TABLE_NAME)
+            .where("${NameCollisionMembershipTable.COLLISION_ID} = ?", nameCollisionCursor.requireInt(ID))
+            .run()
+            .readToSet {
+              val id = RecipientId.from(it.requireLong(NameCollisionMembershipTable.RECIPIENT_ID))
+              val rawProfileChangeDetails = it.requireBlob(NameCollisionMembershipTable.PROFILE_CHANGE_DETAILS)
+              val profileChangeDetails = if (rawProfileChangeDetails != null) {
+                ProfileChangeDetails.ADAPTER.decode(rawProfileChangeDetails)
+              } else {
+                null
+              }
+
+              ReviewRecipient(
+                Recipient.resolved(id),
+                profileChangeDetails
+              )
+            },
+          dismissed = nameCollisionCursor.requireBoolean(NameCollisionTable.DISMISSED),
+          hash = nameCollisionCursor.requireString(NameCollisionTable.HASH) ?: ""
+        )
+      }
+
+    return if (collision == null) {
+      val rowId = writableDatabase
+        .insertInto(NameCollisionTable.TABLE_NAME)
+        .values(
+          contentValuesOf(
+            NameCollisionTable.THREAD_ID to threadId,
+            NameCollisionTable.DISMISSED to 0,
+            NameCollisionTable.HASH to null
+          )
+        )
+        .run()
+
+      NameCollision(id = rowId, threadId = threadId, members = emptySet(), dismissed = false, hash = "")
+    } else {
+      collision
+    }
+  }
+
+  private fun updateCollision(collision: NameCollision) {
+    check(writableDatabase.inTransaction())
+
+    writableDatabase
+      .update(NameCollisionTable.TABLE_NAME)
+      .values(
+        contentValuesOf(
+          NameCollisionTable.DISMISSED to collision.dismissed.toInt(),
+          NameCollisionTable.THREAD_ID to collision.threadId,
+          NameCollisionTable.HASH to collision.hash
+        )
+      )
+      .where("$ID = ?", collision.id)
+      .run()
+
+    writableDatabase
+      .delete(NameCollisionMembershipTable.TABLE_NAME)
+      .where("${NameCollisionMembershipTable.COLLISION_ID} = ?")
+      .run()
+
+    if (collision.members.size < 2) {
+      return
+    }
+
+    collision.members.forEach { member ->
+      writableDatabase
+        .insertInto(NameCollisionMembershipTable.TABLE_NAME)
+        .values(
+          NameCollisionMembershipTable.RECIPIENT_ID to member.recipient.id.toLong(),
+          NameCollisionMembershipTable.COLLISION_ID to collision.id,
+          NameCollisionMembershipTable.PROFILE_CHANGE_DETAILS to member.profileChangeDetails?.encode()
+        )
+        .run(conflictStrategy = org.thoughtcrime.securesms.database.SQLiteDatabase.CONFLICT_IGNORE)
+    }
+  }
+
+  private fun calculateHash(collisionRecipients: Set<ReviewRecipient>): String {
+    if (collisionRecipients.isEmpty()) {
+      return ""
+    }
+
+    return try {
+      val digest = MessageDigest.getInstance("MD5")
+      val names = collisionRecipients.map { it.recipient.getDisplayName(context) }
+      names.forEach { digest.update(it.encodeToByteArray()) }
+      Hex.toStringCondensed(digest.digest())
+    } catch (e: NoSuchAlgorithmException) {
+      ""
+    }
+  }
+
+  /**
+   * Remove any collision for which there is only a single member.
+   */
+  private fun pruneCollisions() {
+    check(writableDatabase.inTransaction())
+
+    writableDatabase.execSQL(
+      """
+      DELETE FROM ${NameCollisionTable.TABLE_NAME}
+      WHERE ${NameCollisionTable.TABLE_NAME}.$ID IN (
+          SELECT ${NameCollisionMembershipTable.COLLISION_ID}
+          FROM ${NameCollisionMembershipTable.TABLE_NAME}
+          GROUP BY ${NameCollisionMembershipTable.COLLISION_ID}
+          HAVING COUNT($ID) < 2
+      )
+      """.trimIndent()
+    )
+  }
+
+  private fun getDuplicatedGroupRecipients(groupId: V2, toCheck: Set<RecipientId>): List<ReviewRecipient> {
+    if (toCheck.isEmpty()) {
+      return emptyList()
+    }
+
+    val profileChangeRecords: Map<RecipientId, MessageRecord> = getProfileChangeRecordsForGroup(groupId).associateBy { it.fromRecipient.id }
+    val members: MutableList<Recipient> = SignalDatabase.groups.getGroupMembers(groupId, GroupTable.MemberSet.FULL_MEMBERS_INCLUDING_SELF).toMutableList()
+    val changed: List<ReviewRecipient> = Recipient.resolvedList(toCheck)
+      .map { recipient -> ReviewRecipient(recipient.resolve(), profileChangeRecords[recipient.id]?.let { getProfileChangeDetails(it) }) }
+      .filter { !it.recipient.isSystemContact && it.recipient.nickname.isEmpty }
+
+    val results = mutableListOf<ReviewRecipient>()
+
+    for (reviewRecipient in changed) {
+      if (results.contains(reviewRecipient)) {
+        continue
+      }
+
+      members.remove(reviewRecipient.recipient)
+
+      for (member in members) {
+        if (member.getDisplayName(context) == reviewRecipient.recipient.getDisplayName(context)) {
+          results.add(reviewRecipient)
+          results.add(ReviewRecipient(member))
+        }
+      }
+    }
+
+    return results
+  }
+
+  private fun getProfileChangeRecordsForGroup(groupId: V2): List<MessageRecord> {
+    val groupRecipientId = SignalDatabase.recipients.getByGroupId(groupId).get()
+    val groupThreadId = SignalDatabase.threads.getThreadIdFor(groupRecipientId)
+
+    return if (groupThreadId == null) {
+      emptyList()
+    } else {
+      SignalDatabase.messages.getProfileChangeDetailsRecords(
+        groupThreadId,
+        System.currentTimeMillis() - PROFILE_CHANGE_TIMEOUT.inWholeMilliseconds
+      )
+    }
+  }
+
+  private fun getProfileChangeDetails(record: MessageRecord): ProfileChangeDetails {
+    try {
+      return ProfileChangeDetails.ADAPTER.decode(Base64.decode(record.body))
+    } catch (e: IOException) {
+      throw IllegalArgumentException(e)
+    }
+  }
+
+  private data class NameCollision(
+    val id: Long,
+    val threadId: Long,
+    val members: Set<ReviewRecipient>,
+    val dismissed: Boolean,
+    val hash: String
+  )
+}
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 f202a38de8..f9daa1dd99 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/database/RecipientTable.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/RecipientTable.kt
@@ -85,6 +85,7 @@ import org.thoughtcrime.securesms.keyvalue.SignalStore
 import org.thoughtcrime.securesms.profiles.ProfileName
 import org.thoughtcrime.securesms.recipients.Recipient
 import org.thoughtcrime.securesms.recipients.RecipientId
+import org.thoughtcrime.securesms.recipients.RecipientUtil
 import org.thoughtcrime.securesms.service.webrtc.links.CallLinkRoomId
 import org.thoughtcrime.securesms.storage.StorageRecordUpdate
 import org.thoughtcrime.securesms.storage.StorageSyncHelper
@@ -1713,9 +1714,20 @@ open class RecipientTable(context: Context, databaseHelper: SignalDatabase) : Da
   }
 
   fun getSimilarRecipientIds(recipient: Recipient): List<RecipientId> {
-    val projection = SqlUtil.buildArgs(ID, "COALESCE(NULLIF($SYSTEM_JOINED_NAME, ''), NULLIF($PROFILE_JOINED_NAME, '')) AS checked_name")
-    val where = "checked_name = ? AND $HIDDEN = ?"
-    val arguments = SqlUtil.buildArgs(recipient.profileName.toString(), 0)
+    if (!recipient.nickname.isEmpty || recipient.isSystemContact) {
+      return emptyList()
+    }
+
+    val threadId = threads.getThreadIdFor(recipient.id)
+    val isMessageRequestAccepted = RecipientUtil.isMessageRequestAccepted(threadId, recipient)
+    if (isMessageRequestAccepted) {
+      return emptyList()
+    }
+
+    val glob = SqlUtil.buildCaseInsensitiveGlobPattern(recipient.profileName.toString())
+    val projection = SqlUtil.buildArgs(ID, "COALESCE(NULLIF($NICKNAME_JOINED_NAME, ''), NULLIF($SYSTEM_JOINED_NAME, ''), NULLIF($PROFILE_JOINED_NAME, '')) AS checked_name")
+    val where = "checked_name GLOB ? AND $HIDDEN = ? AND $BLOCKED = ?"
+    val arguments = SqlUtil.buildArgs(glob, 0, 0)
 
     readableDatabase.query(TABLE_NAME, projection, where, arguments, null, null, null).use { cursor ->
       if (cursor == null || cursor.count == 0) {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/RemappedRecordTables.kt b/app/src/main/java/org/thoughtcrime/securesms/database/RemappedRecordTables.kt
index 3859c9761b..1eb4bc806c 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/database/RemappedRecordTables.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/RemappedRecordTables.kt
@@ -3,6 +3,7 @@ package org.thoughtcrime.securesms.database
 import android.content.Context
 import android.database.Cursor
 import androidx.core.content.contentValuesOf
+import org.signal.core.util.delete
 import org.signal.core.util.logging.Log
 import org.signal.core.util.readToList
 import org.signal.core.util.requireLong
@@ -30,7 +31,7 @@ class RemappedRecordTables internal constructor(context: Context?, databaseHelpe
     const val NEW_ID = "new_id"
   }
 
-  private object Recipients {
+  object Recipients {
     const val TABLE_NAME = "remapped_recipients"
     const val CREATE_TABLE = """
       CREATE TABLE $TABLE_NAME (
@@ -41,7 +42,7 @@ class RemappedRecordTables internal constructor(context: Context?, databaseHelpe
     """
   }
 
-  private object Threads {
+  object Threads {
     const val TABLE_NAME = "remapped_threads"
     const val CREATE_TABLE = """
       CREATE TABLE $TABLE_NAME (
@@ -56,6 +57,9 @@ class RemappedRecordTables internal constructor(context: Context?, databaseHelpe
     val recipientMap: MutableMap<RecipientId, RecipientId> = HashMap()
 
     readableDatabase.withinTransaction { db ->
+      trimInvalidRecipientEntries(db)
+      trimInvalidThreadEntries(db)
+
       val mappings = getAllMappings(db, Recipients.TABLE_NAME)
       for (mapping in mappings) {
         val oldId = RecipientId.from(mapping.oldId)
@@ -102,6 +106,32 @@ class RemappedRecordTables internal constructor(context: Context?, databaseHelpe
       .run()
   }
 
+  fun deleteThreadMapping(oldId: Long) {
+    writableDatabase.delete(Threads.TABLE_NAME)
+      .where("$OLD_ID = ?", oldId)
+      .run()
+  }
+
+  private fun trimInvalidRecipientEntries(db: SQLiteDatabase) {
+    val count = db.delete(Recipients.TABLE_NAME)
+      .where("$OLD_ID IN (SELECT $ID FROM ${RecipientTable.TABLE_NAME})")
+      .run()
+
+    if (count > 0) {
+      Log.w(TAG, "Trimmed $count invalid recipient entries.", true)
+    }
+  }
+
+  private fun trimInvalidThreadEntries(db: SQLiteDatabase) {
+    val count = db.delete(Threads.TABLE_NAME)
+      .where("$OLD_ID IN (SELECT $ID FROM ${ThreadTable.TABLE_NAME})")
+      .run()
+
+    if (count > 0) {
+      Log.w(TAG, "Trimmed $count invalid thread entries.", true)
+    }
+  }
+
   private fun getAllMappings(db: SQLiteDatabase, table: String): List<Mapping> {
     return db.select()
       .from(table)
diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/RemappedRecords.java b/app/src/main/java/org/thoughtcrime/securesms/database/RemappedRecords.java
index cbd5737c82..fb97049171 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/database/RemappedRecords.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/RemappedRecords.java
@@ -49,25 +49,16 @@ static RemappedRecords getInstance() {
     return Optional.ofNullable(threadMap.get(oldId));
   }
 
-  boolean areAnyRemapped(@NonNull Collection<RecipientId> recipientIds) {
-    ensureRecipientMapIsPopulated();
-    return recipientIds.stream().anyMatch(id -> recipientMap.containsKey(id));
+  void deleteThread(long oldId) {
+    ensureInTransaction();
+    ensureThreadMapIsPopulated();
+    threadMap.remove(oldId);
+    SignalDatabase.remappedRecords().deleteThreadMapping(oldId);
   }
 
-  @NonNull Set<RecipientId> remap(@NonNull Collection<RecipientId> recipientIds) {
+  boolean areAnyRemapped(@NonNull Collection<RecipientId> recipientIds) {
     ensureRecipientMapIsPopulated();
-
-    Set<RecipientId> remapped = new LinkedHashSet<>();
-
-    for (RecipientId original : recipientIds) {
-      if (recipientMap.containsKey(original)) {
-        remapped.add(recipientMap.get(original));
-      } else {
-        remapped.add(original);
-      }
-    }
-
-    return remapped;
+    return recipientIds.stream().anyMatch(id -> recipientMap.containsKey(id));
   }
 
   @NonNull String buildRemapDescription(@NonNull Collection<RecipientId> recipientIds) {
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 bd4576021e..1c886fd536 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/database/SignalDatabase.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/SignalDatabase.kt
@@ -64,6 +64,7 @@ open class SignalDatabase(private val context: Application, databaseSecret: Data
   val callTable: CallTable = CallTable(context, this)
   val kyberPreKeyTable: KyberPreKeyTable = KyberPreKeyTable(context, this)
   val callLinkTable: CallLinkTable = CallLinkTable(context, this)
+  val nameCollisionTables: NameCollisionTables = NameCollisionTables(context, this)
 
   override fun onOpen(db: net.zetetic.database.sqlcipher.SQLiteDatabase) {
     db.setForeignKeyConstraintsEnabled(true)
@@ -100,6 +101,7 @@ open class SignalDatabase(private val context: Application, databaseSecret: Data
     db.execSQL(CallLinkTable.CREATE_TABLE)
     db.execSQL(CallTable.CREATE_TABLE)
     db.execSQL(KyberPreKeyTable.CREATE_TABLE)
+    NameCollisionTables.createTables(db)
     executeStatements(db, SearchTable.CREATE_TABLE)
     executeStatements(db, RemappedRecordTables.CREATE_TABLE)
     executeStatements(db, MessageSendLogTables.CREATE_TABLE)
@@ -130,6 +132,8 @@ open class SignalDatabase(private val context: Application, databaseSecret: Data
     executeStatements(db, SearchTable.CREATE_TRIGGERS)
     executeStatements(db, MessageSendLogTables.CREATE_TRIGGERS)
 
+    NameCollisionTables.createIndexes(db)
+
     DistributionListTables.insertInitialDistributionListAtCreationTime(db)
 
     if (context.getDatabasePath("messages.db").exists()) {
@@ -478,5 +482,10 @@ open class SignalDatabase(private val context: Application, databaseSecret: Data
     @get:JvmName("callLinks")
     val callLinks: CallLinkTable
       get() = instance!!.callLinkTable
+
+    @get:JvmStatic
+    @get:JvmName("nameCollisions")
+    val nameCollisions: NameCollisionTables
+      get() = instance!!.nameCollisionTables
   }
 }
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 577e5a98b3..5ffa864c02 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/database/ThreadBodyUtil.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/ThreadBodyUtil.java
@@ -136,24 +136,21 @@ private ThreadBodyUtil() {
       boolean accepted = call.getEvent() == CallTable.Event.ACCEPTED;
       if (call.getDirection() == CallTable.Direction.OUTGOING) {
         if (call.getType() == CallTable.Type.AUDIO_CALL) {
-          return context.getString(accepted ? R.string.MessageRecord_outgoing_voice_call : R.string.MessageRecord_unanswered_voice_call);
+          return context.getString(R.string.MessageRecord_outgoing_voice_call);
         } else {
-          return context.getString(accepted ? R.string.MessageRecord_outgoing_video_call : R.string.MessageRecord_unanswered_video_call);
+          return context.getString(R.string.MessageRecord_outgoing_video_call);
         }
       } else {
         boolean isVideoCall = call.getType() == CallTable.Type.VIDEO_CALL;
-        boolean isMissed    = call.getEvent().isMissedCall();
 
-        if (accepted) {
+        if (accepted || !call.isDisplayedAsMissedCallInUi()) {
           return context.getString(isVideoCall ? R.string.MessageRecord_incoming_video_call : R.string.MessageRecord_incoming_voice_call);
-        } else if (isMissed) {
+        } else {
           if (call.getEvent() == CallTable.Event.MISSED_NOTIFICATION_PROFILE) {
             return isVideoCall ? context.getString(R.string.MessageRecord_missed_video_call_notification_profile) : context.getString(R.string.MessageRecord_missed_voice_call_notification_profile);
           } else {
             return isVideoCall ? context.getString(R.string.MessageRecord_missed_video_call) : context.getString(R.string.MessageRecord_missed_voice_call);
           }
-        } else {
-          return isVideoCall ? context.getString(R.string.MessageRecord_you_declined_a_video_call) : context.getString(R.string.MessageRecord_you_declined_a_voice_call);
         }
       }
     } else {
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 2fbd359c87..6c9e98cdcd 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/database/ThreadTable.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/ThreadTable.kt
@@ -1139,15 +1139,23 @@ class ThreadTable(context: Context, databaseHelper: SignalDatabase) : DatabaseTa
 
   fun getOrCreateValidThreadId(recipient: Recipient, candidateId: Long, distributionType: Int): Long {
     return if (candidateId != -1L) {
-      val remapped = RemappedRecords.getInstance().getThread(candidateId)
-      if (remapped.isPresent) {
-        Log.i(TAG, "Using remapped threadId: " + candidateId + " -> " + remapped.get())
-        remapped.get()
+      if (areThreadIdAndRecipientAssociated(candidateId, recipient)) {
+        candidateId
       } else {
-        if (areThreadIdAndRecipientAssociated(candidateId, recipient)) {
-          candidateId
+        val remapped = RemappedRecords.getInstance().getThread(candidateId)
+        if (remapped.isPresent) {
+          if (areThreadIdAndRecipientAssociated(remapped.get(), recipient)) {
+            Log.i(TAG, "Using remapped threadId: $candidateId -> ${remapped.get()}")
+            remapped.get()
+          } else {
+            Log.i(TAG, "There's a remap for $candidateId -> ${remapped.get()}, but it's not associated with $recipient. Deleting old remap and throwing.")
+            writableDatabase.withinTransaction {
+              RemappedRecords.getInstance().deleteThread(candidateId)
+            }
+            throw IllegalArgumentException("Candidate threadId ($candidateId) is not associated with recipient ($recipient)")
+          }
         } else {
-          throw IllegalArgumentException()
+          throw IllegalArgumentException("Candidate threadId ($candidateId) is not associated with recipient ($recipient)")
         }
       }
     } else {
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 fb44a1099e..7fe35aa6bc 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
@@ -81,6 +81,12 @@ import org.thoughtcrime.securesms.database.helpers.migration.V220_PreKeyConstrai
 import org.thoughtcrime.securesms.database.helpers.migration.V221_AddReadColumnToCallEventsTable
 import org.thoughtcrime.securesms.database.helpers.migration.V222_DataHashRefactor
 import org.thoughtcrime.securesms.database.helpers.migration.V223_AddNicknameAndNoteFieldsToRecipientTable
+import org.thoughtcrime.securesms.database.helpers.migration.V224_AddAttachmentArchiveColumns
+import org.thoughtcrime.securesms.database.helpers.migration.V225_AddLocalUserJoinedStateAndGroupCallActiveState
+import org.thoughtcrime.securesms.database.helpers.migration.V226_AddAttachmentMediaIdIndex
+import org.thoughtcrime.securesms.database.helpers.migration.V227_AddAttachmentArchiveTransferState
+import org.thoughtcrime.securesms.database.helpers.migration.V228_AddNameCollisionTables
+import org.thoughtcrime.securesms.database.helpers.migration.V229_MarkMissedCallEventsNotified
 
 /**
  * Contains all of the database migrations for [SignalDatabase]. Broken into a separate file for cleanliness.
@@ -165,10 +171,16 @@ object SignalDatabaseMigrations {
     220 to V220_PreKeyConstraints,
     221 to V221_AddReadColumnToCallEventsTable,
     222 to V222_DataHashRefactor,
-    223 to V223_AddNicknameAndNoteFieldsToRecipientTable
+    223 to V223_AddNicknameAndNoteFieldsToRecipientTable,
+    224 to V224_AddAttachmentArchiveColumns,
+    225 to V225_AddLocalUserJoinedStateAndGroupCallActiveState,
+    226 to V226_AddAttachmentMediaIdIndex,
+    227 to V227_AddAttachmentArchiveTransferState,
+    228 to V228_AddNameCollisionTables,
+    229 to V229_MarkMissedCallEventsNotified
   )
 
-  const val DATABASE_VERSION = 223
+  const val DATABASE_VERSION = 229
 
   @JvmStatic
   fun migrate(context: Application, db: SQLiteDatabase, oldVersion: Int, newVersion: Int) {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/helpers/migration/V224_AddAttachmentArchiveColumns.kt b/app/src/main/java/org/thoughtcrime/securesms/database/helpers/migration/V224_AddAttachmentArchiveColumns.kt
new file mode 100644
index 0000000000..5c3018a402
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/helpers/migration/V224_AddAttachmentArchiveColumns.kt
@@ -0,0 +1,22 @@
+/*
+ * 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
+
+/**
+ * Adds archive_cdn and archive_media to attachment.
+ */
+@Suppress("ClassName")
+object V224_AddAttachmentArchiveColumns : SignalDatabaseMigration {
+  override fun migrate(context: Application, db: SQLiteDatabase, oldVersion: Int, newVersion: Int) {
+    db.execSQL("ALTER TABLE attachment ADD COLUMN archive_cdn INTEGER DEFAULT 0")
+    db.execSQL("ALTER TABLE attachment ADD COLUMN archive_media_name TEXT DEFAULT NULL")
+    db.execSQL("ALTER TABLE attachment ADD COLUMN archive_media_id TEXT DEFAULT NULL")
+    db.execSQL("ALTER TABLE attachment ADD COLUMN archive_transfer_file TEXT DEFAULT NULL")
+  }
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/helpers/migration/V225_AddLocalUserJoinedStateAndGroupCallActiveState.kt b/app/src/main/java/org/thoughtcrime/securesms/database/helpers/migration/V225_AddLocalUserJoinedStateAndGroupCallActiveState.kt
new file mode 100644
index 0000000000..ec1703e0da
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/helpers/migration/V225_AddLocalUserJoinedStateAndGroupCallActiveState.kt
@@ -0,0 +1,30 @@
+/*
+ * 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
+
+/**
+ * Adds local user joined state and group call active state to the
+ * call events table for proper representation of missed non-ringing
+ * group calls.
+ *
+ * Pre-migration call events will display as if the user joined the call.
+ */
+@Suppress("ClassName")
+object V225_AddLocalUserJoinedStateAndGroupCallActiveState : SignalDatabaseMigration {
+  override fun migrate(context: Application, db: SQLiteDatabase, oldVersion: Int, newVersion: Int) {
+    db.execSQL("ALTER TABLE call ADD COLUMN local_joined INTEGER DEFAULT 0")
+    db.execSQL("ALTER TABLE call ADD COLUMN group_call_active INTEGER DEFAULT 0")
+
+    /**
+     * Assume for pre-migration calls that we've joined them all. This avoids
+     * erroneously marking calls as missed.
+     */
+    db.execSQL("UPDATE call SET local_joined = 1")
+  }
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/helpers/migration/V226_AddAttachmentMediaIdIndex.kt b/app/src/main/java/org/thoughtcrime/securesms/database/helpers/migration/V226_AddAttachmentMediaIdIndex.kt
new file mode 100644
index 0000000000..fd89b97879
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/helpers/migration/V226_AddAttachmentMediaIdIndex.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
+
+/**
+ * Adds index to archive_media_id
+ */
+@Suppress("ClassName")
+object V226_AddAttachmentMediaIdIndex : SignalDatabaseMigration {
+  override fun migrate(context: Application, db: SQLiteDatabase, oldVersion: Int, newVersion: Int) {
+    db.execSQL("CREATE INDEX IF NOT EXISTS attachment_archive_media_id_index ON attachment (archive_media_id);")
+  }
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/helpers/migration/V227_AddAttachmentArchiveTransferState.kt b/app/src/main/java/org/thoughtcrime/securesms/database/helpers/migration/V227_AddAttachmentArchiveTransferState.kt
new file mode 100644
index 0000000000..db664232e0
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/helpers/migration/V227_AddAttachmentArchiveTransferState.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
+
+/**
+ * Adds a new column to track the status of transferring attachments to the archive service.
+ */
+object V227_AddAttachmentArchiveTransferState : SignalDatabaseMigration {
+
+  override fun migrate(context: Application, db: SQLiteDatabase, oldVersion: Int, newVersion: Int) {
+    db.execSQL("ALTER TABLE attachment ADD COLUMN archive_transfer_state INTEGER DEFAULT 0")
+  }
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/helpers/migration/V228_AddNameCollisionTables.kt b/app/src/main/java/org/thoughtcrime/securesms/database/helpers/migration/V228_AddNameCollisionTables.kt
new file mode 100644
index 0000000000..c2bc02dc10
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/helpers/migration/V228_AddNameCollisionTables.kt
@@ -0,0 +1,42 @@
+/*
+ * 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
+
+/**
+ * Adds the tables for managing name collisions
+ */
+object V228_AddNameCollisionTables : SignalDatabaseMigration {
+  override fun migrate(context: Application, db: SQLiteDatabase, oldVersion: Int, newVersion: Int) {
+    db.execSQL(
+      """
+      CREATE TABLE name_collision (
+        _id INTEGER PRIMARY KEY AUTOINCREMENT,
+        thread_id INTEGER UNIQUE NOT NULL,
+        dismissed INTEGER DEFAULT 0,
+        hash STRING DEFAULT NULL
+      )
+    """
+    )
+
+    db.execSQL(
+      """
+      CREATE TABLE name_collision_membership (
+        _id INTEGER PRIMARY KEY AUTOINCREMENT,
+        collision_id INTEGER NOT NULL REFERENCES name_collision (_id) ON DELETE CASCADE,
+        recipient_id INTEGER NOT NULL REFERENCES recipient (_id) ON DELETE CASCADE,
+        profile_change_details BLOB DEFAULT NULL,
+        UNIQUE (collision_id, recipient_id)
+      )
+    """
+    )
+
+    db.execSQL("CREATE INDEX name_collision_membership_collision_id_index ON name_collision_membership (collision_id)")
+    db.execSQL("CREATE INDEX name_collision_membership_recipient_id_index ON name_collision_membership (recipient_id)")
+  }
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/helpers/migration/V229_MarkMissedCallEventsNotified.kt b/app/src/main/java/org/thoughtcrime/securesms/database/helpers/migration/V229_MarkMissedCallEventsNotified.kt
new file mode 100644
index 0000000000..16469407cb
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/helpers/migration/V229_MarkMissedCallEventsNotified.kt
@@ -0,0 +1,26 @@
+/*
+ * 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
+
+/**
+ * In order to both correct how we display missed calls and not spam users,
+ * we want to mark every missed call event in the database as notified.
+ */
+@Suppress("ClassName")
+object V229_MarkMissedCallEventsNotified : SignalDatabaseMigration {
+  override fun migrate(context: Application, db: SQLiteDatabase, oldVersion: Int, newVersion: Int) {
+    db.execSQL(
+      """
+      UPDATE message
+      SET notified = 1
+      WHERE (type = 3) OR (type = 8)
+      """.trimIndent()
+    )
+  }
+}
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 d549cc2eb3..56c58e397f 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
@@ -3,20 +3,53 @@
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
+import org.signal.core.util.Base64;
 import org.signal.core.util.logging.Log;
+import org.thoughtcrime.securesms.backup.v2.proto.GroupCallChatUpdate;
 import org.thoughtcrime.securesms.database.model.databaseprotos.GroupCallUpdateDetails;
-import org.signal.core.util.Base64;
+import org.thoughtcrime.securesms.recipients.Recipient;
+import org.whispersystems.signalservice.api.push.ServiceId;
 
 import java.io.IOException;
 import java.util.List;
+import java.util.Objects;
+import java.util.concurrent.TimeUnit;
+import java.util.stream.Collectors;
 
 public final class GroupCallUpdateDetailsUtil {
 
   private static final String TAG = Log.tag(GroupCallUpdateDetailsUtil.class);
 
+  private static final long CALL_RECENCY_TIMEOUT = TimeUnit.MINUTES.toMillis(5);
+
   private GroupCallUpdateDetailsUtil() {
   }
 
+  /**
+   * Generates a group chat update message body from backup data
+   */
+  public static @NonNull String createBodyFromBackup(@NonNull GroupCallChatUpdate groupCallChatUpdate) {
+    ServiceId.ACI startedCall = groupCallChatUpdate.startedCallAci != null ? ServiceId.ACI.parseOrNull(groupCallChatUpdate.startedCallAci) : null;
+
+    GroupCallUpdateDetails details = new GroupCallUpdateDetails.Builder()
+        .startedCallUuid(Objects.toString(startedCall, null))
+        .startedCallTimestamp(groupCallChatUpdate.startedCallTimestamp)
+        .endedCallTimestamp(groupCallChatUpdate.endedCallTimestamp)
+        .isCallFull(false)
+        .inCallUuids(groupCallChatUpdate.inCallAcis.stream()
+                                                   .filter(Objects::nonNull)
+                                                   .map(ServiceId.ACI::parseOrNull)
+                                                   .filter(Objects::nonNull)
+                                                   .map(ServiceId.ACI::toString)
+                                                   .collect(Collectors.toList())
+        )
+        .isRingingOnLocalDevice(false)
+        .localUserJoined(groupCallChatUpdate.localUserJoined != GroupCallChatUpdate.LocalUserJoined.DID_NOT_JOIN)
+        .build();
+
+    return Base64.encodeWithPadding(details.encode());
+  }
+
   public static @NonNull GroupCallUpdateDetails parse(@Nullable String body) {
     GroupCallUpdateDetails groupCallUpdateDetails = new GroupCallUpdateDetails();
 
@@ -33,10 +66,38 @@ private GroupCallUpdateDetailsUtil() {
     return groupCallUpdateDetails;
   }
 
-  public static @NonNull String createUpdatedBody(@NonNull GroupCallUpdateDetails groupCallUpdateDetails, @NonNull List<String> inCallUuids, boolean isCallFull) {
+  public static boolean checkCallEndedRecently(@NonNull GroupCallUpdateDetails groupCallUpdateDetails) {
+    if (groupCallUpdateDetails.endedCallTimestamp == 0) {
+      return false;
+    }
+
+    long now = System.currentTimeMillis();
+    if (now > groupCallUpdateDetails.endedCallTimestamp) {
+      return false;
+    }
+
+    return now - groupCallUpdateDetails.endedCallTimestamp < CALL_RECENCY_TIMEOUT;
+  }
+
+  public static @NonNull String createUpdatedBody(@NonNull GroupCallUpdateDetails groupCallUpdateDetails, @NonNull List<String> inCallUuids, boolean isCallFull, boolean isRingingOnLocalDevice)
+  {
+    boolean localUserJoined           = groupCallUpdateDetails.localUserJoined || inCallUuids.contains(Recipient.self().requireServiceId().getRawUuid().toString());
+    long    endedTimestamp            = groupCallUpdateDetails.endedCallTimestamp;
+    boolean callBecameEmpty           = !groupCallUpdateDetails.inCallUuids.isEmpty() && inCallUuids.isEmpty() && !isRingingOnLocalDevice;
+    boolean ringTerminatedWithNoUsers = groupCallUpdateDetails.isRingingOnLocalDevice && !isRingingOnLocalDevice && inCallUuids.isEmpty();
+
+    if (callBecameEmpty || ringTerminatedWithNoUsers) {
+      endedTimestamp = System.currentTimeMillis();
+    } else if (!inCallUuids.isEmpty()) {
+      endedTimestamp = 0;
+    }
+
     GroupCallUpdateDetails.Builder builder = groupCallUpdateDetails.newBuilder()
                                                                    .isCallFull(isCallFull)
-                                                                   .inCallUuids(inCallUuids);
+                                                                   .inCallUuids(inCallUuids)
+                                                                   .localUserJoined(localUserJoined)
+                                                                   .endedCallTimestamp(endedTimestamp)
+                                                                   .isRingingOnLocalDevice(isRingingOnLocalDevice);
 
     return Base64.encodeWithPadding(builder.build().encode());
   }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/model/GroupCallUpdateMessageFactory.java b/app/src/main/java/org/thoughtcrime/securesms/database/model/GroupCallUpdateMessageFactory.java
index 2e268d4acb..9c1fbb0cd7 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/database/model/GroupCallUpdateMessageFactory.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/model/GroupCallUpdateMessageFactory.java
@@ -19,6 +19,7 @@
 import java.util.List;
 import java.util.Locale;
 import java.util.Objects;
+import java.util.concurrent.TimeUnit;
 
 /**
  * Create a group call update message based on time and joined members.
@@ -53,45 +54,61 @@ public GroupCallUpdateMessageFactory(@NonNull Context context,
   }
 
   private @NonNull String createString() {
-    String time = DateUtils.getTimeString(context, Locale.getDefault(), groupCallUpdateDetails.startedCallTimestamp);
+    long    endedTimestamp  = groupCallUpdateDetails.endedCallTimestamp;
+    boolean isWithinTimeout = GroupCallUpdateDetailsUtil.checkCallEndedRecently(groupCallUpdateDetails);
+    String  time            = DateUtils.getTimeString(context, Locale.getDefault(), groupCallUpdateDetails.startedCallTimestamp);
+    boolean isOutgoing      = Objects.equals(selfAci.toString(), groupCallUpdateDetails.startedCallUuid);
 
     switch (joinedMembers.size()) {
       case 0:
-        return withTime ? context.getString(R.string.MessageRecord_group_call_s, time)
-                        : context.getString(R.string.MessageRecord_group_call);
+        if (isWithinTimeout) {
+          return withTime ? context.getString(R.string.MessageRecord__the_video_call_has_ended_s, time)
+                          : context.getString(R.string.MessageRecord__the_video_call_has_ended);
+        } else if (endedTimestamp == 0 || groupCallUpdateDetails.localUserJoined) {
+          if (isOutgoing) {
+            return withTime ? context.getString(R.string.MessageRecord__outgoing_video_call_s, time)
+                            : context.getString(R.string.MessageRecord__outgoing_video_call);
+          } else {
+            return withTime ? context.getString(R.string.MessageRecord__incoming_video_call_s, time)
+                            : context.getString(R.string.MessageRecord__incoming_video_call);
+          }
+        } else {
+          return withTime ? context.getString(R.string.MessageRecord__missed_video_call_s, time)
+                          : context.getString(R.string.MessageRecord__missed_video_call);
+        }
       case 1:
         if (joinedMembers.get(0).toString().equals(groupCallUpdateDetails.startedCallUuid)) {
           if (Objects.equals(joinedMembers.get(0), selfAci)) {
-            return withTime ? context.getString(R.string.MessageRecord_you_started_a_group_call_s, time)
-                            : context.getString(R.string.MessageRecord_you_started_a_group_call);
+            return withTime ? context.getString(R.string.MessageRecord__you_started_a_video_call_s, time)
+                            : context.getString(R.string.MessageRecord__you_started_a_video_call);
           } else {
-            return withTime ? context.getString(R.string.MessageRecord_s_started_a_group_call_s, describe(joinedMembers.get(0)), time)
-                            : context.getString(R.string.MessageRecord_s_started_a_group_call, describe(joinedMembers.get(0)));
+            return withTime ? context.getString(R.string.MessageRecord__s_started_a_video_call_s, describe(joinedMembers.get(0)), time)
+                            : context.getString(R.string.MessageRecord__s_started_a_video_call, describe(joinedMembers.get(0)));
           }
         } else if (Objects.equals(joinedMembers.get(0), selfAci)) {
-          return withTime ? context.getString(R.string.MessageRecord_you_are_in_the_group_call_s1, time)
-                          : context.getString(R.string.MessageRecord_you_are_in_the_group_call);
+          return withTime ? context.getString(R.string.MessageRecord_you_are_in_the_call_s1, time)
+                          : context.getString(R.string.MessageRecord_you_are_in_the_call);
         } else {
-          return withTime ? context.getString(R.string.MessageRecord_s_is_in_the_group_call_s, describe(joinedMembers.get(0)), time)
-                          : context.getString(R.string.MessageRecord_s_is_in_the_group_call, describe(joinedMembers.get(0)));
+          return withTime ? context.getString(R.string.MessageRecord_s_is_in_the_call_s, describe(joinedMembers.get(0)), time)
+                          : context.getString(R.string.MessageRecord_s_is_in_the_call, describe(joinedMembers.get(0)));
         }
       case 2:
-        return withTime ? context.getString(R.string.MessageRecord_s_and_s_are_in_the_group_call_s1,
+        return withTime ? context.getString(R.string.MessageRecord_s_and_s_are_in_the_call_s1,
                                             describe(joinedMembers.get(0)),
                                             describe(joinedMembers.get(1)),
                                             time)
-                        : context.getString(R.string.MessageRecord_s_and_s_are_in_the_group_call,
+                        : context.getString(R.string.MessageRecord_s_and_s_are_in_the_call,
                                             describe(joinedMembers.get(0)),
                                             describe(joinedMembers.get(1)));
       default:
         int others = joinedMembers.size() - 2;
-        return withTime ? context.getResources().getQuantityString(R.plurals.MessageRecord_s_s_and_d_others_are_in_the_group_call_s,
+        return withTime ? context.getResources().getQuantityString(R.plurals.MessageRecord_s_s_and_d_others_are_in_the_call_s,
                                                                    others,
                                                                    describe(joinedMembers.get(0)),
                                                                    describe(joinedMembers.get(1)),
                                                                    others,
                                                                    time)
-                        : context.getResources().getQuantityString(R.plurals.MessageRecord_s_s_and_d_others_are_in_the_group_call,
+                        : context.getResources().getQuantityString(R.plurals.MessageRecord_s_s_and_d_others_are_in_the_call,
                                                                    others,
                                                                    describe(joinedMembers.get(0)),
                                                                    describe(joinedMembers.get(1)),
diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/model/GroupsV2UpdateMessageConverter.kt b/app/src/main/java/org/thoughtcrime/securesms/database/model/GroupsV2UpdateMessageConverter.kt
index a619abe627..fba1a8f4a5 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/database/model/GroupsV2UpdateMessageConverter.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/model/GroupsV2UpdateMessageConverter.kt
@@ -384,7 +384,7 @@ object GroupsV2UpdateMessageConverter {
       updates.add(
         GroupChangeChatUpdate.Update(
           groupExpirationTimerUpdate = GroupExpirationTimerUpdate(
-            expiresInMs = change.newTimer!!.duration * 1000,
+            expiresInMs = (change.newTimer!!.duration * 1000L).toUInt().toInt(),
             updaterAci = if (editorUnknown) null else change.editorServiceIdBytes
           )
         )
diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/model/GroupsV2UpdateMessageProducer.java b/app/src/main/java/org/thoughtcrime/securesms/database/model/GroupsV2UpdateMessageProducer.java
index 55f2bdf93f..dd47adc0e3 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/database/model/GroupsV2UpdateMessageProducer.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/model/GroupsV2UpdateMessageProducer.java
@@ -234,7 +234,7 @@ private void describeGroupSelfInvitationRevokedUpdate(@NonNull GroupSelfInvitati
     }
   }
   private void describeGroupExpirationTimerUpdate(@NonNull GroupExpirationTimerUpdate update, @NonNull List<UpdateDescription> updates) {
-    final int duration = update.expiresInMs / 1000;
+    final int duration = Math.toIntExact(Integer.toUnsignedLong(update.expiresInMs) / 1000);
     String time = ExpirationUtil.getExpirationDisplayValue(context, duration);
     if (update.updaterAci == null) {
       updates.add(updateDescription(context.getString(R.string.MessageRecord_disappearing_message_time_set_to_s, time), R.drawable.ic_update_timer_16));
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 febd0af229..ff41ee8e08 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
@@ -232,21 +232,20 @@ public SpannableString getDisplayBody(@NonNull Context context) {
 
       if (call.getDirection() == CallTable.Direction.OUTGOING) {
         if (call.getType() == CallTable.Type.AUDIO_CALL) {
-          int updateString = accepted ? R.string.MessageRecord_outgoing_voice_call : R.string.MessageRecord_unanswered_voice_call;
+          int updateString = R.string.MessageRecord_outgoing_voice_call;
           return staticUpdateDescription(context.getString(R.string.MessageRecord_call_message_with_date, context.getString(updateString), callDateString), R.drawable.ic_update_audio_call_outgoing_16);
         } else {
-          int updateString = accepted ? R.string.MessageRecord_outgoing_video_call : R.string.MessageRecord_unanswered_video_call;
+          int updateString = R.string.MessageRecord_outgoing_video_call;
           return staticUpdateDescription(context.getString(R.string.MessageRecord_call_message_with_date, context.getString(updateString), callDateString), R.drawable.ic_update_video_call_outgoing_16);
         }
       } else {
         boolean isVideoCall = call.getType() == CallTable.Type.VIDEO_CALL;
-        boolean isMissed    = call.getEvent().isMissedCall();
 
-        if (accepted) {
+        if (accepted || !call.isDisplayedAsMissedCallInUi()) {
           int updateString = isVideoCall ? R.string.MessageRecord_incoming_video_call : R.string.MessageRecord_incoming_voice_call;
           int icon         = isVideoCall ? R.drawable.ic_update_video_call_incoming_16 : R.drawable.ic_update_audio_call_incoming_16;
           return staticUpdateDescription(context.getString(R.string.MessageRecord_call_message_with_date, context.getString(updateString), callDateString), icon);
-        } else if (isMissed) {
+        } else {
           int icon = isVideoCall ? R.drawable.ic_update_video_call_missed_16 : R.drawable.ic_update_audio_call_missed_16;
           int message;
           if (call.getEvent() == CallTable.Event.MISSED_NOTIFICATION_PROFILE) {
@@ -261,9 +260,6 @@ public SpannableString getDisplayBody(@NonNull Context context) {
                                          icon,
                                          ContextCompat.getColor(context, R.color.core_red_shade),
                                          ContextCompat.getColor(context, R.color.core_red));
-        } else {
-          return isVideoCall ? staticUpdateDescription(context.getString(R.string.MessageRecord_call_message_with_date, context.getString(R.string.MessageRecord_you_declined_a_video_call), callDateString), R.drawable.ic_update_video_call_incoming_16)
-                             : staticUpdateDescription(context.getString(R.string.MessageRecord_call_message_with_date, context.getString(R.string.MessageRecord_you_declined_a_voice_call), callDateString), R.drawable.ic_update_audio_call_incoming_16);
         }
       }
     }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/dependencies/ApplicationDependencies.java b/app/src/main/java/org/thoughtcrime/securesms/dependencies/ApplicationDependencies.java
index 17bb405280..258d2e51b0 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/dependencies/ApplicationDependencies.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/dependencies/ApplicationDependencies.java
@@ -7,7 +7,6 @@
 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.ApplicationContext;
@@ -60,6 +59,7 @@
 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;
@@ -133,7 +133,7 @@ public class ApplicationDependencies {
   private static volatile DeadlockDetector             deadlockDetector;
   private static volatile ClientZkReceiptOperations    clientZkReceiptOperations;
   private static volatile ScheduledMessageManager      scheduledMessagesManager;
-  private static volatile Network                      libsignalNetwork;
+  private static volatile LibSignalNetwork             libsignalNetwork;
 
   @MainThread
   public static void init(@NonNull Application application, @NonNull Provider provider) {
@@ -273,6 +273,9 @@ public static void closeConnections() {
   public static void restartAllNetworkConnections() {
     synchronized (LOCK) {
       closeConnections();
+      if (libsignalNetwork != null) {
+        libsignalNetwork.resetSettings(getSignalServiceNetworkAccess().getConfiguration());
+      }
       if (signalWebSocket != null) {
         signalWebSocket.forceNewWebSockets();
       }
@@ -589,7 +592,7 @@ public static TypingStatusSender getTypingStatusSender() {
     if (signalWebSocket == null) {
       synchronized (LOCK) {
         if (signalWebSocket == null) {
-          signalWebSocket = getProvider().provideSignalWebSocket(() -> getSignalServiceNetworkAccess().getConfiguration());
+          signalWebSocket = getProvider().provideSignalWebSocket(() -> getSignalServiceNetworkAccess().getConfiguration(), ApplicationDependencies::getLibsignalNetwork);
         }
       }
     }
@@ -704,11 +707,11 @@ public static void resetProtocolStores() {
     return deadlockDetector;
   }
 
-  public static @NonNull Network getLibsignalNetwork() {
+  public static @NonNull LibSignalNetwork getLibsignalNetwork() {
     if (libsignalNetwork == null) {
       synchronized (LIBSIGNAL_NETWORK_LOCK) {
         if (libsignalNetwork == null) {
-          libsignalNetwork = getProvider().provideLibsignalNetwork();
+          libsignalNetwork = getProvider().provideLibsignalNetwork(getSignalServiceNetworkAccess().getConfiguration());
         }
       }
     }
@@ -742,7 +745,7 @@ public interface Provider {
     @NonNull SignalCallManager provideSignalCallManager();
     @NonNull PendingRetryReceiptManager providePendingRetryReceiptManager();
     @NonNull PendingRetryReceiptCache providePendingRetryReceiptCache();
-    @NonNull SignalWebSocket provideSignalWebSocket(@NonNull Supplier<SignalServiceConfiguration> signalServiceConfigurationSupplier);
+    @NonNull SignalWebSocket provideSignalWebSocket(@NonNull Supplier<SignalServiceConfiguration> signalServiceConfigurationSupplier, @NonNull Supplier<LibSignalNetwork> libSignalNetworkSupplier);
     @NonNull SignalServiceDataStoreImpl provideProtocolStore();
     @NonNull GiphyMp4Cache provideGiphyMp4Cache();
     @NonNull SimpleExoPlayerPool provideExoPlayerPool();
@@ -753,6 +756,6 @@ public interface Provider {
     @NonNull DeadlockDetector provideDeadlockDetector();
     @NonNull ClientZkReceiptOperations provideClientZkReceiptOperations(@NonNull SignalServiceConfiguration signalServiceConfiguration);
     @NonNull ScheduledMessageManager provideScheduledMessageManager();
-    @NonNull Network provideLibsignalNetwork();
+    @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 d3ddb8d415..88789e19d1 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/dependencies/ApplicationDependencyProvider.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/dependencies/ApplicationDependencyProvider.java
@@ -90,7 +90,10 @@
 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.WebSocketConnection;
+import org.whispersystems.signalservice.internal.websocket.LibSignalChatConnection;
+import org.whispersystems.signalservice.internal.websocket.OkHttpWebSocketConnection;
 
 import java.util.Optional;
 import java.util.concurrent.TimeUnit;
@@ -235,8 +238,8 @@ public ApplicationDependencyProvider(@NonNull Application context) {
   }
 
   @Override
-  public @NonNull Network provideLibsignalNetwork() {
-    return new Network(BuildConfig.LIBSIGNAL_NET_ENV);
+  public @NonNull LibSignalNetwork provideLibsignalNetwork(@NonNull SignalServiceConfiguration config) {
+    return new LibSignalNetwork(new Network(BuildConfig.LIBSIGNAL_NET_ENV), config);
   }
 
   @Override
@@ -287,10 +290,10 @@ public ApplicationDependencyProvider(@NonNull Application context) {
   }
 
   @Override
-  public @NonNull SignalWebSocket provideSignalWebSocket(@NonNull Supplier<SignalServiceConfiguration> signalServiceConfigurationSupplier) {
+  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() ;
     SignalWebSocketHealthMonitor healthMonitor   = new SignalWebSocketHealthMonitor(context, sleepTimer);
-    SignalWebSocket              signalWebSocket = new SignalWebSocket(provideWebSocketFactory(signalServiceConfigurationSupplier, healthMonitor));
+    SignalWebSocket              signalWebSocket = new SignalWebSocket(provideWebSocketFactory(signalServiceConfigurationSupplier, healthMonitor, libSignalNetworkSupplier));
 
     healthMonitor.monitor(signalWebSocket);
 
@@ -397,26 +400,35 @@ public ApplicationDependencyProvider(@NonNull Application context) {
     return provideClientZkOperations(signalServiceConfiguration).getReceiptOperations();
   }
 
-  @NonNull WebSocketFactory provideWebSocketFactory(@NonNull Supplier<SignalServiceConfiguration> signalServiceConfigurationSupplier, @NonNull SignalWebSocketHealthMonitor healthMonitor) {
+  @NonNull WebSocketFactory provideWebSocketFactory(@NonNull Supplier<SignalServiceConfiguration> signalServiceConfigurationSupplier, @NonNull SignalWebSocketHealthMonitor healthMonitor, @NonNull Supplier<LibSignalNetwork> libSignalNetworkSupplier) {
     return new WebSocketFactory() {
       @Override
       public WebSocketConnection createWebSocket() {
-        return new WebSocketConnection("normal",
-                                       signalServiceConfigurationSupplier.get(),
-                                       Optional.of(new DynamicCredentialsProvider()),
-                                       BuildConfig.SIGNAL_AGENT,
-                                       healthMonitor,
-                                       Stories.isFeatureEnabled());
+        return new OkHttpWebSocketConnection("normal",
+                                             signalServiceConfigurationSupplier.get(),
+                                             Optional.of(new DynamicCredentialsProvider()),
+                                             BuildConfig.SIGNAL_AGENT,
+                                             healthMonitor,
+                                             Stories.isFeatureEnabled());
       }
 
       @Override
       public WebSocketConnection createUnidentifiedWebSocket() {
-        return new WebSocketConnection("unidentified",
-                                       signalServiceConfigurationSupplier.get(),
-                                       Optional.empty(),
-                                       BuildConfig.SIGNAL_AGENT,
-                                       healthMonitor,
-                                       Stories.isFeatureEnabled());
+        if (FeatureFlags.libSignalWebSocketEnabled()) {
+          LibSignalNetwork network = libSignalNetworkSupplier.get();
+          return new LibSignalChatConnection(
+              "libsignal-unauth",
+              network.createChatService(null),
+              healthMonitor,
+              false);
+        } else {
+          return new OkHttpWebSocketConnection("unidentified",
+                                               signalServiceConfigurationSupplier.get(),
+                                               Optional.empty(),
+                                               BuildConfig.SIGNAL_AGENT,
+                                               healthMonitor,
+                                               Stories.isFeatureEnabled());
+        }
       }
     };
   }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/events/WebRtcViewModel.kt b/app/src/main/java/org/thoughtcrime/securesms/events/WebRtcViewModel.kt
index 58e5559b6f..ee133e640c 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/events/WebRtcViewModel.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/events/WebRtcViewModel.kt
@@ -2,7 +2,6 @@ package org.thoughtcrime.securesms.events
 
 import com.annimon.stream.OptionalLong
 import org.thoughtcrime.securesms.components.webrtc.BroadcastVideoSink
-import org.thoughtcrime.securesms.events.CallParticipant.Companion.HAND_LOWERED
 import org.thoughtcrime.securesms.events.CallParticipant.Companion.createLocal
 import org.thoughtcrime.securesms.recipients.Recipient
 import org.thoughtcrime.securesms.recipients.RecipientId
@@ -113,11 +112,11 @@ class WebRtcViewModel(state: WebRtcServiceState) {
   val availableDevices: Set<SignalAudioManager.AudioDevice> = state.localDeviceState.availableDevices
   val bluetoothPermissionDenied: Boolean = state.localDeviceState.bluetoothPermissionDenied
 
-  val localParticipant: CallParticipant = state.callInfoState.localParticipant ?: createLocal(
+  val localParticipant: CallParticipant = createLocal(
     state.localDeviceState.cameraState,
     (if (state.videoState.localSink != null) state.videoState.localSink else BroadcastVideoSink())!!,
     state.localDeviceState.isMicrophoneEnabled,
-    HAND_LOWERED
+    state.localDeviceState.handRaisedTimestamp
   )
 
   val isCellularConnection: Boolean = when (state.localDeviceState.networkConnectionType) {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobmanager/JobExtensions.kt b/app/src/main/java/org/thoughtcrime/securesms/jobmanager/JobExtensions.kt
deleted file mode 100644
index 525b7b4e9b..0000000000
--- a/app/src/main/java/org/thoughtcrime/securesms/jobmanager/JobExtensions.kt
+++ /dev/null
@@ -1,14 +0,0 @@
-/*
- * Copyright 2024 Signal Messenger, LLC
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-package org.thoughtcrime.securesms.jobmanager
-
-import org.thoughtcrime.securesms.jobmanager.impl.BackoffUtil
-import org.thoughtcrime.securesms.util.FeatureFlags
-
-/**
- * Helper to calculate the default backoff interval for a [Job] given it's run attempt count.
- */
-fun Job.defaultBackoffInterval(): Long = BackoffUtil.exponentialBackoff(runAttempt + 1, FeatureFlags.getDefaultMaxBackoff())
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 2e68d7b3e9..59dc62346f 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/AccountConsistencyWorkerJob.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/AccountConsistencyWorkerJob.kt
@@ -56,19 +56,34 @@ class AccountConsistencyWorkerJob private constructor(parameters: Parameters) :
       return
     }
 
-    val profile: SignalServiceProfile = ProfileUtil.retrieveProfileSync(context, Recipient.self(), SignalServiceProfile.RequestType.PROFILE, false).profile
-    val encodedPublicKey = Base64.encodeWithPadding(SignalStore.account().aciIdentityKey.publicKey.serialize())
+    val aciProfile: SignalServiceProfile = ProfileUtil.retrieveProfileSync(context, Recipient.self(), SignalServiceProfile.RequestType.PROFILE, false).profile
+    val encodedAciPublicKey = Base64.encodeWithPadding(SignalStore.account().aciIdentityKey.publicKey.serialize())
 
-    if (profile.identityKey != encodedPublicKey) {
-      Log.w(TAG, "Identity key on profile differed from the one we have locally! Marking ourselves unregistered.")
+    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()
-    } else {
-      Log.i(TAG, "Everything matched.")
+
+      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())
+
+    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()
+      return
+    }
+
+    Log.i(TAG, "Everything matched.")
+
     SignalStore.misc().lastConsistencyCheckTime = System.currentTimeMillis()
   }
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/ArchiveAttachmentBackfillJob.kt b/app/src/main/java/org/thoughtcrime/securesms/jobs/ArchiveAttachmentBackfillJob.kt
new file mode 100644
index 0000000000..c6cb48706f
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/ArchiveAttachmentBackfillJob.kt
@@ -0,0 +1,268 @@
+/*
+ * 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.protos.resumableuploads.ResumableUpload
+import org.thoughtcrime.securesms.attachments.Attachment
+import org.thoughtcrime.securesms.attachments.AttachmentId
+import org.thoughtcrime.securesms.attachments.AttachmentUploadUtil
+import org.thoughtcrime.securesms.attachments.DatabaseAttachment
+import org.thoughtcrime.securesms.attachments.PointerAttachment
+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.jobmanager.Job
+import org.thoughtcrime.securesms.jobmanager.impl.NetworkConstraint
+import org.thoughtcrime.securesms.jobs.protos.ArchiveAttachmentBackfillJobData
+import org.whispersystems.signalservice.api.NetworkResult
+import org.whispersystems.signalservice.api.archive.ArchiveMediaResponse
+import org.whispersystems.signalservice.api.archive.ArchiveMediaUploadFormStatusCodes
+import org.whispersystems.signalservice.api.messages.SignalServiceAttachmentPointer
+import java.io.IOException
+import java.util.Optional
+import kotlin.time.Duration.Companion.days
+
+/**
+ * When run, this will find the next attachment that needs to be uploaded to the archive service and upload it.
+ * It will enqueue a copy of itself if it thinks there is more work to be done, and that copy will continue the upload process.
+ */
+class ArchiveAttachmentBackfillJob private constructor(
+  parameters: Parameters,
+  private var attachmentId: AttachmentId?,
+  private var uploadSpec: ResumableUpload?
+) : Job(parameters) {
+  companion object {
+    private val TAG = Log.tag(ArchiveAttachmentBackfillJob::class.java)
+
+    const val KEY = "ArchiveAttachmentBackfillJob"
+  }
+
+  constructor() : this(
+    parameters = Parameters.Builder()
+      .setQueue("ArchiveAttachmentBackfillJob")
+      .setMaxInstancesForQueue(2)
+      .setLifespan(30.days.inWholeMilliseconds)
+      .setMaxAttempts(Parameters.UNLIMITED)
+      .addConstraint(NetworkConstraint.KEY)
+      .build(),
+    attachmentId = null,
+    uploadSpec = null
+  )
+
+  override fun serialize(): ByteArray {
+    return ArchiveAttachmentBackfillJobData(
+      attachmentId = attachmentId?.id,
+      uploadSpec = uploadSpec
+    ).encode()
+  }
+
+  override fun getFactoryKey(): String = KEY
+
+  override fun run(): Result {
+    var attachmentRecord: DatabaseAttachment? = if (attachmentId != null) {
+      Log.i(TAG, "Retrying $attachmentId")
+      SignalDatabase.attachments.getAttachment(attachmentId!!)
+    } else {
+      SignalDatabase.attachments.getNextAttachmentToArchiveAndMarkUploadInProgress()
+    }
+
+    if (attachmentRecord == null && attachmentId != null) {
+      Log.w(TAG, "Attachment $attachmentId was not found! Was likely deleted during the process of archiving. Re-enqueuing job with no ID.")
+      ApplicationDependencies.getJobManager().add(ArchiveAttachmentBackfillJob())
+      return Result.success()
+    }
+
+    // TODO [backup] If we ever wanted to allow multiple instances of this job to run in parallel, this would have to be done somewhere else
+    if (attachmentRecord == null) {
+      Log.i(TAG, "No more attachments to backfill! Ensuring there's no dangling state.")
+
+      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(ArchiveAttachmentBackfillJob())
+      } else {
+        Log.i(TAG, "All good! Should be done.")
+      }
+
+      return Result.success()
+    }
+
+    attachmentId = attachmentRecord.attachmentId
+
+    val transferState: AttachmentTable.ArchiveTransferState? = SignalDatabase.attachments.getArchiveTransferState(attachmentRecord.attachmentId)
+    if (transferState == null) {
+      Log.w(TAG, "Attachment $attachmentId was not found when looking for the transfer state! Was likely just deleted. Re-enqueuing job with no ID.")
+      ApplicationDependencies.getJobManager().add(ArchiveAttachmentBackfillJob())
+      return Result.success()
+    }
+
+    Log.i(TAG, "Current state: $transferState")
+
+    if (transferState == AttachmentTable.ArchiveTransferState.FINISHED) {
+      Log.i(TAG, "Attachment $attachmentId is already finished. Skipping.")
+      ApplicationDependencies.getJobManager().add(ArchiveAttachmentBackfillJob())
+      return Result.success()
+    }
+
+    if (transferState == AttachmentTable.ArchiveTransferState.PERMANENT_FAILURE) {
+      Log.i(TAG, "Attachment $attachmentId is already marked as a permanent failure. Skipping.")
+      ApplicationDependencies.getJobManager().add(ArchiveAttachmentBackfillJob())
+      return Result.success()
+    }
+
+    if (transferState == AttachmentTable.ArchiveTransferState.ATTACHMENT_TRANSFER_PENDING) {
+      Log.i(TAG, "Attachment $attachmentId is already marked as pending transfer, meaning it's a send attachment that will be uploaded on it's own. Skipping.")
+      ApplicationDependencies.getJobManager().add(ArchiveAttachmentBackfillJob())
+      return Result.success()
+    }
+
+    if (transferState == AttachmentTable.ArchiveTransferState.BACKFILL_UPLOAD_IN_PROGRESS) {
+      if (uploadSpec == null || System.currentTimeMillis() > uploadSpec!!.timeout) {
+        Log.d(TAG, "Need an upload spec. Fetching...")
+
+        val (spec, result) = fetchResumableUploadSpec()
+        if (result != null) {
+          return result
+        }
+        uploadSpec = spec
+      } else {
+        Log.d(TAG, "Already have an upload spec. Continuing...")
+      }
+
+      val attachmentStream = try {
+        AttachmentUploadUtil.buildSignalServiceAttachmentStream(
+          context = context,
+          attachment = attachmentRecord,
+          uploadSpec = uploadSpec!!,
+          cancellationSignal = { this.isCanceled }
+        )
+      } catch (e: IOException) {
+        Log.e(TAG, "Failed to get attachment stream for $attachmentId", e)
+        return Result.retry(defaultBackoff())
+      }
+
+      Log.d(TAG, "Beginning upload...")
+      val remoteAttachment: SignalServiceAttachmentPointer = try {
+        ApplicationDependencies.getSignalServiceMessageSender().uploadAttachment(attachmentStream)
+      } catch (e: IOException) {
+        Log.w(TAG, "Failed to upload $attachmentId", e)
+        return Result.retry(defaultBackoff())
+      }
+      Log.d(TAG, "Upload complete!")
+
+      val pointerAttachment: Attachment = PointerAttachment.forPointer(Optional.of(remoteAttachment), null, attachmentRecord.fastPreflightId).get()
+      SignalDatabase.attachments.finalizeAttachmentAfterUpload(attachmentRecord.attachmentId, pointerAttachment, remoteAttachment.uploadTimestamp)
+      SignalDatabase.attachments.setArchiveTransferState(attachmentRecord.attachmentId, AttachmentTable.ArchiveTransferState.BACKFILL_UPLOADED)
+
+      attachmentRecord = SignalDatabase.attachments.getAttachment(attachmentRecord.attachmentId)
+    }
+
+    if (attachmentRecord == null) {
+      Log.w(TAG, "$attachmentId was not found after uploading! Possibly deleted in a narrow race condition. Re-enqueuing job with no ID.")
+      ApplicationDependencies.getJobManager().add(ArchiveAttachmentBackfillJob())
+      return Result.success()
+    }
+
+    Log.d(TAG, "Moving attachment to archive...")
+    return when (val result = BackupRepository.archiveMedia(attachmentRecord)) {
+      is NetworkResult.Success -> {
+        Log.d(TAG, "Move complete!")
+
+        SignalDatabase.attachments.setArchiveTransferState(attachmentRecord.attachmentId, AttachmentTable.ArchiveTransferState.FINISHED)
+        ApplicationDependencies.getJobManager().add(ArchiveAttachmentBackfillJob())
+        Result.success()
+      }
+
+      is NetworkResult.ApplicationError -> {
+        Log.w(TAG, "Failed to archive ${attachmentRecord.attachmentId} due to an application error. Retrying.", result.throwable)
+        Result.retry(defaultBackoff())
+      }
+
+      is NetworkResult.NetworkError -> {
+        Log.w(TAG, "Encountered a transient network error. Retrying.")
+        Result.retry(defaultBackoff())
+      }
+
+      is NetworkResult.StatusCodeError -> {
+        Log.w(TAG, "Failed request with status code ${result.code} for ${attachmentRecord.attachmentId}")
+
+        when (ArchiveMediaResponse.StatusCodes.from(result.code)) {
+          ArchiveMediaResponse.StatusCodes.BadArguments,
+          ArchiveMediaResponse.StatusCodes.InvalidPresentationOrSignature,
+          ArchiveMediaResponse.StatusCodes.InsufficientPermissions,
+          ArchiveMediaResponse.StatusCodes.RateLimited -> {
+            Result.retry(defaultBackoff())
+          }
+
+          ArchiveMediaResponse.StatusCodes.NoMediaSpaceRemaining -> {
+            // TODO [backup] This will end the process right away. We need to integrate this with client-driven retry UX.
+            Result.failure()
+          }
+
+          ArchiveMediaResponse.StatusCodes.Unknown -> {
+            Result.retry(defaultBackoff())
+          }
+        }
+      }
+    }
+  }
+
+  override fun onFailure() {
+    attachmentId?.let { id ->
+      Log.w(TAG, "Failed to archive $id!")
+    }
+  }
+
+  private fun fetchResumableUploadSpec(): Pair<ResumableUpload?, Result?> {
+    return when (val spec = BackupRepository.getMediaUploadSpec()) {
+      is NetworkResult.Success -> {
+        Log.d(TAG, "Got an upload spec!")
+        spec.result.toProto() to null
+      }
+
+      is NetworkResult.ApplicationError -> {
+        Log.w(TAG, "Failed to get an upload spec due to an application error. Retrying.", spec.throwable)
+        return null to Result.retry(defaultBackoff())
+      }
+
+      is NetworkResult.NetworkError -> {
+        Log.w(TAG, "Encountered a transient network error. Retrying.")
+        return null to Result.retry(defaultBackoff())
+      }
+
+      is NetworkResult.StatusCodeError -> {
+        Log.w(TAG, "Failed request with status code ${spec.code}")
+
+        when (ArchiveMediaUploadFormStatusCodes.from(spec.code)) {
+          ArchiveMediaUploadFormStatusCodes.BadArguments,
+          ArchiveMediaUploadFormStatusCodes.InvalidPresentationOrSignature,
+          ArchiveMediaUploadFormStatusCodes.InsufficientPermissions,
+          ArchiveMediaUploadFormStatusCodes.RateLimited -> {
+            return null to Result.retry(defaultBackoff())
+          }
+
+          ArchiveMediaUploadFormStatusCodes.Unknown -> {
+            return null to Result.retry(defaultBackoff())
+          }
+        }
+      }
+    }
+  }
+
+  class Factory : Job.Factory<ArchiveAttachmentBackfillJob> {
+    override fun create(parameters: Parameters, serializedData: ByteArray?): ArchiveAttachmentBackfillJob {
+      val data = serializedData?.let { ArchiveAttachmentBackfillJobData.ADAPTER.decode(it) }
+
+      return ArchiveAttachmentBackfillJob(
+        parameters = parameters,
+        attachmentId = data?.attachmentId?.let { AttachmentId(it) },
+        uploadSpec = data?.uploadSpec
+      )
+    }
+  }
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/ArchiveAttachmentJob.kt b/app/src/main/java/org/thoughtcrime/securesms/jobs/ArchiveAttachmentJob.kt
new file mode 100644
index 0000000000..312a517c00
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/ArchiveAttachmentJob.kt
@@ -0,0 +1,78 @@
+package org.thoughtcrime.securesms.jobs
+
+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.jobmanager.Job
+import org.thoughtcrime.securesms.jobmanager.impl.NetworkConstraint
+import org.thoughtcrime.securesms.jobs.protos.ArchiveAttachmentJobData
+import org.thoughtcrime.securesms.keyvalue.SignalStore
+import org.whispersystems.signalservice.api.push.exceptions.NonSuccessfulResponseCodeException
+import java.io.IOException
+import java.util.concurrent.TimeUnit
+
+/**
+ * Copies and re-encrypts attachments from the attachment cdn to the archive cdn.
+ *
+ * Job will fail if the attachment isn't available on the attachment cdn, use [AttachmentUploadJob] to upload first if necessary.
+ */
+class ArchiveAttachmentJob private constructor(private val attachmentId: AttachmentId, parameters: Parameters) : BaseJob(parameters) {
+
+  companion object {
+    private val TAG = Log.tag(ArchiveAttachmentJob::class.java)
+
+    const val KEY = "ArchiveAttachmentJob"
+
+    fun enqueueIfPossible(attachmentId: AttachmentId) {
+      if (!SignalStore.backup().canReadWriteToArchiveCdn) {
+        return
+      }
+
+      ApplicationDependencies.getJobManager().add(ArchiveAttachmentJob(attachmentId))
+    }
+  }
+
+  constructor(attachmentId: AttachmentId) : this(
+    attachmentId = attachmentId,
+    parameters = Parameters.Builder()
+      .addConstraint(NetworkConstraint.KEY)
+      .setLifespan(TimeUnit.DAYS.toMillis(1))
+      .setMaxAttempts(Parameters.UNLIMITED)
+      .build()
+  )
+
+  override fun serialize(): ByteArray = ArchiveAttachmentJobData(attachmentId.id).encode()
+
+  override fun getFactoryKey(): String = KEY
+
+  override fun onRun() {
+    if (!SignalStore.backup().canReadWriteToArchiveCdn) {
+      Log.w(TAG, "Do not have permission to read/write to archive cdn")
+      return
+    }
+
+    val attachment = SignalDatabase.attachments.getAttachment(attachmentId)
+
+    if (attachment == null) {
+      Log.w(TAG, "Unable to find attachment to archive: $attachmentId")
+      return
+    }
+
+    BackupRepository.archiveMedia(attachment).successOrThrow()
+  }
+
+  override fun onShouldRetry(e: Exception): Boolean {
+    return e is IOException && e !is NonSuccessfulResponseCodeException
+  }
+
+  override fun onFailure() = Unit
+
+  class Factory : Job.Factory<ArchiveAttachmentJob> {
+    override fun create(parameters: Parameters, serializedData: ByteArray?): ArchiveAttachmentJob {
+      val jobData = ArchiveAttachmentJobData.ADAPTER.decode(serializedData!!)
+      return ArchiveAttachmentJob(AttachmentId(jobData.attachmentId), parameters)
+    }
+  }
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/AttachmentDownloadJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/AttachmentDownloadJob.java
deleted file mode 100644
index bd4d619e4a..0000000000
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/AttachmentDownloadJob.java
+++ /dev/null
@@ -1,350 +0,0 @@
-/*
- * Copyright 2023 Signal Messenger, LLC
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-package org.thoughtcrime.securesms.jobs;
-
-import android.text.TextUtils;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.annotation.VisibleForTesting;
-
-import org.greenrobot.eventbus.EventBus;
-import org.signal.core.util.Hex;
-import org.signal.core.util.logging.Log;
-import org.signal.libsignal.protocol.InvalidMacException;
-import org.signal.libsignal.protocol.InvalidMessageException;
-import org.thoughtcrime.securesms.attachments.Attachment;
-import org.thoughtcrime.securesms.attachments.AttachmentId;
-import org.thoughtcrime.securesms.attachments.DatabaseAttachment;
-import org.thoughtcrime.securesms.blurhash.BlurHash;
-import org.thoughtcrime.securesms.database.AttachmentTable;
-import org.thoughtcrime.securesms.database.SignalDatabase;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
-import org.thoughtcrime.securesms.events.PartProgressEvent;
-import org.thoughtcrime.securesms.jobmanager.Job;
-import org.thoughtcrime.securesms.jobmanager.JobLogger;
-import org.thoughtcrime.securesms.jobmanager.JsonJobData;
-import org.thoughtcrime.securesms.jobmanager.impl.NetworkConstraint;
-import org.thoughtcrime.securesms.jobmanager.persistence.JobSpec;
-import org.thoughtcrime.securesms.mms.MmsException;
-import org.thoughtcrime.securesms.notifications.v2.ConversationId;
-import org.thoughtcrime.securesms.releasechannel.ReleaseChannel;
-import org.thoughtcrime.securesms.s3.S3;
-import org.thoughtcrime.securesms.transport.RetryLaterException;
-import org.thoughtcrime.securesms.util.AttachmentUtil;
-import org.signal.core.util.Base64;
-import org.thoughtcrime.securesms.util.FeatureFlags;
-import org.thoughtcrime.securesms.util.Util;
-import org.whispersystems.signalservice.api.SignalServiceMessageReceiver;
-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.MissingConfigurationException;
-import org.whispersystems.signalservice.api.push.exceptions.NonSuccessfulResponseCodeException;
-import org.whispersystems.signalservice.api.push.exceptions.PushNetworkException;
-import org.whispersystems.signalservice.api.push.exceptions.RangeException;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.Objects;
-import java.util.Optional;
-import java.util.concurrent.TimeUnit;
-
-import okhttp3.Response;
-import okhttp3.ResponseBody;
-import okio.Okio;
-
-public final class AttachmentDownloadJob extends BaseJob {
-
-  public static final String KEY = "AttachmentDownloadJob";
-
-  private static final String TAG = Log.tag(AttachmentDownloadJob.class);
-
-  private static final String KEY_MESSAGE_ID    = "message_id";
-  private static final String KEY_ATTACHMENT_ID = "part_row_id";
-  private static final String KEY_MANUAL        = "part_manual";
-
-  private final long    messageId;
-  private final long    attachmentId;
-  private final boolean manual;
-
-  public AttachmentDownloadJob(long messageId, AttachmentId attachmentId, boolean manual) {
-    this(new Job.Parameters.Builder()
-             .setQueue(constructQueueString(attachmentId))
-             .addConstraint(NetworkConstraint.KEY)
-             .setLifespan(TimeUnit.DAYS.toMillis(1))
-             .setMaxAttempts(Parameters.UNLIMITED)
-             .build(),
-         messageId,
-         attachmentId,
-         manual);
-  }
-
-  private AttachmentDownloadJob(@NonNull Job.Parameters parameters, long messageId, AttachmentId attachmentId, boolean manual) {
-    super(parameters);
-
-    this.messageId    = messageId;
-    this.attachmentId = attachmentId.id;
-    this.manual       = manual;
-  }
-
-  @Override
-  public @Nullable byte[] serialize() {
-    return new JsonJobData.Builder().putLong(KEY_MESSAGE_ID, messageId)
-                                    .putLong(KEY_ATTACHMENT_ID, attachmentId)
-                                    .putBoolean(KEY_MANUAL, manual)
-                                    .serialize();
-  }
-
-  @Override
-  public @NonNull String getFactoryKey() {
-    return KEY;
-  }
-
-  public static String constructQueueString(AttachmentId attachmentId) {
-    return "AttachmentDownloadJob-" + attachmentId.id;
-  }
-
-  @Override
-  public void onAdded() {
-    Log.i(TAG, "onAdded() messageId: " + messageId + "  attachmentId: " + attachmentId + "  manual: " + manual);
-
-    final AttachmentTable    database     = SignalDatabase.attachments();
-    final AttachmentId       attachmentId = new AttachmentId(this.attachmentId);
-    final DatabaseAttachment attachment   = database.getAttachment(attachmentId);
-    final boolean            pending      = attachment != null && attachment.transferState != AttachmentTable.TRANSFER_PROGRESS_DONE
-                                            && attachment.transferState != AttachmentTable.TRANSFER_PROGRESS_PERMANENT_FAILURE;
-
-    if (pending && (manual || AttachmentUtil.isAutoDownloadPermitted(context, attachment))) {
-      Log.i(TAG, "onAdded() Marking attachment progress as 'started'");
-      database.setTransferState(messageId, attachmentId, AttachmentTable.TRANSFER_PROGRESS_STARTED);
-    }
-  }
-
-  @Override
-  public void onRun() throws Exception {
-    doWork();
-
-    if (!SignalDatabase.messages().isStory(messageId)) {
-      ApplicationDependencies.getMessageNotifier().updateNotification(context, ConversationId.forConversation(0));
-    }
-  }
-
-  public void doWork() throws IOException, RetryLaterException {
-    Log.i(TAG, "onRun() messageId: " + messageId + "  attachmentId: " + attachmentId + "  manual: " + manual);
-
-    final AttachmentTable    database     = SignalDatabase.attachments();
-    final AttachmentId       attachmentId = new AttachmentId(this.attachmentId);
-    final DatabaseAttachment attachment   = database.getAttachment(attachmentId);
-
-    if (attachment == null) {
-      Log.w(TAG, "attachment no longer exists.");
-      return;
-    }
-
-    if (attachment.isPermanentlyFailed()) {
-      Log.w(TAG, "Attachment was marked as a permanent failure. Refusing to download.");
-      return;
-    }
-
-    if (!attachment.isInProgress()) {
-      Log.w(TAG, "Attachment was already downloaded.");
-      return;
-    }
-
-    if (!manual && !AttachmentUtil.isAutoDownloadPermitted(context, attachment)) {
-      Log.w(TAG, "Attachment can't be auto downloaded...");
-      database.setTransferState(messageId, attachmentId, AttachmentTable.TRANSFER_PROGRESS_PENDING);
-      return;
-    }
-
-    Log.i(TAG, "Downloading push part " + attachmentId);
-    database.setTransferState(messageId, attachmentId, AttachmentTable.TRANSFER_PROGRESS_STARTED);
-
-    if (attachment.cdnNumber != ReleaseChannel.CDN_NUMBER) {
-      retrieveAttachment(messageId, attachmentId, attachment);
-    } else {
-      retrieveAttachmentForReleaseChannel(messageId, attachmentId, attachment);
-    }
-  }
-
-  @Override
-  public void onFailure() {
-    Log.w(TAG, JobLogger.format(this, "onFailure() messageId: " + messageId + "  attachmentId: " + attachmentId + "  manual: " + manual));
-
-    final AttachmentId attachmentId = new AttachmentId(this.attachmentId);
-    markFailed(messageId, attachmentId);
-  }
-
-  @Override
-  protected boolean onShouldRetry(@NonNull Exception exception) {
-    return exception instanceof PushNetworkException ||
-           exception instanceof RetryLaterException;
-  }
-
-  private void retrieveAttachment(long messageId,
-                                  final AttachmentId attachmentId,
-                                  final Attachment attachment)
-      throws IOException, RetryLaterException
-  {
-    long maxReceiveSize = FeatureFlags.maxAttachmentReceiveSizeBytes();
-
-    AttachmentTable database       = SignalDatabase.attachments();
-    File            attachmentFile = database.getOrCreateTransferFile(attachmentId);
-
-    try {
-      if (attachment.size > maxReceiveSize) {
-        throw new MmsException("Attachment too large, failing download");
-      }
-      SignalServiceMessageReceiver   messageReceiver = ApplicationDependencies.getSignalServiceMessageReceiver();
-      SignalServiceAttachmentPointer pointer         = createAttachmentPointer(attachment);
-      InputStream stream = messageReceiver.retrieveAttachment(pointer,
-                                                              attachmentFile,
-                                                              maxReceiveSize,
-                                                              new SignalServiceAttachment.ProgressListener() {
-                                                                @Override
-                                                                public void onAttachmentProgress(long total, long progress) {
-                                                                  EventBus.getDefault().postSticky(new PartProgressEvent(attachment, PartProgressEvent.Type.NETWORK, total, progress));
-                                                                }
-
-                                                                @Override
-                                                                public boolean shouldCancel() {
-                                                                  return isCanceled();
-                                                                }
-                                                              });
-      database.finalizeAttachmentAfterDownload(messageId, attachmentId, stream);
-    } catch (RangeException e) {
-      Log.w(TAG, "Range exception, file size " + attachmentFile.length(), e);
-      if (attachmentFile.delete()) {
-        Log.i(TAG, "Deleted temp download file to recover");
-        throw new RetryLaterException(e);
-      } else {
-        throw new IOException("Failed to delete temp download file following range exception");
-      }
-    } catch (InvalidPartException | NonSuccessfulResponseCodeException | MmsException | MissingConfigurationException e) {
-      Log.w(TAG, "Experienced exception while trying to download an attachment.", e);
-      markFailed(messageId, attachmentId);
-    } catch (InvalidMessageException e) {
-      Log.w(TAG, "Experienced an InvalidMessageException while trying to download an attachment.", e);
-      if (e.getCause() instanceof InvalidMacException) {
-        Log.w(TAG, "Detected an invalid mac. Treating as a permanent failure.");
-        markPermanentlyFailed(messageId, attachmentId);
-      } else {
-        markFailed(messageId, attachmentId);
-      }
-    }
-  }
-
-  private SignalServiceAttachmentPointer createAttachmentPointer(Attachment attachment) throws InvalidPartException {
-    if (TextUtils.isEmpty(attachment.remoteLocation)) {
-      throw new InvalidPartException("empty content id");
-    }
-
-    if (TextUtils.isEmpty(attachment.remoteKey)) {
-      throw new InvalidPartException("empty encrypted key");
-    }
-
-    try {
-      final SignalServiceAttachmentRemoteId remoteId = SignalServiceAttachmentRemoteId.from(attachment.remoteLocation);
-      final byte[]                          key      = Base64.decode(attachment.remoteKey);
-
-      if (attachment.remoteDigest != null) {
-        Log.i(TAG, "Downloading attachment with digest: " + Hex.toString(attachment.remoteDigest));
-      } else {
-        Log.i(TAG, "Downloading attachment with no digest...");
-      }
-
-      return new SignalServiceAttachmentPointer(attachment.cdnNumber, remoteId, null, key,
-                                                Optional.of(Util.toIntExact(attachment.size)),
-                                                Optional.empty(),
-                                                0, 0,
-                                                Optional.ofNullable(attachment.remoteDigest),
-                                                Optional.ofNullable(attachment.getIncrementalDigest()),
-                                                attachment.incrementalMacChunkSize,
-                                                Optional.ofNullable(attachment.fileName),
-                                                attachment.voiceNote,
-                                                attachment.borderless,
-                                                attachment.videoGif,
-                                                Optional.empty(),
-                                                Optional.ofNullable(attachment.blurHash).map(BlurHash::getHash),
-                                                attachment.uploadTimestamp);
-    } catch (IOException | ArithmeticException e) {
-      Log.w(TAG, e);
-      throw new InvalidPartException(e);
-    }
-  }
-
-  private void retrieveAttachmentForReleaseChannel(long messageId,
-                                                   final AttachmentId attachmentId,
-                                                   final Attachment attachment)
-      throws IOException
-  {
-    try (Response response = S3.getObject(Objects.requireNonNull(attachment.fileName))) {
-      ResponseBody body = response.body();
-      if (body != null) {
-        if (body.contentLength() > FeatureFlags.maxAttachmentReceiveSizeBytes()) {
-          throw new MmsException("Attachment too large, failing download");
-        }
-        SignalDatabase.attachments().finalizeAttachmentAfterDownload(messageId, attachmentId, Okio.buffer(body.source()).inputStream());
-      }
-    } catch (MmsException e) {
-      Log.w(TAG, "Experienced exception while trying to download an attachment.", e);
-      markFailed(messageId, attachmentId);
-    }
-  }
-
-  private void markFailed(long messageId, AttachmentId attachmentId) {
-    try {
-      AttachmentTable database = SignalDatabase.attachments();
-      database.setTransferProgressFailed(attachmentId, messageId);
-    } catch (MmsException e) {
-      Log.w(TAG, e);
-    }
-  }
-
-  private void markPermanentlyFailed(long messageId, AttachmentId attachmentId) {
-    try {
-      AttachmentTable database = SignalDatabase.attachments();
-      database.setTransferProgressPermanentFailure(attachmentId, messageId);
-    } catch (MmsException e) {
-      Log.w(TAG, e);
-    }
-  }
-
-  public static boolean jobSpecMatchesAttachmentId(@NonNull JobSpec jobSpec, @NonNull AttachmentId attachmentId) {
-    if (!KEY.equals(jobSpec.getFactoryKey())) {
-      return false;
-    }
-
-    final byte[] serializedData = jobSpec.getSerializedData();
-    if (serializedData == null) {
-      return false;
-    }
-
-    JsonJobData data = JsonJobData.deserialize(serializedData);
-    final AttachmentId parsed = new AttachmentId(data.getLong(KEY_ATTACHMENT_ID));
-    return attachmentId.equals(parsed);
-  }
-
-  @VisibleForTesting
-  static class InvalidPartException extends Exception {
-    InvalidPartException(String s) {super(s);}
-    InvalidPartException(Exception e) {super(e);}
-  }
-
-  public static final class Factory implements Job.Factory<AttachmentDownloadJob> {
-    @Override
-    public @NonNull AttachmentDownloadJob create(@NonNull Parameters parameters, @Nullable byte[] serializedData) {
-      JsonJobData data = JsonJobData.deserialize(serializedData);
-
-      return new AttachmentDownloadJob(parameters,
-                                       data.getLong(KEY_MESSAGE_ID),
-                                       new AttachmentId(data.getLong(KEY_ATTACHMENT_ID)),
-                                       data.getBoolean(KEY_MANUAL));
-    }
-  }
-}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/AttachmentDownloadJob.kt b/app/src/main/java/org/thoughtcrime/securesms/jobs/AttachmentDownloadJob.kt
new file mode 100644
index 0000000000..a95ed497fe
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/AttachmentDownloadJob.kt
@@ -0,0 +1,431 @@
+/*
+ * 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 okio.Source
+import okio.buffer
+import org.greenrobot.eventbus.EventBus
+import org.signal.core.util.Base64
+import org.signal.core.util.Hex
+import org.signal.core.util.logging.Log
+import org.signal.libsignal.protocol.InvalidMacException
+import org.signal.libsignal.protocol.InvalidMessageException
+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
+import org.thoughtcrime.securesms.database.AttachmentTable
+import org.thoughtcrime.securesms.database.SignalDatabase
+import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.events.PartProgressEvent
+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.jobmanager.persistence.JobSpec
+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.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.Util
+import org.whispersystems.signalservice.api.backup.MediaName
+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.MissingConfigurationException
+import org.whispersystems.signalservice.api.push.exceptions.NonSuccessfulResponseCodeException
+import org.whispersystems.signalservice.api.push.exceptions.PushNetworkException
+import org.whispersystems.signalservice.api.push.exceptions.RangeException
+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 AttachmentDownloadJob private constructor(
+  parameters: Parameters,
+  private val messageId: Long,
+  attachmentId: AttachmentId,
+  private val manual: Boolean,
+  private var forceArchiveDownload: Boolean
+) : BaseJob(parameters) {
+
+  companion object {
+    const val KEY = "AttachmentDownloadJob"
+    private val TAG = Log.tag(AttachmentDownloadJob::class.java)
+
+    private const val KEY_MESSAGE_ID = "message_id"
+    private const val KEY_ATTACHMENT_ID = "part_row_id"
+    private const val KEY_MANUAL = "part_manual"
+    private const val KEY_FORCE_ARCHIVE = "force_archive"
+
+    @JvmStatic
+    fun constructQueueString(attachmentId: AttachmentId): String {
+      return "AttachmentDownloadJob-" + attachmentId.id
+    }
+
+    fun jobSpecMatchesAttachmentId(jobSpec: JobSpec, attachmentId: AttachmentId): Boolean {
+      if (KEY != jobSpec.factoryKey) {
+        return false
+      }
+
+      val serializedData = jobSpec.serializedData ?: return false
+      val data = JsonJobData.deserialize(serializedData)
+      val parsed = AttachmentId(data.getLong(KEY_ATTACHMENT_ID))
+      return attachmentId == parsed
+    }
+  }
+
+  private val attachmentId: Long
+
+  constructor(messageId: Long, attachmentId: AttachmentId, manual: Boolean, forceArchiveDownload: Boolean = false) : this(
+    Parameters.Builder()
+      .setQueue(constructQueueString(attachmentId))
+      .addConstraint(NetworkConstraint.KEY)
+      .setLifespan(TimeUnit.DAYS.toMillis(1))
+      .setMaxAttempts(Parameters.UNLIMITED)
+      .build(),
+    messageId,
+    attachmentId,
+    manual,
+    forceArchiveDownload
+  )
+
+  init {
+    this.attachmentId = attachmentId.id
+  }
+
+  override fun serialize(): ByteArray? {
+    return JsonJobData.Builder()
+      .putLong(KEY_MESSAGE_ID, messageId)
+      .putLong(KEY_ATTACHMENT_ID, attachmentId)
+      .putBoolean(KEY_MANUAL, manual)
+      .putBoolean(KEY_FORCE_ARCHIVE, forceArchiveDownload)
+      .serialize()
+  }
+
+  override fun getFactoryKey(): String {
+    return KEY
+  }
+
+  override fun onAdded() {
+    Log.i(TAG, "onAdded() messageId: $messageId  attachmentId: $attachmentId  manual: $manual")
+
+    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 (pending && (manual || AttachmentUtil.isAutoDownloadPermitted(context, attachment))) {
+      Log.i(TAG, "onAdded() Marking attachment progress as 'started'")
+      SignalDatabase.attachments.setTransferState(messageId, attachmentId, AttachmentTable.TRANSFER_PROGRESS_STARTED)
+    }
+  }
+
+  @Throws(Exception::class)
+  public override fun onRun() {
+    doWork()
+
+    if (!SignalDatabase.messages.isStory(messageId)) {
+      ApplicationDependencies.getMessageNotifier().updateNotification(context, forConversation(0))
+    }
+  }
+
+  @Throws(IOException::class, RetryLaterException::class)
+  fun doWork() {
+    Log.i(TAG, "onRun() messageId: $messageId  attachmentId: $attachmentId  manual: $manual")
+
+    val attachmentId = AttachmentId(attachmentId)
+    val attachment = SignalDatabase.attachments.getAttachment(attachmentId)
+
+    if (attachment == null) {
+      Log.w(TAG, "attachment no longer exists.")
+      return
+    }
+
+    if (attachment.isPermanentlyFailed) {
+      Log.w(TAG, "Attachment was marked as a permanent failure. Refusing to download.")
+      return
+    }
+
+    if (!attachment.isInProgress) {
+      Log.w(TAG, "Attachment was already downloaded.")
+      return
+    }
+
+    if (!manual && !AttachmentUtil.isAutoDownloadPermitted(context, attachment)) {
+      Log.w(TAG, "Attachment can't be auto downloaded...")
+      SignalDatabase.attachments.setTransferState(messageId, attachmentId, AttachmentTable.TRANSFER_PROGRESS_PENDING)
+      return
+    }
+
+    Log.i(TAG, "Downloading push part $attachmentId")
+    SignalDatabase.attachments.setTransferState(messageId, attachmentId, AttachmentTable.TRANSFER_PROGRESS_STARTED)
+
+    when (attachment.cdn) {
+      Cdn.S3 -> retrieveAttachmentForReleaseChannel(messageId, attachmentId, attachment)
+      else -> retrieveAttachment(messageId, attachmentId, attachment)
+    }
+
+    if ((attachment.cdn == Cdn.CDN_2 || attachment.cdn == Cdn.CDN_3) &&
+      attachment.archiveMediaId == null &&
+      SignalStore.backup().canReadWriteToArchiveCdn
+    ) {
+      ApplicationDependencies.getJobManager().add(ArchiveAttachmentJob(attachmentId))
+    }
+  }
+
+  override fun onFailure() {
+    Log.w(TAG, format(this, "onFailure() messageId: $messageId  attachmentId: $attachmentId  manual: $manual"))
+
+    val attachmentId = AttachmentId(attachmentId)
+    markFailed(messageId, attachmentId)
+  }
+
+  override fun onShouldRetry(exception: Exception): Boolean {
+    return exception is PushNetworkException ||
+      exception is RetryLaterException
+  }
+
+  @Throws(IOException::class, RetryLaterException::class)
+  private fun retrieveAttachment(
+    messageId: Long,
+    attachmentId: AttachmentId,
+    attachment: DatabaseAttachment
+  ) {
+    val maxReceiveSize: Long = FeatureFlags.maxAttachmentReceiveSizeBytes()
+    val attachmentFile: File = SignalDatabase.attachments.getOrCreateTransferFile(attachmentId)
+    var archiveFile: File? = null
+    var useArchiveCdn = false
+
+    try {
+      if (attachment.size > maxReceiveSize) {
+        throw MmsException("Attachment too large, failing download")
+      }
+
+      useArchiveCdn = if (SignalStore.backup().canReadWriteToArchiveCdn && (forceArchiveDownload || attachment.remoteLocation == null)) {
+        if (attachment.archiveMediaName.isNullOrEmpty()) {
+          throw InvalidPartException("Invalid attachment configuration")
+        }
+        true
+      } else {
+        false
+      }
+
+      val messageReceiver = ApplicationDependencies.getSignalServiceMessageReceiver()
+      val pointer = createAttachmentPointer(attachment, useArchiveCdn)
+
+      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 {
+          return this@AttachmentDownloadJob.isCanceled
+        }
+      }
+
+      val stream = if (useArchiveCdn) {
+        archiveFile = SignalDatabase.attachments.getOrCreateArchiveTransferFile(attachmentId)
+        val cdnCredentials = BackupRepository.getCdnReadCredentials(attachment.archiveCdn).successOrThrow().headers
+
+        messageReceiver
+          .retrieveArchivedAttachment(
+            SignalStore.svr().getOrCreateMasterKey().deriveBackupKey().deriveMediaSecrets(MediaName(attachment.archiveMediaName!!)),
+            cdnCredentials,
+            archiveFile,
+            pointer,
+            attachmentFile,
+            maxReceiveSize,
+            progressListener
+          )
+      } else {
+        messageReceiver
+          .retrieveAttachment(
+            pointer,
+            attachmentFile,
+            maxReceiveSize,
+            progressListener
+          )
+      }
+
+      SignalDatabase.attachments.finalizeAttachmentAfterDownload(messageId, attachmentId, stream)
+    } catch (e: RangeException) {
+      val transferFile = archiveFile ?: attachmentFile
+      Log.w(TAG, "Range exception, file size " + transferFile.length(), e)
+      if (transferFile.delete()) {
+        Log.i(TAG, "Deleted temp download file to recover")
+        throw RetryLaterException(e)
+      } else {
+        throw IOException("Failed to delete temp download file following range exception")
+      }
+    } catch (e: InvalidPartException) {
+      Log.w(TAG, "Experienced exception while trying to download an attachment.", e)
+      markFailed(messageId, attachmentId)
+    } catch (e: NonSuccessfulResponseCodeException) {
+      if (SignalStore.backup().canReadWriteToArchiveCdn) {
+        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
+          throw RetryLaterException(e)
+        }
+      }
+
+      Log.w(TAG, "Experienced exception while trying to download an attachment.", e)
+      markFailed(messageId, attachmentId)
+    } catch (e: MmsException) {
+      Log.w(TAG, "Experienced exception while trying to download an attachment.", e)
+      markFailed(messageId, attachmentId)
+    } catch (e: MissingConfigurationException) {
+      Log.w(TAG, "Experienced exception while trying to download an attachment.", e)
+      markFailed(messageId, attachmentId)
+    } catch (e: InvalidMessageException) {
+      Log.w(TAG, "Experienced an InvalidMessageException while trying to download an attachment.", e)
+      if (e.cause is InvalidMacException) {
+        Log.w(TAG, "Detected an invalid mac. Treating as a permanent failure.")
+        markPermanentlyFailed(messageId, attachmentId)
+      } else {
+        markFailed(messageId, attachmentId)
+      }
+    }
+  }
+
+  @Throws(InvalidPartException::class)
+  private fun createAttachmentPointer(attachment: DatabaseAttachment, useArchiveCdn: Boolean): SignalServiceAttachmentPointer {
+    if (TextUtils.isEmpty(attachment.remoteKey)) {
+      throw InvalidPartException("empty encrypted key")
+    }
+
+    return try {
+      val remoteData: RemoteData = if (useArchiveCdn) {
+        val backupKey = SignalStore.svr().getOrCreateMasterKey().deriveBackupKey()
+        val backupDirectories = BackupRepository.getCdnBackupDirectories().successOrThrow()
+
+        RemoteData(
+          remoteId = SignalServiceAttachmentRemoteId.Backup(
+            backupDir = backupDirectories.backupDir,
+            mediaDir = backupDirectories.mediaDir,
+            mediaId = backupKey.deriveMediaId(MediaName(attachment.archiveMediaName!!)).encode()
+          ),
+          cdnNumber = attachment.archiveCdn
+        )
+      } else {
+        if (attachment.remoteLocation.isNullOrEmpty()) {
+          throw InvalidPartException("empty content id")
+        }
+
+        RemoteData(
+          remoteId = SignalServiceAttachmentRemoteId.from(attachment.remoteLocation),
+          cdnNumber = attachment.cdn.cdnNumber
+        )
+      }
+
+      val key = Base64.decode(attachment.remoteKey!!)
+
+      if (attachment.remoteDigest != null) {
+        Log.i(TAG, "Downloading attachment with digest: " + Hex.toString(attachment.remoteDigest))
+      } else {
+        Log.i(TAG, "Downloading attachment with no digest...")
+      }
+
+      SignalServiceAttachmentPointer(
+        remoteData.cdnNumber,
+        remoteData.remoteId,
+        null,
+        key,
+        Optional.of(Util.toIntExact(attachment.size)),
+        Optional.empty(),
+        0,
+        0,
+        Optional.ofNullable(attachment.remoteDigest),
+        Optional.ofNullable(attachment.getIncrementalDigest()),
+        attachment.incrementalMacChunkSize,
+        Optional.ofNullable(attachment.fileName),
+        attachment.voiceNote,
+        attachment.borderless,
+        attachment.videoGif,
+        Optional.empty(),
+        Optional.ofNullable(attachment.blurHash).map { it.hash },
+        attachment.uploadTimestamp
+      )
+    } catch (e: IOException) {
+      Log.w(TAG, e)
+      throw InvalidPartException(e)
+    } catch (e: ArithmeticException) {
+      Log.w(TAG, e)
+      throw InvalidPartException(e)
+    }
+  }
+
+  @Throws(IOException::class)
+  private fun retrieveAttachmentForReleaseChannel(
+    messageId: Long,
+    attachmentId: AttachmentId,
+    attachment: Attachment
+  ) {
+    try {
+      S3.getObject(attachment.fileName!!).use { response ->
+        val body = response.body()
+        if (body != null) {
+          if (body.contentLength() > FeatureFlags.maxAttachmentReceiveSizeBytes()) {
+            throw MmsException("Attachment too large, failing download")
+          }
+          SignalDatabase.attachments.finalizeAttachmentAfterDownload(messageId, attachmentId, (body.source() as Source).buffer().inputStream())
+        }
+      }
+    } catch (e: MmsException) {
+      Log.w(TAG, "Experienced exception while trying to download an attachment.", e)
+      markFailed(messageId, attachmentId)
+    }
+  }
+
+  private fun markFailed(messageId: Long, attachmentId: AttachmentId) {
+    try {
+      SignalDatabase.attachments.setTransferProgressFailed(attachmentId, messageId)
+    } catch (e: MmsException) {
+      Log.w(TAG, e)
+    }
+  }
+
+  private fun markPermanentlyFailed(messageId: Long, attachmentId: AttachmentId) {
+    try {
+      SignalDatabase.attachments.setTransferProgressPermanentFailure(attachmentId, messageId)
+    } catch (e: MmsException) {
+      Log.w(TAG, e)
+    }
+  }
+
+  @VisibleForTesting
+  internal class InvalidPartException : Exception {
+    constructor(s: String?) : super(s)
+    constructor(e: Exception?) : super(e)
+  }
+
+  private data class RemoteData(val remoteId: SignalServiceAttachmentRemoteId, val cdnNumber: Int)
+
+  class Factory : Job.Factory<AttachmentDownloadJob?> {
+    override fun create(parameters: Parameters, serializedData: ByteArray?): AttachmentDownloadJob {
+      val data = JsonJobData.deserialize(serializedData)
+      return AttachmentDownloadJob(
+        parameters = parameters,
+        messageId = data.getLong(KEY_MESSAGE_ID),
+        attachmentId = AttachmentId(data.getLong(KEY_ATTACHMENT_ID)),
+        manual = data.getBoolean(KEY_MANUAL),
+        forceArchiveDownload = data.getBooleanOrDefault(KEY_FORCE_ARCHIVE, false)
+      )
+    }
+  }
+}
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 a4178f470c..be32017fe2 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/AttachmentHashBackfillJob.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/AttachmentHashBackfillJob.kt
@@ -12,7 +12,6 @@ import org.thoughtcrime.securesms.attachments.AttachmentId
 import org.thoughtcrime.securesms.database.SignalDatabase
 import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
 import org.thoughtcrime.securesms.jobmanager.Job
-import org.thoughtcrime.securesms.jobmanager.defaultBackoffInterval
 import java.io.File
 import java.io.FileNotFoundException
 import java.io.IOException
@@ -84,7 +83,7 @@ class AttachmentHashBackfillJob private constructor(parameters: Parameters) : Jo
         Log.w(TAG, "Underlying cause was a FileNotFoundException. Clearing all usages.", true)
         SignalDatabase.attachments.clearUsagesOfDataFile(file)
       } else {
-        return Result.retry(defaultBackoffInterval())
+        return Result.retry(defaultBackoff())
       }
     }
 
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 e8af9f7247..c6097ef5fe 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/AttachmentUploadJob.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/AttachmentUploadJob.kt
@@ -4,8 +4,6 @@
  */
 package org.thoughtcrime.securesms.jobs
 
-import android.graphics.Bitmap
-import android.os.Build
 import android.text.TextUtils
 import org.greenrobot.eventbus.EventBus
 import org.signal.core.util.inRoundedDays
@@ -15,8 +13,8 @@ import org.signal.protos.resumableuploads.ResumableUpload
 import org.thoughtcrime.securesms.R
 import org.thoughtcrime.securesms.attachments.Attachment
 import org.thoughtcrime.securesms.attachments.AttachmentId
+import org.thoughtcrime.securesms.attachments.AttachmentUploadUtil
 import org.thoughtcrime.securesms.attachments.PointerAttachment
-import org.thoughtcrime.securesms.blurhash.BlurHashEncoder
 import org.thoughtcrime.securesms.database.AttachmentTable
 import org.thoughtcrime.securesms.database.SignalDatabase
 import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
@@ -26,20 +24,16 @@ import org.thoughtcrime.securesms.jobmanager.impl.NetworkConstraint
 import org.thoughtcrime.securesms.jobmanager.persistence.JobSpec
 import org.thoughtcrime.securesms.jobs.protos.AttachmentUploadJobData
 import org.thoughtcrime.securesms.mms.MmsException
-import org.thoughtcrime.securesms.mms.PartAuthority
 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.MediaUtil
 import org.whispersystems.signalservice.api.crypto.AttachmentCipherStreamUtil
 import org.whispersystems.signalservice.api.messages.SignalServiceAttachment
 import org.whispersystems.signalservice.api.messages.SignalServiceAttachmentStream
 import org.whispersystems.signalservice.api.push.exceptions.NonSuccessfulResumableUploadResponseCodeException
 import org.whispersystems.signalservice.internal.crypto.PaddingInputStream
-import org.whispersystems.signalservice.internal.push.http.ResumableUploadSpec
 import java.io.IOException
-import java.util.Objects
 import java.util.Optional
 import java.util.concurrent.TimeUnit
 import kotlin.time.Duration.Companion.days
@@ -210,23 +204,12 @@ class AttachmentUploadJob private constructor(
     }
 
     return try {
-      val inputStream = PartAuthority.getAttachmentStream(context, attachment.uri!!)
-      val builder = SignalServiceAttachment.newStreamBuilder()
-        .withStream(inputStream)
-        .withContentType(attachment.contentType)
-        .withLength(attachment.size)
-        .withFileName(attachment.fileName)
-        .withVoiceNote(attachment.voiceNote)
-        .withBorderless(attachment.borderless)
-        .withGif(attachment.videoGif)
-        .withFaststart(attachment.transformProperties?.mp4FastStart ?: false)
-        .withWidth(attachment.width)
-        .withHeight(attachment.height)
-        .withUploadTimestamp(System.currentTimeMillis())
-        .withCaption(attachment.caption)
-        .withResumableUploadSpec(ResumableUploadSpec.from(resumableUploadSpec))
-        .withCancelationSignal { this.isCanceled }
-        .withListener(object : SignalServiceAttachment.ProgressListener {
+      AttachmentUploadUtil.buildSignalServiceAttachmentStream(
+        context = context,
+        attachment = attachment,
+        uploadSpec = resumableUploadSpec,
+        cancellationSignal = { isCanceled },
+        progressListener = object : SignalServiceAttachment.ProgressListener {
           override fun onAttachmentProgress(total: Long, progress: Long) {
             EventBus.getDefault().postSticky(PartProgressEvent(attachment, PartProgressEvent.Type.NETWORK, total, progress))
             notification?.progress = (progress.toFloat() / total)
@@ -235,58 +218,13 @@ class AttachmentUploadJob private constructor(
           override fun shouldCancel(): Boolean {
             return isCanceled
           }
-        })
-
-      if (MediaUtil.isImageType(attachment.contentType)) {
-        builder.withBlurHash(getImageBlurHash(attachment)).build()
-      } else if (MediaUtil.isVideoType(attachment.contentType)) {
-        builder.withBlurHash(getVideoBlurHash(attachment)).build()
-      } else {
-        builder.build()
-      }
+        }
+      )
     } catch (e: IOException) {
       throw InvalidAttachmentException(e)
     }
   }
 
-  @Throws(IOException::class)
-  private fun getImageBlurHash(attachment: Attachment): String? {
-    if (attachment.blurHash != null) {
-      return attachment.blurHash!!.hash
-    }
-
-    if (attachment.uri == null) {
-      return null
-    }
-
-    return PartAuthority.getAttachmentStream(context, attachment.uri!!).use { inputStream ->
-      BlurHashEncoder.encode(inputStream)
-    }
-  }
-
-  @Throws(IOException::class)
-  private fun getVideoBlurHash(attachment: Attachment): String? {
-    if (attachment.blurHash != null) {
-      return attachment.blurHash!!.hash
-    }
-
-    if (Build.VERSION.SDK_INT < 23) {
-      Log.w(TAG, "Video thumbnails not supported...")
-      return null
-    }
-
-    return MediaUtil.getVideoThumbnail(context, Objects.requireNonNull(attachment.uri), 1000)?.let { bitmap ->
-      val thumb = Bitmap.createScaledBitmap(bitmap, 100, 100, false)
-      bitmap.recycle()
-
-      Log.i(TAG, "Generated video thumbnail...")
-      val hash = BlurHashEncoder.encode(thumb)
-      thumb.recycle()
-
-      hash
-    }
-  }
-
   private inner class InvalidAttachmentException : Exception {
     constructor(message: String?) : super(message)
     constructor(e: Exception?) : super(e)
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 69b8cb54f8..76b9dec005 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/AvatarGroupsV1DownloadJob.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/AvatarGroupsV1DownloadJob.java
@@ -85,7 +85,7 @@ public void onRun() throws IOException {
         attachment.deleteOnExit();
 
         SignalServiceMessageReceiver   receiver    = ApplicationDependencies.getSignalServiceMessageReceiver();
-        SignalServiceAttachmentPointer pointer     = new SignalServiceAttachmentPointer(0, new SignalServiceAttachmentRemoteId(avatarId), contentType, key, Optional.of(0), Optional.empty(), 0, 0, digest, Optional.empty(), 0, fileName, false, false, false, Optional.empty(), Optional.empty(), System.currentTimeMillis());
+        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());
         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/BackupMessagesJob.kt b/app/src/main/java/org/thoughtcrime/securesms/jobs/BackupMessagesJob.kt
new file mode 100644
index 0000000000..7ffbfe67a8
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/BackupMessagesJob.kt
@@ -0,0 +1,121 @@
+/*
+ * Copyright 2024 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.thoughtcrime.securesms.jobs
+
+import android.database.Cursor
+import org.signal.core.util.logging.Log
+import org.thoughtcrime.securesms.BuildConfig
+import org.thoughtcrime.securesms.attachments.DatabaseAttachment
+import org.thoughtcrime.securesms.backup.v2.BackupRepository
+import org.thoughtcrime.securesms.database.SignalDatabase
+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.providers.BlobProvider
+import org.whispersystems.signalservice.api.NetworkResult
+import java.io.FileInputStream
+import java.io.FileOutputStream
+
+/**
+ * Job that is responsible for exporting the DB as a backup proto and
+ * also uploading the resulting proto.
+ */
+class BackupMessagesJob private constructor(parameters: Parameters) : BaseJob(parameters) {
+
+  companion object {
+    private val TAG = Log.tag(BackupMessagesJob::class.java)
+
+    const val KEY = "BackupMessagesJob"
+
+    const val QUEUE = "BackupMessagesQueue"
+
+    fun enqueue() {
+      val jobManager = ApplicationDependencies.getJobManager()
+      jobManager.add(BackupMessagesJob())
+    }
+  }
+
+  constructor() : this(
+    Parameters.Builder()
+      .addConstraint(NetworkConstraint.KEY)
+      .setMaxAttempts(3)
+      .setMaxInstancesForFactory(1)
+      .setQueue(QUEUE)
+      .build()
+  )
+
+  override fun serialize(): ByteArray? = null
+
+  override fun getFactoryKey(): String = KEY
+
+  override fun onFailure() = Unit
+
+  private fun archiveAttachments() {
+    if (BuildConfig.MESSAGE_BACKUP_RESTORE_ENABLED) {
+      SignalStore.backup().canReadWriteToArchiveCdn = true
+    }
+    val batchSize = 100
+    SignalDatabase.attachments.getArchivableAttachments().use { cursor ->
+      while (!cursor.isAfterLast) {
+        val attachments = cursor.readAttachmentBatch(batchSize)
+
+        when (val archiveResult = BackupRepository.archiveMedia(attachments)) {
+          is NetworkResult.Success -> {
+            for (success in archiveResult.result.sourceNotFoundResponses) {
+              val attachmentId = archiveResult.result.mediaIdToAttachmentId(success.mediaId)
+              ApplicationDependencies
+                .getJobManager()
+                .startChain(AttachmentUploadJob(attachmentId))
+                .then(ArchiveAttachmentJob(attachmentId))
+                .enqueue()
+            }
+          }
+
+          else -> {
+            Log.e(TAG, "Failed to archive $archiveResult")
+          }
+        }
+      }
+    }
+  }
+
+  private fun Cursor.readAttachmentBatch(batchSize: Int): List<DatabaseAttachment> {
+    val attachments = ArrayList<DatabaseAttachment>()
+    for (i in 0 until batchSize) {
+      if (this.moveToNext()) {
+        attachments.addAll(SignalDatabase.attachments.getAttachments(this))
+      } else {
+        break
+      }
+    }
+    return attachments
+  }
+
+  override fun onRun() {
+    val tempBackupFile = BlobProvider.getInstance().forNonAutoEncryptingSingleSessionOnDisk(ApplicationDependencies.getApplication())
+
+    val outputStream = FileOutputStream(tempBackupFile)
+    BackupRepository.export(outputStream = outputStream, append = { tempBackupFile.appendBytes(it) }, plaintext = false)
+
+    FileInputStream(tempBackupFile).use {
+      BackupRepository.uploadBackupFile(it, tempBackupFile.length())
+    }
+
+    archiveAttachments()
+    if (!tempBackupFile.delete()) {
+      Log.e(TAG, "Failed to delete temp backup file")
+    }
+  }
+
+  override fun onShouldRetry(e: Exception): Boolean = false
+
+  class Factory : Job.Factory<BackupMessagesJob> {
+    override fun create(parameters: Parameters, serializedData: ByteArray?): BackupMessagesJob {
+      return BackupMessagesJob(parameters)
+    }
+  }
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/BackupRestoreJob.kt b/app/src/main/java/org/thoughtcrime/securesms/jobs/BackupRestoreJob.kt
new file mode 100644
index 0000000000..274795e7ba
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/BackupRestoreJob.kt
@@ -0,0 +1,105 @@
+/*
+ * 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.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.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.providers.BlobProvider
+import org.thoughtcrime.securesms.recipients.Recipient
+import org.thoughtcrime.securesms.service.BackupProgressService
+import org.whispersystems.signalservice.api.messages.SignalServiceAttachment.ProgressListener
+import java.io.IOException
+
+/**
+ * Job that is responsible for restoring a backup from the server
+ */
+class BackupRestoreJob private constructor(parameters: Parameters) : BaseJob(parameters) {
+
+  companion object {
+    private val TAG = Log.tag(BackupRestoreJob::class.java)
+
+    const val KEY = "BackupRestoreJob"
+  }
+
+  constructor() : this(
+    Parameters.Builder()
+      .addConstraint(NetworkConstraint.KEY)
+      .setMaxAttempts(Parameters.UNLIMITED)
+      .setMaxInstancesForFactory(1)
+      .build()
+  )
+
+  override fun serialize(): ByteArray? = null
+
+  override fun getFactoryKey(): String = KEY
+
+  override fun onFailure() = Unit
+
+  override fun onAdded() {
+    SignalStore.backup().restoreState = RestoreState.PENDING
+  }
+
+  override fun onRun() {
+    if (!SignalStore.account().isRegistered) {
+      Log.e(TAG, "Not registered, cannot restore!")
+      throw NotPushRegisteredException()
+    }
+
+    BackupProgressService.start(context, context.getString(R.string.BackupProgressService_title)).use {
+      restore(it)
+    }
+  }
+
+  private fun restore(controller: BackupProgressService.Controller) {
+    SignalStore.backup().restoreState = RestoreState.RESTORING_DB
+
+    val progressListener = object : ProgressListener {
+      override fun onAttachmentProgress(total: Long, progress: Long) {
+        controller.update(
+          title = context.getString(R.string.BackupProgressService_title_downloading),
+          progress = progress.toFloat() / total.toFloat(),
+          indeterminate = false
+        )
+      }
+
+      override fun shouldCancel() = isCanceled
+    }
+
+    val tempBackupFile = BlobProvider.getInstance().forNonAutoEncryptingSingleSessionOnDisk(ApplicationDependencies.getApplication())
+    if (!BackupRepository.downloadBackupFile(tempBackupFile, progressListener)) {
+      Log.e(TAG, "Failed to download backup file")
+      throw IOException()
+    }
+
+    controller.update(
+      title = context.getString(R.string.BackupProgressService_title),
+      progress = 0f,
+      indeterminate = true
+    )
+
+    val self = Recipient.self()
+    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
+  }
+
+  override fun onShouldRetry(e: Exception): Boolean = false
+
+  class Factory : Job.Factory<BackupRestoreJob> {
+    override fun create(parameters: Parameters, serializedData: ByteArray?): BackupRestoreJob {
+      return BackupRestoreJob(parameters)
+    }
+  }
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/BackupRestoreMediaJob.kt b/app/src/main/java/org/thoughtcrime/securesms/jobs/BackupRestoreMediaJob.kt
new file mode 100644
index 0000000000..039a5ef531
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/BackupRestoreMediaJob.kt
@@ -0,0 +1,83 @@
+/*
+ * 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.database.SignalDatabase
+import org.thoughtcrime.securesms.database.model.MmsMessageRecord
+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.net.NotPushRegisteredException
+import kotlin.time.Duration.Companion.days
+
+/**
+ * Job that is responsible for enqueueing attachment download
+ * jobs upon restore.
+ */
+class BackupRestoreMediaJob private constructor(parameters: Parameters) : BaseJob(parameters) {
+
+  companion object {
+    private val TAG = Log.tag(BackupRestoreMediaJob::class.java)
+
+    const val KEY = "BackupRestoreMediaJob"
+  }
+
+  constructor() : this(
+    Parameters.Builder()
+      .addConstraint(NetworkConstraint.KEY)
+      .setMaxAttempts(Parameters.UNLIMITED)
+      .setMaxInstancesForFactory(2)
+      .build()
+  )
+
+  override fun serialize(): ByteArray? = null
+
+  override fun getFactoryKey(): String = KEY
+
+  override fun onFailure() = Unit
+
+  override fun onRun() {
+    if (!SignalStore.account().isRegistered) {
+      Log.e(TAG, "Not registered, cannot restore!")
+      throw NotPushRegisteredException()
+    }
+
+    val jobManager = ApplicationDependencies.getJobManager()
+    val batchSize = 100
+    val restoreTime = System.currentTimeMillis()
+    var restoreJobBatch: List<RestoreAttachmentJob>
+    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,
+          fullSize = shouldRestoreFullSize(message, restoreTime, optimizeStorage = SignalStore.backup().optimizeStorage)
+        )
+      }
+      jobManager.addAll(restoreJobBatch)
+    } while (restoreJobBatch.isNotEmpty())
+  }
+
+  private fun shouldRestoreFullSize(message: MmsMessageRecord, restoreTime: Long, optimizeStorage: Boolean): Boolean {
+    return ((restoreTime - message.dateSent) < 30.days.inWholeMilliseconds) || !optimizeStorage
+  }
+
+  override fun onShouldRetry(e: Exception): Boolean = false
+
+  class Factory : Job.Factory<BackupRestoreMediaJob> {
+    override fun create(parameters: Parameters, serializedData: ByteArray?): BackupRestoreMediaJob {
+      return BackupRestoreMediaJob(parameters)
+    }
+  }
+}
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 3a37011999..dee97ce24d 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/CallLinkUpdateSendJob.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/CallLinkUpdateSendJob.kt
@@ -78,6 +78,7 @@ class CallLinkUpdateSendJob private constructor(
 
     val callLinkUpdate = CallLinkUpdate(
       rootKey = callLink.credentials.linkKeyBytes.toByteString(),
+      adminPassKey = callLink.credentials.adminPassBytes?.toByteString(),
       type = callLinkUpdateType
     )
 
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 b087aa260a..81de40c107 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/CallLogEventSendJob.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/CallLogEventSendJob.kt
@@ -66,6 +66,25 @@ class CallLogEventSendJob private constructor(
         type = SyncMessage.CallLogEvent.Type.MARKED_AS_READ
       )
     )
+
+    @JvmStatic
+    @WorkerThread
+    fun forMarkedAsReadInConversation(
+      call: CallTable.Call
+    ) = CallLogEventSendJob(
+      Parameters.Builder()
+        .setQueue("CallLogEventSendJob")
+        .setLifespan(TimeUnit.DAYS.toMillis(1))
+        .setMaxAttempts(Parameters.UNLIMITED)
+        .addConstraint(NetworkConstraint.KEY)
+        .build(),
+      SyncMessage.CallLogEvent(
+        timestamp = call.timestamp,
+        callId = call.callId,
+        conversationId = Recipient.resolved(call.peer).requireCallConversationId().toByteString(),
+        type = SyncMessage.CallLogEvent.Type.MARKED_AS_READ_IN_CONVERSATION
+      )
+    )
   }
 
   override fun serialize(): ByteArray = CallLogEventSendJobData.Builder()
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 81a1701d94..8a98a9c46f 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/CheckServiceReachabilityJob.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/CheckServiceReachabilityJob.kt
@@ -9,7 +9,7 @@ import org.thoughtcrime.securesms.keyvalue.SignalStore
 import org.thoughtcrime.securesms.stories.Stories
 import org.whispersystems.signalservice.api.websocket.WebSocketConnectionState
 import org.whispersystems.signalservice.internal.util.StaticCredentialsProvider
-import org.whispersystems.signalservice.internal.websocket.WebSocketConnection
+import org.whispersystems.signalservice.internal.websocket.OkHttpWebSocketConnection
 import java.util.Optional
 import java.util.concurrent.TimeUnit
 
@@ -64,7 +64,7 @@ class CheckServiceReachabilityJob private constructor(params: Parameters) : Base
 
     SignalStore.misc().lastCensorshipServiceReachabilityCheckTime = System.currentTimeMillis()
 
-    val uncensoredWebsocket = WebSocketConnection(
+    val uncensoredWebsocket = OkHttpWebSocketConnection(
       "uncensored-test",
       ApplicationDependencies.getSignalServiceNetworkAccess().uncensoredConfiguration,
       Optional.of(
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 7cac0276a1..2db2cc55fd 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/JobManagerFactories.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/JobManagerFactories.java
@@ -94,6 +94,8 @@ public static Map<String, Job.Factory> getJobFactories(@NonNull Application appl
       put(AccountConsistencyWorkerJob.KEY,           new AccountConsistencyWorkerJob.Factory());
       put(AllDataSyncRequestJob.KEY,                 new AllDataSyncRequestJob.Factory());
       put(AnalyzeDatabaseJob.KEY,                    new AnalyzeDatabaseJob.Factory());
+      put(ArchiveAttachmentJob.KEY,                  new ArchiveAttachmentJob.Factory());
+      put(ArchiveAttachmentBackfillJob.KEY,          new ArchiveAttachmentBackfillJob.Factory());
       put(AttachmentCompressionJob.KEY,              new AttachmentCompressionJob.Factory());
       put(AttachmentCopyJob.KEY,                     new AttachmentCopyJob.Factory());
       put(AttachmentDownloadJob.KEY,                 new AttachmentDownloadJob.Factory());
@@ -103,6 +105,9 @@ public static Map<String, Job.Factory> getJobFactories(@NonNull Application appl
       put(AutomaticSessionResetJob.KEY,              new AutomaticSessionResetJob.Factory());
       put(AvatarGroupsV1DownloadJob.KEY,             new AvatarGroupsV1DownloadJob.Factory());
       put(AvatarGroupsV2DownloadJob.KEY,             new AvatarGroupsV2DownloadJob.Factory());
+      put(BackupMessagesJob.KEY,                     new BackupMessagesJob.Factory());
+      put(BackupRestoreJob.KEY,                      new BackupRestoreJob.Factory());
+      put(BackupRestoreMediaJob.KEY,                 new BackupRestoreMediaJob.Factory());
       put("BoostReceiptCredentialsSubmissionJob",    new FailingJob.Factory());
       put(CallLinkPeekJob.KEY,                       new CallLinkPeekJob.Factory());
       put(CallLinkUpdateSendJob.KEY,                 new CallLinkUpdateSendJob.Factory());
@@ -187,6 +192,7 @@ public static Map<String, Job.Factory> getJobFactories(@NonNull Application appl
       put(ResumableUploadSpecJob.KEY,                new ResumableUploadSpecJob.Factory());
       put(RequestGroupV2InfoWorkerJob.KEY,           new RequestGroupV2InfoWorkerJob.Factory());
       put(RequestGroupV2InfoJob.KEY,                 new RequestGroupV2InfoJob.Factory());
+      put(RestoreAttachmentJob.KEY,                  new RestoreAttachmentJob.Factory());
       put(RetrieveProfileAvatarJob.KEY,              new RetrieveProfileAvatarJob.Factory());
       put(RetrieveProfileJob.KEY,                    new RetrieveProfileJob.Factory());
       put(RetrieveRemoteAnnouncementsJob.KEY,        new RetrieveRemoteAnnouncementsJob.Factory());
@@ -212,6 +218,7 @@ public static Map<String, Job.Factory> getJobFactories(@NonNull Application appl
       put(StoryOnboardingDownloadJob.KEY,            new StoryOnboardingDownloadJob.Factory());
       put(SubmitRateLimitPushChallengeJob.KEY,       new SubmitRateLimitPushChallengeJob.Factory());
       put(Svr2MirrorJob.KEY,                         new Svr2MirrorJob.Factory());
+      put(SyncArchivedMediaJob.KEY,                  new SyncArchivedMediaJob.Factory());
       put(ThreadUpdateJob.KEY,                       new ThreadUpdateJob.Factory());
       put(TrimThreadJob.KEY,                         new TrimThreadJob.Factory());
       put(TypingSendJob.KEY,                         new TypingSendJob.Factory());
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 35a6e7cf0f..fb79eda0d5 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/PreKeysSyncJob.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/PreKeysSyncJob.kt
@@ -269,7 +269,7 @@ class PreKeysSyncJob private constructor(
 
     return when (result) {
       is NetworkResult.Success -> true
-      is NetworkResult.NetworkError -> throw result.throwable ?: PushNetworkException("Network error")
+      is NetworkResult.NetworkError -> throw result.exception ?: PushNetworkException("Network error")
       is NetworkResult.ApplicationError -> throw result.throwable
       is NetworkResult.StatusCodeError -> if (result.code == 409) {
         false
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 83b25dd2fb..5781de9aa9 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/PushSendJob.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/PushSendJob.java
@@ -288,7 +288,7 @@ protected static Set<String> enqueueCompressingAndUploadAttachmentsChains(@NonNu
         }
       }
 
-      return new SignalServiceAttachmentPointer(attachment.cdnNumber,
+      return new SignalServiceAttachmentPointer(attachment.cdn.getCdnNumber(),
                                                 remoteId,
                                                 attachment.contentType,
                                                 key,
diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/RestoreAttachmentJob.kt b/app/src/main/java/org/thoughtcrime/securesms/jobs/RestoreAttachmentJob.kt
new file mode 100644
index 0000000000..88eb206e92
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/RestoreAttachmentJob.kt
@@ -0,0 +1,400 @@
+/*
+ * 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.greenrobot.eventbus.EventBus
+import org.signal.core.util.Base64
+import org.signal.core.util.Hex
+import org.signal.core.util.logging.Log
+import org.signal.libsignal.protocol.InvalidMacException
+import org.signal.libsignal.protocol.InvalidMessageException
+import org.thoughtcrime.securesms.attachments.AttachmentId
+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.events.PartProgressEvent
+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.jobmanager.persistence.JobSpec
+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.Util
+import org.whispersystems.signalservice.api.backup.MediaName
+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.MissingConfigurationException
+import org.whispersystems.signalservice.api.push.exceptions.NonSuccessfulResponseCodeException
+import org.whispersystems.signalservice.api.push.exceptions.PushNetworkException
+import org.whispersystems.signalservice.api.push.exceptions.RangeException
+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 RestoreAttachmentJob private constructor(
+  parameters: Parameters,
+  private val messageId: Long,
+  attachmentId: AttachmentId,
+  private val manual: Boolean,
+  private var forceArchiveDownload: Boolean,
+  private val fullSize: Boolean
+) : BaseJob(parameters) {
+
+  companion object {
+    const val KEY = "RestoreAttachmentJob"
+    private val TAG = Log.tag(AttachmentDownloadJob::class.java)
+
+    private const val KEY_MESSAGE_ID = "message_id"
+    private const val KEY_ATTACHMENT_ID = "part_row_id"
+    private const val KEY_MANUAL = "part_manual"
+    private const val KEY_FORCE_ARCHIVE = "force_archive"
+    private const val KEY_FULL_SIZE = "full_size"
+
+    @JvmStatic
+    fun constructQueueString(attachmentId: AttachmentId): String {
+      // TODO: decide how many queues
+      return "RestoreAttachmentJob"
+    }
+
+    fun jobSpecMatchesAnyAttachmentId(jobSpec: JobSpec, ids: Set<AttachmentId>): Boolean {
+      if (KEY != jobSpec.factoryKey) {
+        return false
+      }
+
+      val serializedData = jobSpec.serializedData ?: return false
+      val data = JsonJobData.deserialize(serializedData)
+      val parsed = AttachmentId(data.getLong(KEY_ATTACHMENT_ID))
+      return ids.contains(parsed)
+    }
+
+    fun modifyPriorities(ids: Set<AttachmentId>, priority: Int) {
+      val jobManager = ApplicationDependencies.getJobManager()
+      jobManager.update { spec ->
+        if (jobSpecMatchesAnyAttachmentId(spec, ids) && spec.priority != priority) {
+          spec.copy(priority = priority)
+        } else {
+          spec
+        }
+      }
+    }
+  }
+
+  private val attachmentId: Long
+
+  constructor(messageId: Long, attachmentId: AttachmentId, manual: Boolean, forceArchiveDownload: Boolean = false, fullSize: Boolean = true) : this(
+    Parameters.Builder()
+      .setQueue(constructQueueString(attachmentId))
+      .addConstraint(NetworkConstraint.KEY)
+      .setLifespan(TimeUnit.DAYS.toMillis(1))
+      .setMaxAttempts(Parameters.UNLIMITED)
+      .build(),
+    messageId,
+    attachmentId,
+    manual,
+    forceArchiveDownload,
+    fullSize
+  )
+
+  init {
+    this.attachmentId = attachmentId.id
+  }
+
+  override fun serialize(): ByteArray? {
+    return JsonJobData.Builder()
+      .putLong(KEY_MESSAGE_ID, messageId)
+      .putLong(KEY_ATTACHMENT_ID, attachmentId)
+      .putBoolean(KEY_MANUAL, manual)
+      .putBoolean(KEY_FORCE_ARCHIVE, forceArchiveDownload)
+      .putBoolean(KEY_FULL_SIZE, fullSize)
+      .serialize()
+  }
+
+  override fun getFactoryKey(): String {
+    return KEY
+  }
+
+  override fun onAdded() {
+    Log.i(TAG, "onAdded() messageId: $messageId  attachmentId: $attachmentId  manual: $manual")
+
+    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) {
+      Log.i(TAG, "onAdded() Marking attachment restore progress as 'started'")
+      SignalDatabase.attachments.setTransferState(messageId, attachmentId, AttachmentTable.TRANSFER_RESTORE_IN_PROGRESS)
+    }
+  }
+
+  @Throws(Exception::class)
+  public override fun onRun() {
+    doWork()
+
+    if (!SignalDatabase.messages.isStory(messageId)) {
+      ApplicationDependencies.getMessageNotifier().updateNotification(context, forConversation(0))
+    }
+  }
+
+  @Throws(IOException::class, RetryLaterException::class)
+  fun doWork() {
+    Log.i(TAG, "onRun() messageId: $messageId  attachmentId: $attachmentId  manual: $manual")
+
+    val attachmentId = AttachmentId(attachmentId)
+    val attachment = SignalDatabase.attachments.getAttachment(attachmentId)
+
+    if (attachment == null) {
+      Log.w(TAG, "attachment no longer exists.")
+      return
+    }
+
+    if (attachment.isPermanentlyFailed) {
+      Log.w(TAG, "Attachment was marked as a permanent failure. Refusing to download.")
+      return
+    }
+
+    if (attachment.transferState != AttachmentTable.TRANSFER_NEEDS_RESTORE && attachment.transferState != AttachmentTable.TRANSFER_RESTORE_IN_PROGRESS) {
+      Log.w(TAG, "Attachment does not need to be restored.")
+      return
+    }
+
+    retrieveAttachment(messageId, attachmentId, attachment)
+  }
+
+  override fun onFailure() {
+    Log.w(TAG, format(this, "onFailure() messageId: $messageId  attachmentId: $attachmentId  manual: $manual"))
+
+    val attachmentId = AttachmentId(attachmentId)
+    markFailed(messageId, attachmentId)
+  }
+
+  override fun onShouldRetry(exception: Exception): Boolean {
+    return exception is PushNetworkException ||
+      exception is RetryLaterException
+  }
+
+  @Throws(IOException::class, RetryLaterException::class)
+  private fun retrieveAttachment(
+    messageId: Long,
+    attachmentId: AttachmentId,
+    attachment: DatabaseAttachment
+  ) {
+    val maxReceiveSize: Long = FeatureFlags.maxAttachmentReceiveSizeBytes()
+    val attachmentFile: File = SignalDatabase.attachments.getOrCreateTransferFile(attachmentId)
+    var archiveFile: File? = null
+    var useArchiveCdn = false
+
+    try {
+      if (attachment.size > maxReceiveSize) {
+        throw MmsException("Attachment too large, failing download")
+      }
+
+      useArchiveCdn = if (SignalStore.backup().canReadWriteToArchiveCdn && (forceArchiveDownload || attachment.remoteLocation == null)) {
+        if (attachment.archiveMediaName.isNullOrEmpty()) {
+          throw InvalidPartException("Invalid attachment configuration")
+        }
+        true
+      } else {
+        false
+      }
+
+      val messageReceiver = ApplicationDependencies.getSignalServiceMessageReceiver()
+      val pointer = createAttachmentPointer(attachment, useArchiveCdn)
+
+      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 {
+          return this@RestoreAttachmentJob.isCanceled
+        }
+      }
+
+      val stream = if (useArchiveCdn) {
+        archiveFile = SignalDatabase.attachments.getOrCreateArchiveTransferFile(attachmentId)
+        val cdnCredentials = BackupRepository.getCdnReadCredentials(attachment.archiveCdn).successOrThrow().headers
+
+        messageReceiver
+          .retrieveArchivedAttachment(
+            SignalStore.svr().getOrCreateMasterKey().deriveBackupKey().deriveMediaSecrets(MediaName(attachment.archiveMediaName!!)),
+            cdnCredentials,
+            archiveFile,
+            pointer,
+            attachmentFile,
+            maxReceiveSize,
+            progressListener
+          )
+      } else {
+        messageReceiver
+          .retrieveAttachment(
+            pointer,
+            attachmentFile,
+            maxReceiveSize,
+            progressListener
+          )
+      }
+
+      SignalDatabase.attachments.finalizeAttachmentAfterDownload(messageId, attachmentId, stream)
+    } catch (e: RangeException) {
+      val transferFile = archiveFile ?: attachmentFile
+      Log.w(TAG, "Range exception, file size " + transferFile.length(), e)
+      if (transferFile.delete()) {
+        Log.i(TAG, "Deleted temp download file to recover")
+        throw RetryLaterException(e)
+      } else {
+        throw IOException("Failed to delete temp download file following range exception")
+      }
+    } catch (e: InvalidPartException) {
+      Log.w(TAG, "Experienced exception while trying to download an attachment.", e)
+      markFailed(messageId, attachmentId)
+    } catch (e: NonSuccessfulResponseCodeException) {
+      if (SignalStore.backup().canReadWriteToArchiveCdn) {
+        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
+          throw RetryLaterException(e)
+        }
+      }
+
+      Log.w(TAG, "Experienced exception while trying to download an attachment.", e)
+      markFailed(messageId, attachmentId)
+    } catch (e: MmsException) {
+      Log.w(TAG, "Experienced exception while trying to download an attachment.", e)
+      markFailed(messageId, attachmentId)
+    } catch (e: MissingConfigurationException) {
+      Log.w(TAG, "Experienced exception while trying to download an attachment.", e)
+      markFailed(messageId, attachmentId)
+    } catch (e: InvalidMessageException) {
+      Log.w(TAG, "Experienced an InvalidMessageException while trying to download an attachment.", e)
+      if (e.cause is InvalidMacException) {
+        Log.w(TAG, "Detected an invalid mac. Treating as a permanent failure.")
+        markPermanentlyFailed(messageId, attachmentId)
+      } else {
+        markFailed(messageId, attachmentId)
+      }
+    }
+  }
+
+  @Throws(InvalidPartException::class)
+  private fun createAttachmentPointer(attachment: DatabaseAttachment, useArchiveCdn: Boolean): SignalServiceAttachmentPointer {
+    if (TextUtils.isEmpty(attachment.remoteKey)) {
+      throw InvalidPartException("empty encrypted key")
+    }
+
+    return try {
+      val remoteData: RemoteData = if (useArchiveCdn) {
+        val backupKey = SignalStore.svr().getOrCreateMasterKey().deriveBackupKey()
+        val backupDirectories = BackupRepository.getCdnBackupDirectories().successOrThrow()
+
+        RemoteData(
+          remoteId = SignalServiceAttachmentRemoteId.Backup(
+            backupDir = backupDirectories.backupDir,
+            mediaDir = backupDirectories.mediaDir,
+            mediaId = backupKey.deriveMediaId(MediaName(attachment.archiveMediaName!!)).encode()
+          ),
+          cdnNumber = attachment.archiveCdn
+        )
+      } else {
+        if (attachment.remoteLocation.isNullOrEmpty()) {
+          throw InvalidPartException("empty content id")
+        }
+
+        RemoteData(
+          remoteId = SignalServiceAttachmentRemoteId.from(attachment.remoteLocation),
+          cdnNumber = attachment.cdn.cdnNumber
+        )
+      }
+
+      val key = Base64.decode(attachment.remoteKey!!)
+
+      if (attachment.remoteDigest != null) {
+        Log.i(TAG, "Downloading attachment with digest: " + Hex.toString(attachment.remoteDigest))
+      } else {
+        Log.i(TAG, "Downloading attachment with no digest...")
+      }
+
+      SignalServiceAttachmentPointer(
+        remoteData.cdnNumber,
+        remoteData.remoteId,
+        null,
+        key,
+        Optional.of(Util.toIntExact(attachment.size)),
+        Optional.empty(),
+        0,
+        0,
+        Optional.ofNullable(attachment.remoteDigest),
+        Optional.ofNullable(attachment.getIncrementalDigest()),
+        attachment.incrementalMacChunkSize,
+        Optional.ofNullable(attachment.fileName),
+        attachment.voiceNote,
+        attachment.borderless,
+        attachment.videoGif,
+        Optional.empty(),
+        Optional.ofNullable(attachment.blurHash).map { it.hash },
+        attachment.uploadTimestamp
+      )
+    } catch (e: IOException) {
+      Log.w(TAG, e)
+      throw InvalidPartException(e)
+    } catch (e: ArithmeticException) {
+      Log.w(TAG, e)
+      throw InvalidPartException(e)
+    }
+  }
+
+  private fun markFailed(messageId: Long, attachmentId: AttachmentId) {
+    try {
+      SignalDatabase.attachments.setTransferProgressFailed(attachmentId, messageId)
+    } catch (e: MmsException) {
+      Log.w(TAG, e)
+    }
+  }
+
+  private fun markPermanentlyFailed(messageId: Long, attachmentId: AttachmentId) {
+    try {
+      SignalDatabase.attachments.setTransferProgressPermanentFailure(attachmentId, messageId)
+    } catch (e: MmsException) {
+      Log.w(TAG, e)
+    }
+  }
+
+  @VisibleForTesting
+  internal class InvalidPartException : Exception {
+    constructor(s: String?) : super(s)
+    constructor(e: Exception?) : super(e)
+  }
+
+  private data class RemoteData(val remoteId: SignalServiceAttachmentRemoteId, val cdnNumber: Int)
+
+  class Factory : Job.Factory<RestoreAttachmentJob?> {
+    override fun create(parameters: Parameters, serializedData: ByteArray?): RestoreAttachmentJob {
+      val data = JsonJobData.deserialize(serializedData)
+      return RestoreAttachmentJob(
+        parameters = parameters,
+        messageId = data.getLong(KEY_MESSAGE_ID),
+        attachmentId = AttachmentId(data.getLong(KEY_ATTACHMENT_ID)),
+        manual = data.getBoolean(KEY_MANUAL),
+        forceArchiveDownload = data.getBooleanOrDefault(KEY_FORCE_ARCHIVE, false),
+        fullSize = data.getBooleanOrDefault(KEY_FULL_SIZE, true)
+      )
+    }
+  }
+}
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 c3163d2f8a..37dd5a5f97 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/RetrieveProfileJob.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/RetrieveProfileJob.kt
@@ -385,6 +385,20 @@ class RetrieveProfileJob private constructor(parameters: Parameters, private val
           Log.i(TAG, "Name changed, but wasn't relevant to write an event. blocked: ${recipient.isBlocked}, group: ${recipient.isGroup}, self: ${recipient.isSelf}, firstSet: ${localDisplayName.isEmpty()}, displayChange: ${remoteDisplayName != localDisplayName}")
         }
 
+        if (recipient.isIndividual &&
+          !recipient.isSystemContact &&
+          !recipient.nickname.isEmpty &&
+          !recipient.isProfileSharing &&
+          !recipient.isBlocked &&
+          !recipient.isSelf &&
+          !recipient.isHidden
+        ) {
+          val threadId = SignalDatabase.threads.getThreadIdFor(recipient.id)
+          if (threadId != null && !RecipientUtil.isMessageRequestAccepted(threadId, recipient)) {
+            SignalDatabase.nameCollisions.handleIndividualNameCollision(recipient.id)
+          }
+        }
+
         if (writeChangeEvent || localDisplayName.isEmpty()) {
           ApplicationDependencies.getDatabaseObserver().notifyConversationListListeners()
           val threadId = SignalDatabase.threads.getThreadIdFor(recipient.id)
diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/SyncArchivedMediaJob.kt b/app/src/main/java/org/thoughtcrime/securesms/jobs/SyncArchivedMediaJob.kt
new file mode 100644
index 0000000000..45fd928d09
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/SyncArchivedMediaJob.kt
@@ -0,0 +1,107 @@
+/*
+ * 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.core.util.withinTransaction
+import org.thoughtcrime.securesms.backup.v2.ArchivedMediaObject
+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.whispersystems.signalservice.api.archive.ArchiveGetMediaItemsResponse
+import org.whispersystems.signalservice.api.push.exceptions.NetworkFailureException
+import java.lang.Exception
+
+/**
+ * Job responsible for keeping remote archive media objects in sync. That is
+ * we make sure our CDN number aligns on all media ids, as well as deleting any
+ * extra media ids that we don't know about.
+ */
+class SyncArchivedMediaJob private constructor(
+  parameters: Parameters,
+  private var jobCursor: String?
+) : BaseJob(parameters) {
+
+  companion object {
+    private val TAG = Log.tag(BackupRestoreMediaJob::class.java)
+
+    private const val KEY_CURSOR = "cursor"
+
+    const val KEY = "SyncArchivedMediaJob"
+  }
+
+  constructor(cursor: String? = null) : this(
+    Parameters.Builder()
+      .setQueue("SyncArchivedMedia")
+      .setMaxAttempts(Parameters.UNLIMITED)
+      .setMaxInstancesForQueue(2)
+      .build(),
+    cursor
+  )
+
+  override fun serialize(): ByteArray? {
+    return JsonJobData.Builder()
+      .putString(KEY_CURSOR, jobCursor)
+      .serialize()
+  }
+
+  override fun getFactoryKey(): String = KEY
+
+  override fun onFailure() = Unit
+
+  override fun onRun() {
+    val batchSize = 100
+    val attachmentsToDelete = HashSet<ArchivedMediaObject>()
+    var cursor: String? = jobCursor
+    do {
+      val archivedItemPage = BackupRepository.listRemoteMediaObjects(batchSize, cursor).successOrThrow()
+      attachmentsToDelete += syncPage(archivedItemPage)
+      cursor = archivedItemPage.cursor
+      if (attachmentsToDelete.size >= batchSize) {
+        BackupRepository.deleteAbandonedMediaObjects(attachmentsToDelete)
+        Log.i(TAG, "Deleted ${attachmentsToDelete.size} attachments off CDN")
+        attachmentsToDelete.clear()
+      }
+      if (attachmentsToDelete.isEmpty()) {
+        jobCursor = archivedItemPage.cursor
+      }
+    } while (cursor != null)
+
+    if (attachmentsToDelete.isNotEmpty()) {
+      BackupRepository.deleteAbandonedMediaObjects(attachmentsToDelete)
+      Log.i(TAG, "Deleted ${attachmentsToDelete.size} attachments off CDN")
+    }
+  }
+
+  /**
+   * Update CDNs of archived media items. Returns set of objects that don't match
+   * to a local attachment DB row.
+   */
+  private fun syncPage(archivedItemPage: ArchiveGetMediaItemsResponse): Set<ArchivedMediaObject> {
+    val abandonedObjects = HashSet<ArchivedMediaObject>()
+    SignalDatabase.rawDatabase.withinTransaction {
+      archivedItemPage.storedMediaObjects.forEach { storedMediaObject ->
+        val rows = SignalDatabase.attachments.updateArchiveCdnByMediaId(archiveMediaId = storedMediaObject.mediaId, archiveCdn = storedMediaObject.cdn)
+        if (rows == 0) {
+          abandonedObjects.add(ArchivedMediaObject(storedMediaObject.mediaId, storedMediaObject.cdn))
+        }
+      }
+    }
+    return abandonedObjects
+  }
+
+  override fun onShouldRetry(e: Exception): Boolean {
+    return e is NetworkFailureException
+  }
+
+  class Factory : Job.Factory<SyncArchivedMediaJob> {
+    override fun create(parameters: Parameters, serializedData: ByteArray?): SyncArchivedMediaJob {
+      val data = JsonJobData.deserialize(serializedData)
+      return SyncArchivedMediaJob(parameters, if (data.hasString(KEY_CURSOR)) data.getString(KEY_CURSOR) else null)
+    }
+  }
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/SyncSystemContactLinksJob.kt b/app/src/main/java/org/thoughtcrime/securesms/jobs/SyncSystemContactLinksJob.kt
index 518dd7ccca..dd677e3766 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/SyncSystemContactLinksJob.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/SyncSystemContactLinksJob.kt
@@ -11,10 +11,12 @@ import org.signal.core.util.Stopwatch
 import org.signal.core.util.logging.Log
 import org.thoughtcrime.securesms.BuildConfig
 import org.thoughtcrime.securesms.R
+import org.thoughtcrime.securesms.contacts.sync.ContactDiscovery
 import org.thoughtcrime.securesms.database.SignalDatabase
 import org.thoughtcrime.securesms.jobmanager.Job
 import org.thoughtcrime.securesms.permissions.Permissions
 import org.thoughtcrime.securesms.phonenumbers.PhoneNumberFormatter
+import org.thoughtcrime.securesms.storage.StorageSyncHelper
 import java.lang.Exception
 
 /**
@@ -71,6 +73,11 @@ class SyncSystemContactLinksJob private constructor(parameters: Parameters) : Ba
       )
       stopwatch.split("add-links")
 
+      // Adding links changes how certain structured name records are stored, so we need to re-sync to make sure we get the latest structured name
+      ContactDiscovery.syncRecipientInfoWithSystemContacts(context)
+      StorageSyncHelper.scheduleSyncForDataChange()
+      stopwatch.split("sync-contact-info")
+
       stopwatch.stop(TAG)
     } catch (e: RemoteException) {
       Log.w(TAG, "[addSystemContactLinks] Failed to add links to contacts.", e)
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 bf6d8f058c..f60dc8dcd8 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/keyvalue/BackupValues.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/keyvalue/BackupValues.kt
@@ -2,21 +2,69 @@ package org.thoughtcrime.securesms.keyvalue
 
 import com.fasterxml.jackson.annotation.JsonProperty
 import org.signal.core.util.logging.Log
+import org.thoughtcrime.securesms.backup.RestoreState
 import org.whispersystems.signalservice.api.archive.ArchiveServiceCredential
+import org.whispersystems.signalservice.api.archive.GetArchiveCdnCredentialsResponse
 import org.whispersystems.signalservice.internal.util.JsonUtil
 import java.io.IOException
 import kotlin.time.Duration
 import kotlin.time.Duration.Companion.days
+import kotlin.time.Duration.Companion.hours
 
 internal class BackupValues(store: KeyValueStore) : SignalStoreValues(store) {
   companion object {
     val TAG = Log.tag(BackupValues::class.java)
-    val KEY_CREDENTIALS = "backup.credentials"
+    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_NEXT_BACKUP_TIME = "backup.nextBackupTime"
+
+    private const val KEY_CDN_BACKUP_DIRECTORY = "backup.cdn.directory"
+    private const val KEY_CDN_BACKUP_MEDIA_DIRECTORY = "backup.cdn.mediaDirectory"
+
+    private const val KEY_OPTIMIZE_STORAGE = "backup.optimizeStorage"
+    private const val KEY_BACKUPS_INITIALIZED = "backup.initialized"
+
+    /**
+     * Specifies whether remote backups are enabled on this device.
+     */
+    private const val KEY_BACKUPS_ENABLED = "backup.enabled"
+
+    private val cachedCdnCredentialsExpiresIn: Duration = 12.hours
   }
 
+  private var cachedCdnCredentialsTimestamp: Long by longValue(KEY_CDN_READ_CREDENTIALS_TIMESTAMP, 0L)
+  private var cachedCdnCredentials: String? by stringValue(KEY_CDN_READ_CREDENTIALS, null)
+  var cachedBackupDirectory: String? by stringValue(KEY_CDN_BACKUP_DIRECTORY, null)
+  var cachedBackupMediaDirectory: String? by stringValue(KEY_CDN_BACKUP_MEDIA_DIRECTORY, null)
+
   override fun onFirstEverAppLaunch() = Unit
   override fun getKeysToIncludeInBackup(): List<String> = emptyList()
 
+  var canReadWriteToArchiveCdn: Boolean by booleanValue(KEY_CDN_CAN_READ_WRITE, false)
+  var restoreState: RestoreState by enumValue(KEY_RESTORE_STATE, RestoreState.NONE, RestoreState.serializer)
+  var optimizeStorage: Boolean by booleanValue(KEY_OPTIMIZE_STORAGE, false)
+
+  var nextBackupTime: Long by longValue(KEY_NEXT_BACKUP_TIME, -1)
+
+  var areBackupsEnabled: Boolean
+    get() {
+      return getBoolean(KEY_BACKUPS_ENABLED, false)
+    }
+    set(value) {
+      store
+        .beginWrite()
+        .putBoolean(KEY_BACKUPS_ENABLED, value)
+        .putLong(KEY_NEXT_BACKUP_TIME, -1)
+        .putBoolean(KEY_BACKUPS_INITIALIZED, false)
+        .apply()
+    }
+
+  var backupsInitialized: Boolean by booleanValue(KEY_BACKUPS_INITIALIZED, false)
+
   /**
    * Retrieves the stored credentials, mapped by the day they're valid. The day is represented as
    * the unix time (in seconds) of the start of the day. Wrapped in a [ArchiveServiceCredentials]
@@ -36,6 +84,28 @@ internal class BackupValues(store: KeyValueStore) : SignalStoreValues(store) {
       }
     }
 
+  var cdnReadCredentials: GetArchiveCdnCredentialsResponse?
+    get() {
+      val cacheAge = System.currentTimeMillis() - cachedCdnCredentialsTimestamp
+      val cached = cachedCdnCredentials
+
+      return if (cached != null && (cacheAge > 0 && cacheAge < cachedCdnCredentialsExpiresIn.inWholeMilliseconds)) {
+        try {
+          JsonUtil.fromJson(cached, GetArchiveCdnCredentialsResponse::class.java)
+        } catch (e: IOException) {
+          Log.w(TAG, "Invalid JSON! Clearing.", e)
+          cachedCdnCredentials = null
+          null
+        }
+      } else {
+        null
+      }
+    }
+    set(value) {
+      cachedCdnCredentials = value?.let { JsonUtil.toJson(it) }
+      cachedCdnCredentialsTimestamp = System.currentTimeMillis()
+    }
+
   /**
    * Adds the given credentials to the existing list of stored credentials.
    */
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 5bd2cb83c7..d22f0e27f5 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/keyvalue/InternalValues.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/keyvalue/InternalValues.java
@@ -30,6 +30,7 @@ public final class InternalValues extends SignalStoreValues {
   public static final String FORCE_WEBSOCKET_MODE                 = "internal.force_websocket_mode";
   public static final String LAST_SCROLL_POSITION                 = "internal.last_scroll_position";
   public static final String CONVERSATION_ITEM_V2_MEDIA           = "internal.conversation_item_v2_media";
+  public static final String FORCE_ENTER_RESTORE_V2_FLOW          = "internal.force_enter_restore_v2_flow";
 
   InternalValues(KeyValueStore store) {
     super(store);
@@ -202,4 +203,12 @@ 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);
+  }
 }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/keyvalue/KeyValueDataSet.java b/app/src/main/java/org/thoughtcrime/securesms/keyvalue/KeyValueDataSet.java
index d18ec98b60..f21191a3bf 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/keyvalue/KeyValueDataSet.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/keyvalue/KeyValueDataSet.java
@@ -2,6 +2,8 @@
 
 import androidx.annotation.NonNull;
 
+import org.thoughtcrime.securesms.util.Util;
+
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.Map;
@@ -119,12 +121,30 @@ public Class getType(@NonNull String key) {
     return types.get(key);
   }
 
-  private <E> E readValueAsType(@NonNull String key, Class<E> type, boolean nullable) {
+  private <E> E readValueAsType(@NonNull String key, Class<E> expectedType, boolean nullable) {
     Object value = values.get(key);
-    if ((value == null && nullable) || (value != null && value.getClass() == type)) {
-      return type.cast(value);
-    } else {
-      throw new IllegalArgumentException("Type mismatch!");
+    if (value == null && nullable) {
+      return null;
+    }
+
+    if (value == null) {
+      throw new IllegalArgumentException("Nullability mismatch!");
+    }
+
+    if (value.getClass() == expectedType) {
+      return expectedType.cast(value);
     }
+
+    if (expectedType == Integer.class && value instanceof Long) {
+      long longValue = (long) value;
+      return expectedType.cast(Util.toIntExact(longValue));
+    }
+
+    if (expectedType == Long.class && value instanceof Integer) {
+      int intValue = (int) value;
+      return expectedType.cast((long) intValue);
+    }
+
+    throw new IllegalArgumentException("Type mismatch!");
   }
 }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/keyvalue/UiHints.java b/app/src/main/java/org/thoughtcrime/securesms/keyvalue/UiHints.java
index 4e80604c43..53682a50b0 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/keyvalue/UiHints.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/keyvalue/UiHints.java
@@ -18,6 +18,7 @@ public class UiHints extends SignalStoreValues {
   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_DOUBLE_TAP_EDIT_EDUCATION_SHEET = "uihints.has_seen_double_tap_edit_education_sheet";
 
   UiHints(@NonNull KeyValueStore store) {
     super(store);
@@ -113,4 +114,12 @@ public boolean hasSeenSafetyNumberUpdateNux() {
   public void markHasSeenSafetyNumberUpdateNux() {
     putBoolean(HAS_SEEN_SAFETY_NUMBER_NUX, true);
   }
+
+  public void setHasSeenDoubleTapEditEducationSheet(boolean seen) {
+    putBoolean(HAS_SEEN_DOUBLE_TAP_EDIT_EDUCATION_SHEET, seen);
+  }
+
+  public boolean getHasSeenDoubleTapEditEducationSheet() {
+    return getBoolean(HAS_SEEN_DOUBLE_TAP_EDIT_EDUCATION_SHEET, false);
+  }
 }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/lock/v2/BaseSvrPinFragment.java b/app/src/main/java/org/thoughtcrime/securesms/lock/v2/BaseSvrPinFragment.java
index 8069eee080..401d2cccc9 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/lock/v2/BaseSvrPinFragment.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/lock/v2/BaseSvrPinFragment.java
@@ -23,6 +23,7 @@
 import com.google.android.material.button.MaterialButton;
 
 import org.thoughtcrime.securesms.LoggingFragment;
+import org.thoughtcrime.securesms.PassphraseRequiredActivity;
 import org.thoughtcrime.securesms.R;
 import org.thoughtcrime.securesms.keyvalue.SignalStore;
 import org.thoughtcrime.securesms.pin.PinOptOutDialog;
@@ -151,8 +152,11 @@ protected CircularProgressMaterialButton getConfirm() {
 
   protected void closeNavGraphBranch() {
     Intent activityIntent = requireActivity().getIntent();
-    if (activityIntent != null && activityIntent.hasExtra("next_intent")) {
-      startActivity(activityIntent.getParcelableExtra("next_intent"));
+    if (activityIntent != null && activityIntent.hasExtra(PassphraseRequiredActivity.NEXT_INTENT_EXTRA)) {
+      final Intent nextIntent = activityIntent.getParcelableExtra(PassphraseRequiredActivity.NEXT_INTENT_EXTRA);
+      if (nextIntent != null) {
+        startActivity(nextIntent);
+      }
     }
 
     requireActivity().finish();
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 25be8d873b..078a0f04da 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/mediasend/CameraXFragment.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/mediasend/CameraXFragment.java
@@ -561,6 +561,10 @@ private Unit initializeFlipButton(@NonNull View flipButton, @NonNull CameraXFlas
       return Unit.INSTANCE;
     }
 
+    if (!getLifecycle().getCurrentState().isAtLeast(androidx.lifecycle.Lifecycle.State.STARTED)) {
+      return Unit.INSTANCE;
+    }
+
     getViewLifecycleOwner().getLifecycle().addObserver(cameraScreenBrightnessController);
     if (cameraController.hasCamera(CameraSelector.DEFAULT_FRONT_CAMERA) && cameraController.hasCamera(CameraSelector.DEFAULT_BACK_CAMERA)) {
       flipButton.setVisibility(View.VISIBLE);
diff --git a/app/src/main/java/org/thoughtcrime/securesms/mediasend/VideoEditorFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/mediasend/VideoEditorFragment.kt
index ae87d4241b..aaad75d11d 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/mediasend/VideoEditorFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/mediasend/VideoEditorFragment.kt
@@ -13,13 +13,13 @@ import androidx.fragment.app.Fragment
 import androidx.fragment.app.viewModels
 import org.signal.core.util.logging.Log
 import org.thoughtcrime.securesms.R
-import org.thoughtcrime.securesms.mediasend.v2.MediaSelectionState
 import org.thoughtcrime.securesms.mediasend.v2.MediaSelectionViewModel
 import org.thoughtcrime.securesms.mediasend.v2.videos.VideoTrimData
 import org.thoughtcrime.securesms.mms.MediaConstraints
 import org.thoughtcrime.securesms.mms.VideoSlide
 import org.thoughtcrime.securesms.scribbles.VideoEditorPlayButtonLayout
 import org.thoughtcrime.securesms.util.Throttler
+import org.thoughtcrime.securesms.util.visible
 import org.thoughtcrime.securesms.video.VideoPlayer
 import org.thoughtcrime.securesms.video.VideoPlayer.PlayerCallback
 import org.thoughtcrime.securesms.video.videoconverter.VideoThumbnailsRangeSelectorView
@@ -32,7 +32,6 @@ class VideoEditorFragment : Fragment(), PositionDragListener, MediaSendPageFragm
   private val videoScanThrottle = Throttler(150)
   private val handler = Handler(Looper.getMainLooper())
 
-  private var canEdit = false
   private var isVideoGif = false
   private var isInEdit = false
   private var isFocused = false
@@ -87,6 +86,8 @@ class VideoEditorFragment : Fragment(), PositionDragListener, MediaSendPageFragm
     player.setWindow(requireActivity().window)
     player.setVideoSource(slide, isVideoGif, TAG)
 
+    hud.visible = !slide.isVideoGif
+
     if (slide.isVideoGif) {
       player.setPlayerCallback(object : PlayerCallback {
         override fun onPlaying() {
@@ -101,14 +102,8 @@ class VideoEditorFragment : Fragment(), PositionDragListener, MediaSendPageFragm
       })
       player.hideControls()
       player.loopForever()
+      player.play()
     } else {
-      if (MediaConstraints.isVideoTranscodeAvailable()) {
-        sharedViewModel.state.value?.let { state ->
-          bindVideoTimeline(state)
-        }
-      } else {
-        hud.visibility = View.VISIBLE
-      }
       hud.setPlayClickListener {
         player.play()
       }
@@ -139,17 +134,22 @@ class VideoEditorFragment : Fragment(), PositionDragListener, MediaSendPageFragm
     sharedViewModel.state.observe(viewLifecycleOwner) { incomingState ->
       val focusedUri = incomingState.focusedMedia?.uri
       val currentlyFocused = focusedUri != null && focusedUri == uri
-      if (MediaConstraints.isVideoTranscodeAvailable() && canEdit) {
+      if (MediaConstraints.isVideoTranscodeAvailable()) {
         if (currentlyFocused) {
-          if (!isFocused) {
-            bindVideoTimeline(incomingState)
+          if (isVideoGif) {
+            player.play()
           } else {
-            val videoTrimData = if (focusedUri != null) {
-              incomingState.getOrCreateVideoTrimData(focusedUri)
+            if (!isFocused) {
+              bindVideoTimeline(incomingState.getOrCreateVideoTrimData(uri))
             } else {
-              VideoTrimData()
+              val videoTrimData = if (focusedUri != null) {
+                incomingState.getOrCreateVideoTrimData(focusedUri)
+              } else {
+                VideoTrimData()
+              }
+              hud.visible = incomingState.isTouchEnabled && !isVideoGif
+              onEditVideoDuration(videoTrimData, incomingState.isTouchEnabled)
             }
-            onEditVideoDuration(videoTrimData, incomingState.isTouchEnabled)
           }
         } else {
           stopPositionUpdates()
@@ -161,22 +161,15 @@ class VideoEditorFragment : Fragment(), PositionDragListener, MediaSendPageFragm
   }
 
   @RequiresApi(23)
-  private fun bindVideoTimeline(state: MediaSelectionState) {
-    val uri = state.focusedMedia?.uri ?: return
-    if (uri != this.uri) {
-      return
-    }
-
+  private fun bindVideoTimeline(data: VideoTrimData) {
     val autoplay = isVideoGif
     val slide = VideoSlide(requireContext(), uri, 0, autoplay)
 
-    val data = state.getOrCreateVideoTrimData(uri)
     if (data.isDurationEdited) {
       player.clip(data.startTimeUs, data.endTimeUs, autoplay)
     }
 
-    if (slide.hasVideo()) {
-      canEdit = true
+    if (slide.hasVideo() && !autoplay) {
       try {
         videoTimeLine.registerPlayerDragListener(this)
 
@@ -258,8 +251,6 @@ class VideoEditorFragment : Fragment(), PositionDragListener, MediaSendPageFragm
 
   @RequiresApi(23)
   private fun onEditVideoDuration(data: VideoTrimData, editingComplete: Boolean) {
-    hud.hidePlayButton()
-
     if (editingComplete) {
       isInEdit = false
       videoScanThrottle.clear()
@@ -268,6 +259,10 @@ class VideoEditorFragment : Fragment(), PositionDragListener, MediaSendPageFragm
       wasPlayingBeforeEdit = player.isPlaying
     }
 
+    if (wasPlayingBeforeEdit) {
+      hud.hidePlayButton()
+    }
+
     videoScanThrottle.publish {
       player.pause()
       if (!editingComplete) {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/images/MediaReviewImagePageFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/images/MediaReviewImagePageFragment.kt
index f7c56ad59c..145acd3041 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/images/MediaReviewImagePageFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/images/MediaReviewImagePageFragment.kt
@@ -24,10 +24,10 @@ private val MODE_DELAY = TimeUnit.MILLISECONDS.toMillis(300)
  */
 class MediaReviewImagePageFragment : Fragment(R.layout.fragment_container), ImageEditorFragment.Controller {
 
-  private lateinit var imageEditorFragment: ImageEditorFragment
-
   private val sharedViewModel: MediaSelectionViewModel by viewModels(ownerProducer = { requireActivity() })
-  private lateinit var hudCommandDisposable: Disposable
+
+  private var imageEditorFragment: ImageEditorFragment? = null
+  private var hudCommandDisposable: Disposable = Disposable.disposed()
 
   override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
     imageEditorFragment = ensureImageEditorFragment()
@@ -49,7 +49,7 @@ class MediaReviewImagePageFragment : Fragment(R.layout.fragment_container), Imag
             sharedViewModel.setTouchEnabled(false)
             requireView().postDelayed(
               {
-                imageEditorFragment.setMode(ImageEditorHudV2.Mode.DRAW)
+                imageEditorFragment?.setMode(ImageEditorHudV2.Mode.DRAW)
               },
               MODE_DELAY
             )
@@ -58,12 +58,12 @@ class MediaReviewImagePageFragment : Fragment(R.layout.fragment_container), Imag
             sharedViewModel.setTouchEnabled(false)
             requireView().postDelayed(
               {
-                imageEditorFragment.setMode(ImageEditorHudV2.Mode.CROP)
+                imageEditorFragment?.setMode(ImageEditorHudV2.Mode.CROP)
               },
               MODE_DELAY
             )
           }
-          HudCommand.SaveMedia -> imageEditorFragment.onSave()
+          HudCommand.SaveMedia -> imageEditorFragment?.onSave()
           else -> Unit
         }
       }
@@ -73,7 +73,9 @@ class MediaReviewImagePageFragment : Fragment(R.layout.fragment_container), Imag
   override fun onSaveInstanceState(outState: Bundle) {
     super.onSaveInstanceState(outState)
 
-    sharedViewModel.setEditorState(requireUri(), requireNotNull(imageEditorFragment.saveState()))
+    imageEditorFragment?.let {
+      sharedViewModel.setEditorState(requireUri(), requireNotNull(it.saveState()))
+    }
   }
 
   private fun ensureImageEditorFragment(): ImageEditorFragment {
@@ -105,12 +107,12 @@ class MediaReviewImagePageFragment : Fragment(R.layout.fragment_container), Imag
       if (!needed) {
         requireView().postDelayed(
           {
-            sharedViewModel.setTouchEnabled(!needed)
+            sharedViewModel.setTouchEnabled(true)
           },
           MODE_DELAY
         )
       } else {
-        sharedViewModel.setTouchEnabled(!needed)
+        sharedViewModel.setTouchEnabled(false)
       }
     }
   }
@@ -118,10 +120,12 @@ class MediaReviewImagePageFragment : Fragment(R.layout.fragment_container), Imag
   override fun onRequestFullScreen(fullScreen: Boolean, hideKeyboard: Boolean) = Unit
 
   override fun onDoneEditing() {
-    imageEditorFragment.setMode(ImageEditorHudV2.Mode.NONE)
+    imageEditorFragment?.setMode(ImageEditorHudV2.Mode.NONE)
 
     if (isResumed) {
-      sharedViewModel.setEditorState(requireUri(), requireNotNull(imageEditorFragment.saveState()))
+      imageEditorFragment?.let {
+        sharedViewModel.setEditorState(requireUri(), requireNotNull(it.saveState()))
+      }
     }
   }
 
@@ -141,9 +145,9 @@ class MediaReviewImagePageFragment : Fragment(R.layout.fragment_container), Imag
     val data = sharedViewModel.getEditorState(requireUri()) as? ImageEditorFragment.Data
 
     if (data != null) {
-      imageEditorFragment.restoreState(data)
+      imageEditorFragment?.restoreState(data)
     } else {
-      imageEditorFragment.onClearAll()
+      imageEditorFragment?.onClearAll()
     }
   }
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/messagedetails/RecipientViewHolder.java b/app/src/main/java/org/thoughtcrime/securesms/messagedetails/RecipientViewHolder.java
index 347a09f52b..6a9cf28268 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/messagedetails/RecipientViewHolder.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/messagedetails/RecipientViewHolder.java
@@ -41,7 +41,7 @@ final class RecipientViewHolder extends RecyclerView.ViewHolder {
 
   void bind(RecipientDeliveryStatus data) {
     unidentifiedDeliveryIcon.setVisibility(TextSecurePreferences.isShowUnidentifiedDeliveryIndicatorsEnabled(itemView.getContext()) && data.isUnidentified() ? View.VISIBLE : View.GONE);
-    fromView.setText(data.getRecipient());
+    fromView.setText(data.getRecipient(), data.getRecipient().getDisplayName(itemView.getContext()), null, true, true);
     avatar.setRecipient(data.getRecipient());
     badge.setBadgeFromRecipient(data.getRecipient());
 
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 e9409ad507..8836d0781c 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/messages/SyncMessageProcessor.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/messages/SyncMessageProcessor.kt
@@ -1259,20 +1259,20 @@ object SyncMessageProcessor {
 
       if (call != null) {
         log(envelopeTimestamp, "Synchronizing call log event with exact call data.")
-        synchronizeCallLogEventViaTimestamp(envelopeTimestamp, callLogEvent.type, call.timestamp)
+        synchronizeCallLogEventViaTimestamp(envelopeTimestamp, callLogEvent.type, call.timestamp, peer)
         return
       }
     }
 
     if (timestamp != null) {
       warn(envelopeTimestamp, "Synchronize call log event using timestamp instead of exact values")
-      synchronizeCallLogEventViaTimestamp(envelopeTimestamp, callLogEvent.type, timestamp)
+      synchronizeCallLogEventViaTimestamp(envelopeTimestamp, callLogEvent.type, timestamp, peer)
     } else {
       log(envelopeTimestamp, "Failed to synchronize call log event, not enough information.")
     }
   }
 
-  private fun synchronizeCallLogEventViaTimestamp(envelopeTimestamp: Long, eventType: CallLogEvent.Type?, timestamp: Long) {
+  private fun synchronizeCallLogEventViaTimestamp(envelopeTimestamp: Long, eventType: CallLogEvent.Type?, timestamp: Long, peer: RecipientId?) {
     when (eventType) {
       CallLogEvent.Type.CLEAR -> {
         SignalDatabase.calls.deleteNonAdHocCallEventsOnOrBefore(timestamp)
@@ -1283,6 +1283,15 @@ object SyncMessageProcessor {
         SignalDatabase.calls.markAllCallEventsRead(timestamp)
       }
 
+      CallLogEvent.Type.MARKED_AS_READ_IN_CONVERSATION -> {
+        if (peer == null) {
+          warn(envelopeTimestamp, "Cannot synchronize conversation calls, missing peer.")
+          return
+        }
+
+        SignalDatabase.calls.markAllCallEventsWithPeerBeforeTimestampRead(peer, timestamp)
+      }
+
       else -> log(envelopeTimestamp, "Synchronize call log event has an invalid type $eventType, ignoring.")
     }
   }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/net/SignalWebSocketHealthMonitor.java b/app/src/main/java/org/thoughtcrime/securesms/net/SignalWebSocketHealthMonitor.java
index 76a31b5b3a..92fe4aee2b 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/net/SignalWebSocketHealthMonitor.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/net/SignalWebSocketHealthMonitor.java
@@ -11,7 +11,7 @@
 import org.whispersystems.signalservice.api.util.SleepTimer;
 import org.whispersystems.signalservice.api.websocket.HealthMonitor;
 import org.whispersystems.signalservice.api.websocket.WebSocketConnectionState;
-import org.whispersystems.signalservice.internal.websocket.WebSocketConnection;
+import org.whispersystems.signalservice.internal.websocket.OkHttpWebSocketConnection;
 
 import java.util.concurrent.Executor;
 import java.util.concurrent.Executors;
@@ -33,7 +33,7 @@ public final class SignalWebSocketHealthMonitor implements HealthMonitor {
   /**
    * This is the amount of time in between sent keep alives. Must be greater than {@link SignalWebSocketHealthMonitor#KEEP_ALIVE_TIMEOUT}
    */
-  private static final long KEEP_ALIVE_SEND_CADENCE = TimeUnit.SECONDS.toMillis(WebSocketConnection.KEEPALIVE_FREQUENCY_SECONDS);
+  private static final long KEEP_ALIVE_SEND_CADENCE = TimeUnit.SECONDS.toMillis(OkHttpWebSocketConnection.KEEPALIVE_FREQUENCY_SECONDS);
 
   /**
    * This is the amount of time we will wait for a response to the keep alive before we consider the websockets dead.
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 5df2a5e9d5..2a4761f31c 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/notifications/MarkReadReceiver.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/notifications/MarkReadReceiver.java
@@ -12,16 +12,17 @@
 
 import org.signal.core.util.concurrent.SignalExecutors;
 import org.signal.core.util.logging.Log;
+import org.thoughtcrime.securesms.database.CallTable;
 import org.thoughtcrime.securesms.database.MessageTable.ExpirationInfo;
 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.jobs.CallLogEventSendJob;
 import org.thoughtcrime.securesms.jobs.MultiDeviceReadUpdateJob;
 import org.thoughtcrime.securesms.jobs.SendReadReceiptJob;
 import org.thoughtcrime.securesms.notifications.v2.ConversationId;
 import org.thoughtcrime.securesms.recipients.RecipientId;
-import org.thoughtcrime.securesms.service.ExpiringMessageManager;
 
 import java.util.ArrayList;
 import java.util.LinkedList;
@@ -62,6 +63,7 @@ public void onReceive(final Context context, Intent intent) {
         }
 
         process(messageIdsCollection);
+        processCallEvents(threads, System.currentTimeMillis());
 
         ApplicationDependencies.getMessageNotifier().updateNotification(context);
         finisher.finish();
@@ -102,6 +104,20 @@ public static void process(@NonNull List<MarkedMessageInfo> markedReadMessages)
     });
   }
 
+  public static void processCallEvents(@NonNull List<ConversationId> threads, long timestamp) {
+    List<RecipientId> peers = SignalDatabase.threads().getRecipientIdsForThreadIds(threads.stream()
+                                                                                          .filter(it -> it.getGroupStoryId() == null)
+                                                                                          .map(ConversationId::getThreadId)
+                                                                                          .collect(java.util.stream.Collectors.toList()));
+
+    for (RecipientId peer : peers) {
+      CallTable.Call lastCallInThread = SignalDatabase.calls().markAllCallEventsWithPeerBeforeTimestampRead(peer, timestamp);
+      if (lastCallInThread != null) {
+        ApplicationDependencies.getJobManager().add(CallLogEventSendJob.forMarkedAsReadInConversation(lastCallInThread));
+      }
+    }
+  }
+
   private static void scheduleDeletion(@NonNull List<ExpirationInfo> expirationInfo) {
     if (expirationInfo.size() > 0) {
       long now = System.currentTimeMillis();
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 d9ec6028dc..862f5bd91a 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/notifications/NotificationIds.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/notifications/NotificationIds.java
@@ -8,6 +8,7 @@ public final class NotificationIds {
 
   public static final int FCM_FAILURE                       = 12;
   public static final int ATTACHMENT_PROGRESS               = 50;
+  public static final int BACKUP_PROGRESS                   = 51;
   public static final int APK_UPDATE_PROMPT_INSTALL         = 666;
   public static final int APK_UPDATE_FAILED_INSTALL         = 667;
   public static final int APK_UPDATE_SUCCESSFUL_INSTALL     = 668;
diff --git a/app/src/main/java/org/thoughtcrime/securesms/notifications/v2/NotificationStateProvider.kt b/app/src/main/java/org/thoughtcrime/securesms/notifications/v2/NotificationStateProvider.kt
index 7bf9205f21..433b70178f 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/notifications/v2/NotificationStateProvider.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/notifications/v2/NotificationStateProvider.kt
@@ -138,6 +138,7 @@ object NotificationStateProvider {
   ) {
     private val isGroupStoryReply: Boolean = thread.groupStoryId != null
     private val isUnreadIncoming: Boolean = isUnreadMessage && !messageRecord.isOutgoing && !isGroupStoryReply
+    private val isIncomingMissedCall: Boolean = !messageRecord.isOutgoing && (messageRecord.isMissedAudioCall || messageRecord.isMissedVideoCall)
 
     private val isNotifiableGroupStoryMessage: Boolean =
       isUnreadMessage &&
@@ -146,7 +147,7 @@ object NotificationStateProvider {
         (isParentStorySentBySelf || messageRecord.hasSelfMention() || (hasSelfRepliedToStory && !messageRecord.isStoryReaction()))
 
     fun includeMessage(notificationProfile: NotificationProfile?): MessageInclusion {
-      return if (isUnreadIncoming || stickyThread || isNotifiableGroupStoryMessage) {
+      return if (isUnreadIncoming || stickyThread || isNotifiableGroupStoryMessage || isIncomingMissedCall) {
         if (threadRecipient.isMuted && (threadRecipient.isDoNotNotifyMentions || !messageRecord.hasSelfMention())) {
           MessageInclusion.MUTE_FILTERED
         } else if (notificationProfile != null && !notificationProfile.isRecipientAllowed(threadRecipient.id) && !(notificationProfile.allowAllMentions && messageRecord.hasSelfMention())) {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/permissions/PermissionDeniedBottomSheet.kt b/app/src/main/java/org/thoughtcrime/securesms/permissions/PermissionDeniedBottomSheet.kt
new file mode 100644
index 0000000000..1850351b10
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/permissions/PermissionDeniedBottomSheet.kt
@@ -0,0 +1,160 @@
+package org.thoughtcrime.securesms.permissions
+
+import androidx.compose.foundation.Image
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.text.InlineTextContent
+import androidx.compose.foundation.text.appendInlineContent
+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.graphics.vector.ImageVector
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.res.vectorResource
+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.core.os.bundleOf
+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
+
+private const val PLACEHOLDER = "__RADIO_BUTTON_PLACEHOLDER__"
+
+/**
+ * Bottom sheet shown when a permission has been previously denied
+ *
+ * Displays rationale for the need of a permission and how to grant it
+ */
+class PermissionDeniedBottomSheet private constructor() : ComposeBottomSheetDialogFragment() {
+
+  companion object {
+    private const val ARG_TITLE = "argument.title_res"
+    private const val ARG_SUBTITLE = "argument.subtitle_res"
+
+    @JvmStatic
+    fun showPermissionFragment(titleRes: Int, subtitleRes: Int): ComposeBottomSheetDialogFragment {
+      return PermissionDeniedBottomSheet().apply {
+        arguments = bundleOf(
+          ARG_TITLE to titleRes,
+          ARG_SUBTITLE to subtitleRes
+        )
+      }
+    }
+  }
+
+  @Composable
+  override fun SheetContent() {
+    PermissionDeniedSheetContent(
+      titleRes = remember { requireArguments().getInt(ARG_TITLE) },
+      subtitleRes = remember { requireArguments().getInt(ARG_SUBTITLE) },
+      onSettingsClicked = this::goToSettings
+    )
+  }
+
+  private fun goToSettings() {
+    requireContext().startActivity(Permissions.getApplicationSettingsIntent(requireContext()))
+    dismissAllowingStateLoss()
+  }
+}
+
+@SignalPreview
+@Composable
+private fun PermissionDeniedSheetContentPreview() {
+  Previews.BottomSheetPreview {
+    PermissionDeniedSheetContent(
+      titleRes = R.string.AttachmentManager_signal_allow_access_location,
+      subtitleRes = R.string.AttachmentManager_signal_to_send_location,
+      onSettingsClicked = {}
+    )
+  }
+}
+
+@Composable
+private fun PermissionDeniedSheetContent(
+  titleRes: Int,
+  subtitleRes: Int,
+  onSettingsClicked: () -> Unit
+) {
+  Column(
+    modifier = Modifier.padding(start = 24.dp, end = 24.dp, top = 12.dp, bottom = 32.dp)
+  ) {
+    BottomSheets.Handle(
+      modifier = Modifier.align(Alignment.CenterHorizontally)
+    )
+
+    Text(
+      text = stringResource(titleRes),
+      style = MaterialTheme.typography.headlineSmall,
+      color = MaterialTheme.colorScheme.onSurface,
+      textAlign = TextAlign.Center,
+      modifier = Modifier
+        .align(Alignment.CenterHorizontally)
+        .padding(bottom = 12.dp, top = 20.dp)
+    )
+
+    Text(
+      text = stringResource(subtitleRes),
+      style = MaterialTheme.typography.bodyMedium,
+      color = MaterialTheme.colorScheme.onSurface,
+      modifier = Modifier
+        .align(Alignment.CenterHorizontally)
+        .padding(bottom = 32.dp)
+    )
+
+    Text(
+      text = stringResource(R.string.PermissionDeniedBottomSheet__1_tap_settings_below),
+      color = MaterialTheme.colorScheme.onSurface,
+      modifier = Modifier.padding(bottom = 24.dp)
+    )
+
+    val step2String = stringResource(id = R.string.PermissionDeniedBottomSheet__2_allow_permission, PLACEHOLDER)
+    val (step2Text, step2InlineContent) = remember(step2String) {
+      val parts = step2String.split(PLACEHOLDER)
+      val annotatedString = buildAnnotatedString {
+        append(parts[0])
+        appendInlineContent("radio")
+        append(parts[1])
+      }
+
+      val inlineContentMap = mapOf(
+        "radio" to InlineTextContent(Placeholder(22.sp, 22.sp, PlaceholderVerticalAlign.Center)) {
+          Image(
+            imageVector = ImageVector.vectorResource(id = R.drawable.ic_radio_button_checked),
+            contentDescription = null,
+            modifier = Modifier.fillMaxSize()
+          )
+        }
+      )
+
+      annotatedString to inlineContentMap
+    }
+
+    Text(
+      text = step2Text,
+      inlineContent = step2InlineContent,
+      color = MaterialTheme.colorScheme.onSurface,
+      modifier = Modifier.padding(bottom = 32.dp)
+    )
+
+    Buttons.LargeTonal(
+      onClick = onSettingsClicked,
+      modifier = Modifier
+        .align(Alignment.CenterHorizontally)
+        .fillMaxWidth(1f)
+    ) {
+      Text(text = stringResource(id = R.string.PermissionDeniedBottomSheet__settings))
+    }
+  }
+}
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 14c6d052d4..fb30608b5a 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/permissions/Permissions.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/permissions/Permissions.java
@@ -19,6 +19,7 @@
 import androidx.core.app.ActivityCompat;
 import androidx.core.content.ContextCompat;
 import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
 
 import com.annimon.stream.Stream;
 import com.annimon.stream.function.Consumer;
@@ -26,6 +27,7 @@
 
 import org.signal.core.util.logging.Log;
 import org.thoughtcrime.securesms.R;
+import org.thoughtcrime.securesms.util.BottomSheetUtil;
 import org.thoughtcrime.securesms.util.LRUCache;
 import org.thoughtcrime.securesms.util.ServiceUtil;
 
@@ -71,6 +73,8 @@ public static class PermissionsBuilder {
 
     private @DrawableRes int[]   rationalDialogHeader;
     private              String  rationaleDialogMessage;
+    private              String  rationaleDialogTitle;
+    private              String  rationaleDialogDetails;
     private              boolean rationaleDialogCancelable;
 
     private boolean ifNecesary;
@@ -102,8 +106,18 @@ public PermissionsBuilder withRationaleDialog(@NonNull String message, @NonNull
     }
 
     public PermissionsBuilder withRationaleDialog(@NonNull String message, boolean cancelable, @NonNull @DrawableRes int... headers) {
+      return withRationaleDialog(message, null, null, cancelable, headers);
+    }
+
+    public PermissionsBuilder withRationaleDialog(@NonNull String title, @NonNull String details, @NonNull @DrawableRes int... headers) {
+      return withRationaleDialog(null, title, details, true, 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;
+      this.rationaleDialogTitle      = title;
+      this.rationaleDialogDetails    = details;
       this.rationaleDialogCancelable = cancelable;
       return this;
     }
@@ -113,7 +127,11 @@ public PermissionsBuilder withPermanentDenialDialog(@NonNull String message) {
     }
 
     public PermissionsBuilder withPermanentDenialDialog(@NonNull String message, @Nullable Runnable onDialogDismissed) {
-      return onAnyPermanentlyDenied(new SettingsDialogListener(permissionObject.getContext(), message, onDialogDismissed));
+      return withPermanentDenialDialog(message, onDialogDismissed, 0, 0, null);
+    }
+
+    public PermissionsBuilder withPermanentDenialDialog(@NonNull String message, @Nullable Runnable onDialogDismissed, int titleRes, int detailsRes, @Nullable FragmentManager fragmentManager) {
+      return onAnyPermanentlyDenied(new SettingsDialogListener(permissionObject.getContext(), message, onDialogDismissed, titleRes, detailsRes, fragmentManager));
     }
 
     public PermissionsBuilder onAllGranted(Runnable allGrantedListener) {
@@ -158,7 +176,8 @@ public void execute() {
 
       if (ifNecesary && (permissionObject.hasAll(requestedPermissions) || !condition)) {
         executePreGrantedPermissionsRequest(request);
-      } else if (rationaleDialogMessage != null && rationalDialogHeader != null) {
+      } else if ((rationaleDialogMessage != null || (rationaleDialogTitle != null && rationaleDialogDetails != null))
+                 && rationalDialogHeader != null) {
         executePermissionsRequestWithRationale(request);
       } else {
         executePermissionsRequest(request);
@@ -174,13 +193,17 @@ private void executePreGrantedPermissionsRequest(PermissionsRequest request) {
 
     @SuppressWarnings("ConstantConditions")
     private void executePermissionsRequestWithRationale(PermissionsRequest request) {
-      RationaleDialog.createFor(permissionObject.getContext(), rationaleDialogMessage, rationalDialogHeader)
-                     .setPositiveButton(R.string.Permissions_continue, (dialog, which) -> executePermissionsRequest(request))
-                     .setNegativeButton(R.string.Permissions_not_now, (dialog, which) -> executeNoPermissionsRequest(request))
-                     .setCancelable(rationaleDialogCancelable)
-                     .show()
-                     .getWindow()
-                     .setLayout((int)(permissionObject.getWindowWidth() * .75), ViewGroup.LayoutParams.WRAP_CONTENT);
+      MaterialAlertDialogBuilder builder = (rationaleDialogMessage != null)
+                                         ? RationaleDialog.createFor(permissionObject.getContext(), rationaleDialogMessage, rationalDialogHeader)
+                                         : RationaleDialog.createFor(permissionObject.getContext(), rationaleDialogTitle, rationaleDialogDetails, rationalDialogHeader);
+      builder.setPositiveButton(R.string.Permissions_continue, (dialog, which) -> executePermissionsRequest(request))
+             .setNegativeButton(R.string.Permissions_not_now, (dialog, which) -> executeNoPermissionsRequest(request))
+             .setCancelable(rationaleDialogCancelable);
+      if (rationaleDialogMessage != null) {
+        builder.show().getWindow().setLayout((int)(permissionObject.getWindowWidth() * .75), ViewGroup.LayoutParams.WRAP_CONTENT);
+      } else {
+        builder.show();
+      }
     }
 
     private void executePermissionsRequest(PermissionsRequest request) {
@@ -368,22 +391,34 @@ public void requestPermissions(int requestCode, String... permissions) {
 
   private static class SettingsDialogListener implements Runnable {
 
-    private final WeakReference<Context> context;
-    private final Runnable onDialogDismissed;
-    private final String                 message;
+    private final WeakReference<Context>          context;
+    private final WeakReference<FragmentManager>  fragmentManager;
+    private final Runnable                        onDialogDismissed;
+    private final String                          message;
+    private final int                             titleRes;
+    private final int                             detailsRes;
+    private final boolean                         useBottomSheet;
 
-    SettingsDialogListener(Context context, String message, @Nullable Runnable onDialogDismissed) {
+    SettingsDialogListener(Context context, String message, @Nullable Runnable onDialogDismissed, int titleRes, int detailsRes, @Nullable FragmentManager fragmentManager) {
       this.message           = message;
       this.context           = new WeakReference<>(context);
       this.onDialogDismissed = onDialogDismissed;
+      this.fragmentManager   = new WeakReference<>(fragmentManager);
+      this.titleRes          = titleRes;
+      this.detailsRes        = detailsRes;
+      this.useBottomSheet    = fragmentManager != null;
     }
 
     @Override
     public void run() {
       Context context = this.context.get();
+      FragmentManager fragmentManager = this.fragmentManager.get();
 
       if (context != null) {
-        new MaterialAlertDialogBuilder(context)
+        if (useBottomSheet && fragmentManager != null) {
+          PermissionDeniedBottomSheet.showPermissionFragment(titleRes, detailsRes).show(fragmentManager, BottomSheetUtil.STANDARD_BOTTOM_SHEET_FRAGMENT_TAG);
+        } else if (!useBottomSheet){
+          new MaterialAlertDialogBuilder(context)
             .setTitle(R.string.Permissions_permission_required)
             .setMessage(message)
             .setCancelable(false)
@@ -395,6 +430,7 @@ public void run() {
               }
             })
             .show();
+        }
       }
     }
   }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/permissions/RationaleDialog.java b/app/src/main/java/org/thoughtcrime/securesms/permissions/RationaleDialog.java
index f5f72e1790..2d3377b11b 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/permissions/RationaleDialog.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/permissions/RationaleDialog.java
@@ -29,6 +29,44 @@
 
 public class RationaleDialog {
 
+  public static MaterialAlertDialogBuilder createFor(@NonNull Context context, @NonNull String title, @NonNull String details, @DrawableRes int... drawables) {
+    View      view         = LayoutInflater.from(context).inflate(R.layout.permission_allow_dialog, null);
+    ViewGroup header       = view.findViewById(R.id.permission_header_container);
+    TextView  titleText    = view.findViewById(R.id.permission_title);
+    TextView  detailsText  = view.findViewById(R.id.permission_details);
+    int       iconSize = (int) DimensionUnit.DP.toPixels(32);
+
+    for (int i = 0; i < drawables.length; i++) {
+      Drawable drawable = Objects.requireNonNull(ContextCompat.getDrawable(context, drawables[i]));
+      DrawableCompat.setTint(drawable, ContextCompat.getColor(context, R.color.signal_colorOnPrimaryContainer));
+
+      ImageView imageView = new ImageView(context);
+      imageView.setImageDrawable(drawable);
+      imageView.setLayoutParams(new LayoutParams(iconSize, iconSize));
+      imageView.setScaleType(ImageView.ScaleType.FIT_CENTER);
+
+      header.addView(imageView);
+
+      if (i != drawables.length - 1) {
+        TextView plus = new TextView(context);
+        plus.setText("+");
+        plus.setTextSize(TypedValue.COMPLEX_UNIT_SP, 40);
+        plus.setTextColor(Color.WHITE);
+
+        LayoutParams layoutParams = new LayoutParams(LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT);
+        layoutParams.setMargins(ViewUtil.dpToPx(context, 20), 0, ViewUtil.dpToPx(context, 20), 0);
+
+        plus.setLayoutParams(layoutParams);
+        header.addView(plus);
+      }
+    }
+
+    titleText.setText(title);
+    detailsText.setText(details);
+
+    return new MaterialAlertDialogBuilder(context).setView(view);
+  }
+
   public static MaterialAlertDialogBuilder createFor(@NonNull Context context, @NonNull String message, @DrawableRes int... drawables) {
     View      view    = LayoutInflater.from(context).inflate(R.layout.permissions_rationale_dialog, null);
     ViewGroup header  = view.findViewById(R.id.header_container);
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 5486fced5c..41f3c5ef6d 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/pin/PinRestoreEntryFragment.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/pin/PinRestoreEntryFragment.java
@@ -27,7 +27,7 @@
 import org.thoughtcrime.securesms.LoggingFragment;
 import org.thoughtcrime.securesms.MainActivity;
 import org.thoughtcrime.securesms.R;
-import org.thoughtcrime.securesms.backup.v2.ui.MessageBackupsTestRestoreActivity;
+import org.thoughtcrime.securesms.backup.v2.ui.subscription.MessageBackupsTestRestoreActivity;
 import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
 import org.thoughtcrime.securesms.jobs.ProfileUploadJob;
 import org.thoughtcrime.securesms.keyvalue.SignalStore;
diff --git a/app/src/main/java/org/thoughtcrime/securesms/profiles/spoofing/ReviewCardDialogFragment.java b/app/src/main/java/org/thoughtcrime/securesms/profiles/spoofing/ReviewCardDialogFragment.java
index 76bc9be24d..a73865bbf1 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/profiles/spoofing/ReviewCardDialogFragment.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/profiles/spoofing/ReviewCardDialogFragment.java
@@ -38,7 +38,7 @@ public class ReviewCardDialogFragment extends FullScreenDialogFragment {
 
   public static ReviewCardDialogFragment createForReviewRequest(@NonNull RecipientId recipientId) {
     return create(R.string.ReviewCardDialogFragment__review_request,
-                  R.string.ReviewCardDialogFragment__if_youre_not_sure,
+                  R.plurals.ReviewCardDialogFragment__if_youre_not_sure,
                   R.string.ReviewCardDialogFragment__no_groups_in_common,
                   R.plurals.ReviewCardDialogFragment__d_groups_in_common,
                   recipientId,
@@ -47,7 +47,7 @@ public static ReviewCardDialogFragment createForReviewRequest(@NonNull Recipient
 
   public static ReviewCardDialogFragment createForReviewMembers(@NonNull GroupId.V2 groupId) {
     return create(R.string.ReviewCardDialogFragment__review_members,
-                  R.string.ReviewCardDialogFragment__d_group_members_have_the_same_name,
+                  R.plurals.ReviewCardDialogFragment__d_group_members_have_the_same_name,
                   R.string.ReviewCardDialogFragment__no_other_groups_in_common,
                   R.plurals.ReviewCardDialogFragment__d_other_groups_in_common,
                   null,
@@ -55,7 +55,7 @@ public static ReviewCardDialogFragment createForReviewMembers(@NonNull GroupId.V
   }
 
   private static ReviewCardDialogFragment create(@StringRes int titleResId,
-                                                 @StringRes int descriptionResId,
+                                                 @PluralsRes int descriptionResId,
                                                  @StringRes int noGroupsInCommonResId,
                                                  @PluralsRes int groupsInCommonResId,
                                                  @Nullable RecipientId recipientId,
@@ -92,7 +92,7 @@ public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceStat
 
     viewModel.getReviewCards().observe(getViewLifecycleOwner(), cards -> {
       adapter.submitList(cards);
-      description.setText(getString(getDescriptionResId(), cards.size()));
+      description.setText(getResources().getQuantityString(getDescriptionResId(), cards.size(), cards.size()));
     });
 
     viewModel.getReviewEvents().observe(getViewLifecycleOwner(), this::onReviewEvent);
@@ -105,7 +105,7 @@ private void initializeViewModel() throws BadGroupIdException {
     viewModel = new ViewModelProvider(this, factory).get(ReviewCardViewModel.class);
   }
 
-  private @StringRes int getDescriptionResId() {
+  private @PluralsRes int getDescriptionResId() {
     return requireArguments().getInt(EXTRA_DESCRIPTION_RES_ID);
   }
 
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 232a77795d..ee832801b4 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
@@ -51,7 +51,7 @@ void loadRecipients(@NonNull OnRecipientsLoadedListener onRecipientsLoadedListen
     if (groupId != null) {
       loadRecipientsForGroup(groupId, onRecipientsLoadedListener);
     } else if (recipientId != null) {
-      loadSimilarRecipients(context, recipientId, onRecipientsLoadedListener);
+      loadSimilarRecipients(recipientId, onRecipientsLoadedListener);
     } else {
       throw new AssertionError();
     }
@@ -113,34 +113,21 @@ void removeFromGroup(@NonNull ReviewCard reviewCard, @NonNull OnRemoveFromGroupL
   private static void loadRecipientsForGroup(@NonNull GroupId.V2 groupId,
                                              @NonNull OnRecipientsLoadedListener onRecipientsLoadedListener)
   {
-    SignalExecutors.BOUNDED.execute(() -> onRecipientsLoadedListener.onRecipientsLoaded(ReviewUtil.getDuplicatedRecipients(groupId)));
+    SignalExecutors.BOUNDED.execute(() -> {
+      RecipientId groupRecipientId = SignalDatabase.recipients().getByGroupId(groupId).orElse(null);
+      if (groupRecipientId != null) {
+        onRecipientsLoadedListener.onRecipientsLoaded(SignalDatabase.nameCollisions().getCollisionsForThreadRecipientId(groupRecipientId));
+      } else {
+        onRecipientsLoadedListener.onRecipientsLoadFailed();
+      }
+    });
   }
 
-  private static void loadSimilarRecipients(@NonNull Context context,
-                                            @NonNull RecipientId recipientId,
+  private static void loadSimilarRecipients(@NonNull RecipientId recipientId,
                                             @NonNull OnRecipientsLoadedListener onRecipientsLoadedListener)
   {
     SignalExecutors.BOUNDED.execute(() -> {
-      Recipient resolved = Recipient.resolved(recipientId);
-
-      List<RecipientId> recipientIds = SignalDatabase.recipients()
-          .getSimilarRecipientIds(resolved);
-
-      if (recipientIds.isEmpty()) {
-        onRecipientsLoadedListener.onRecipientsLoadFailed();
-        return;
-      }
-
-      HashSet<RecipientId> ids = new HashSet<>(recipientIds);
-      ids.add(recipientId);
-
-      List<ReviewRecipient> recipients = Stream.of(ids)
-          .map(Recipient::resolved)
-          .map(ReviewRecipient::new)
-          .sorted(new ReviewRecipient.Comparator(context, recipientId))
-          .toList();
-
-      onRecipientsLoadedListener.onRecipientsLoaded(recipients);
+      onRecipientsLoadedListener.onRecipientsLoaded(SignalDatabase.nameCollisions().getCollisionsForThreadRecipientId(recipientId));
     });
   }
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/profiles/spoofing/ReviewRecipient.java b/app/src/main/java/org/thoughtcrime/securesms/profiles/spoofing/ReviewRecipient.java
index fc6df5ca79..2dcd8c6bce 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/profiles/spoofing/ReviewRecipient.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/profiles/spoofing/ReviewRecipient.java
@@ -13,11 +13,11 @@ public class ReviewRecipient {
   private final Recipient            recipient;
   private final ProfileChangeDetails profileChangeDetails;
 
-  ReviewRecipient(@NonNull Recipient recipient) {
+  public ReviewRecipient(@NonNull Recipient recipient) {
     this(recipient, null);
   }
 
-  ReviewRecipient(@NonNull Recipient recipient, @Nullable ProfileChangeDetails profileChangeDetails) {
+  public ReviewRecipient(@NonNull Recipient recipient, @Nullable ProfileChangeDetails profileChangeDetails) {
     this.recipient            = recipient;
     this.profileChangeDetails = profileChangeDetails;
   }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/profiles/spoofing/ReviewUtil.java b/app/src/main/java/org/thoughtcrime/securesms/profiles/spoofing/ReviewUtil.java
index 173ea4b773..e4f098e468 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/profiles/spoofing/ReviewUtil.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/profiles/spoofing/ReviewUtil.java
@@ -7,102 +7,15 @@
 
 import com.annimon.stream.Stream;
 
-import org.thoughtcrime.securesms.database.GroupTable;
 import org.thoughtcrime.securesms.database.SignalDatabase;
 import org.thoughtcrime.securesms.database.model.GroupRecord;
-import org.thoughtcrime.securesms.database.model.MessageRecord;
-import org.thoughtcrime.securesms.database.model.databaseprotos.ProfileChangeDetails;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
-import org.thoughtcrime.securesms.groups.GroupId;
 import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.recipients.RecipientId;
-import org.signal.core.util.Base64;
-
-import java.io.IOException;
-import java.util.Collections;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Objects;
-import java.util.concurrent.TimeUnit;
 
 public final class ReviewUtil {
 
   private ReviewUtil() { }
 
-  private static final long TIMEOUT = TimeUnit.HOURS.toMillis(24);
-
-  /**
-   * Checks a single recipient against the database to see whether duplicates exist.
-   * This should not be used in the context of a group, due to performance reasons.
-   *
-   * @param recipientId Id of the recipient we are interested in.
-   * @return            Whether or not multiple recipients share this profile name.
-   */
-  @WorkerThread
-  public static List<RecipientId> getRecipientsToPromptForReview(@NonNull RecipientId recipientId)
-  {
-    Recipient recipient = Recipient.resolved(recipientId);
-
-    if (recipient.isGroup() || recipient.isSystemContact()) {
-      return Collections.emptyList();
-    }
-
-    return Stream.of(SignalDatabase.recipients().getSimilarRecipientIds(recipient))
-                 .filter(id -> !id.equals(recipientId))
-                 .toList();
-  }
-
-  @WorkerThread
-  public static @NonNull List<ReviewRecipient> getDuplicatedRecipients(@NonNull GroupId.V2 groupId)
-  {
-    Context             context              = ApplicationDependencies.getApplication();
-    List<MessageRecord> profileChangeRecords = getProfileChangeRecordsForGroup(context, groupId);
-
-    if (profileChangeRecords.isEmpty()) {
-      return Collections.emptyList();
-    }
-
-    List<Recipient> members = SignalDatabase.groups()
-                                             .getGroupMembers(groupId, GroupTable.MemberSet.FULL_MEMBERS_INCLUDING_SELF);
-
-    List<ReviewRecipient> changed = Stream.of(profileChangeRecords)
-                                          .distinctBy(record -> record.getFromRecipient().getId())
-                                          .map(record -> new ReviewRecipient(record.getFromRecipient().resolve(), getProfileChangeDetails(record)))
-                                          .filter(recipient -> !recipient.getRecipient().isSystemContact())
-                                          .toList();
-
-    List<ReviewRecipient> results = new LinkedList<>();
-
-    for (ReviewRecipient recipient : changed) {
-      if (results.contains(recipient)) {
-        continue;
-      }
-
-      members.remove(recipient.getRecipient());
-
-      for (Recipient member : members) {
-        if (Objects.equals(member.getDisplayName(context), recipient.getRecipient().getDisplayName(context))) {
-          results.add(recipient);
-          results.add(new ReviewRecipient(member));
-        }
-      }
-    }
-
-    return results;
-  }
-
-  @WorkerThread
-  public static @NonNull List<MessageRecord> getProfileChangeRecordsForGroup(@NonNull Context context, @NonNull GroupId.V2 groupId) {
-    RecipientId recipientId = SignalDatabase.recipients().getByGroupId(groupId).get();
-    Long        threadId    = SignalDatabase.threads().getThreadIdFor(recipientId);
-
-    if (threadId == null) {
-      return Collections.emptyList();
-    } else {
-      return SignalDatabase.messages().getProfileChangeDetailsRecords(threadId, System.currentTimeMillis() - TIMEOUT);
-    }
-  }
-
   @WorkerThread
   public static int getGroupsInCommonCount(@NonNull Context context, @NonNull RecipientId recipientId) {
     return Stream.of(SignalDatabase.groups()
@@ -112,12 +25,4 @@ public static int getGroupsInCommonCount(@NonNull Context context, @NonNull Reci
                  .toList()
                  .size();
   }
-
-  private static @NonNull ProfileChangeDetails getProfileChangeDetails(@NonNull MessageRecord messageRecord) {
-    try {
-      return ProfileChangeDetails.ADAPTER.decode(Base64.decode(messageRecord.getBody()));
-    } catch (IOException e) {
-      throw new IllegalArgumentException(e);
-    }
-  }
 }
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 89aadcffad..6edda3fda5 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/push/SignalServiceNetworkAccess.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/push/SignalServiceNetworkAccess.kt
@@ -47,7 +47,6 @@ open class SignalServiceNetworkAccess(context: Context) {
     private const val COUNTRY_CODE_IRAN = 98
     private const val COUNTRY_CODE_CUBA = 53
     private const val COUNTRY_CODE_UZBEKISTAN = 998
-    private const val COUNTRY_CODE_UKRAINE = 380
 
     private const val G_HOST = "reflector-nrgwuv7kwq-uc.a.run.app"
     private const val F_SERVICE_HOST = "chat-signal.global.ssl.fastly.net"
@@ -73,7 +72,6 @@ open class SignalServiceNetworkAccess(context: Context) {
     private const val HTTPS_WWW_GOOGLE_COM_OM = "https://www.google.com.om"
     private const val HTTPS_WWW_GOOGLE_COM_QA = "https://www.google.com.qa"
     private const val HTTPS_WWW_GOOGLE_CO_UZ = "https://www.google.co.uz"
-    private const val HTTPS_WWW_GOOGLE_COM_UA = "https://www.google.com.ua"
 
     @JvmField
     val HOSTNAMES = setOf(
@@ -81,6 +79,7 @@ open class SignalServiceNetworkAccess(context: Context) {
       BuildConfig.STORAGE_URL.stripProtocol(),
       BuildConfig.SIGNAL_CDN_URL.stripProtocol(),
       BuildConfig.SIGNAL_CDN2_URL.stripProtocol(),
+      BuildConfig.SIGNAL_CDN3_URL.stripProtocol(),
       BuildConfig.SIGNAL_CDSI_URL.stripProtocol(),
       BuildConfig.SIGNAL_SFU_URL.stripProtocol(),
       BuildConfig.SIGNAL_STAGING_SFU_URL.stripProtocol(),
@@ -110,7 +109,6 @@ open class SignalServiceNetworkAccess(context: Context) {
       HTTPS_WWW_GOOGLE_COM_OM.stripProtocol(),
       HTTPS_WWW_GOOGLE_COM_QA.stripProtocol(),
       HTTPS_WWW_GOOGLE_CO_UZ.stripProtocol(),
-      HTTPS_WWW_GOOGLE_COM_UA.stripProtocol(),
     )
 
     private val GMAPS_CONNECTION_SPEC = ConnectionSpec.Builder(ConnectionSpec.MODERN_TLS)
@@ -243,9 +241,6 @@ open class SignalServiceNetworkAccess(context: Context) {
     COUNTRY_CODE_UZBEKISTAN to buildGConfiguration(
       listOf(HostConfig(HTTPS_WWW_GOOGLE_CO_UZ, G_HOST, GMAIL_CONNECTION_SPEC)) + baseGHostConfigs
     ),
-    COUNTRY_CODE_UKRAINE to buildGConfiguration(
-      listOf(HostConfig(HTTPS_WWW_GOOGLE_COM_UA, G_HOST, GMAIL_CONNECTION_SPEC)) + baseGHostConfigs
-    ),
     COUNTRY_CODE_IRAN to fConfig,
     COUNTRY_CODE_CUBA to fConfig
   )
diff --git a/app/src/main/java/org/thoughtcrime/securesms/recipients/ui/about/AboutSheet.kt b/app/src/main/java/org/thoughtcrime/securesms/recipients/ui/about/AboutSheet.kt
index ac30b404a9..ee0494f507 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/recipients/ui/about/AboutSheet.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/recipients/ui/about/AboutSheet.kt
@@ -218,7 +218,7 @@ private fun Content(
       )
     }
 
-    if (model.verified) {
+    if (!model.isSelf && model.verified) {
       AboutRow(
         startIcon = painterResource(id = R.drawable.check),
         text = stringResource(id = R.string.AboutSheet__verified),
@@ -227,24 +227,26 @@ private fun Content(
       )
     }
 
-    if (model.profileSharing || model.systemContact) {
-      AboutRow(
-        startIcon = painterResource(id = R.drawable.symbol_connections_24),
-        text = stringResource(id = R.string.AboutSheet__signal_connection),
-        endIcon = painterResource(id = R.drawable.symbol_chevron_right_compact_bold_16),
-        modifier = Modifier.align(alignment = Alignment.Start),
-        onClick = onClickSignalConnections
-      )
-    } else {
-      AboutRow(
-        startIcon = painterResource(id = R.drawable.chat_x),
-        text = stringResource(id = R.string.AboutSheet__no_direct_message, model.shortName),
-        modifier = Modifier.align(alignment = Alignment.Start),
-        onClick = onClickSignalConnections
-      )
+    if (!model.isSelf) {
+      if (model.profileSharing || model.systemContact) {
+        AboutRow(
+          startIcon = painterResource(id = R.drawable.symbol_connections_24),
+          text = stringResource(id = R.string.AboutSheet__signal_connection),
+          endIcon = painterResource(id = R.drawable.symbol_chevron_right_compact_bold_16),
+          modifier = Modifier.align(alignment = Alignment.Start),
+          onClick = onClickSignalConnections
+        )
+      } else {
+        AboutRow(
+          startIcon = painterResource(id = R.drawable.chat_x),
+          text = stringResource(id = R.string.AboutSheet__no_direct_message, model.shortName),
+          modifier = Modifier.align(alignment = Alignment.Start),
+          onClick = onClickSignalConnections
+        )
+      }
     }
 
-    if (model.systemContact) {
+    if (!model.isSelf && model.systemContact) {
       AboutRow(
         startIcon = painterResource(id = R.drawable.symbol_person_circle_24),
         text = stringResource(id = R.string.AboutSheet__s_is_in_your_system_contacts, model.shortName),
@@ -260,23 +262,25 @@ private fun Content(
       )
     }
 
-    val groupsInCommonText = if (model.groupsInCommon > 0) {
-      pluralStringResource(id = R.plurals.AboutSheet__d_groups_in, model.groupsInCommon, model.groupsInCommon)
-    } else {
-      stringResource(id = R.string.AboutSheet__you_have_no_groups_in_common)
-    }
+    if (!model.isSelf) {
+      val groupsInCommonText = if (model.groupsInCommon > 0) {
+        pluralStringResource(id = R.plurals.AboutSheet__d_groups_in, model.groupsInCommon, model.groupsInCommon)
+      } else {
+        stringResource(id = R.string.AboutSheet__you_have_no_groups_in_common)
+      }
 
-    val groupsInCommonIcon = if (!model.profileSharing && model.groupsInCommon == 0) {
-      painterResource(R.drawable.symbol_error_circle_24)
-    } else {
-      painterResource(R.drawable.symbol_group_24)
-    }
+      val groupsInCommonIcon = if (!model.profileSharing && model.groupsInCommon == 0) {
+        painterResource(R.drawable.symbol_error_circle_24)
+      } else {
+        painterResource(R.drawable.symbol_group_24)
+      }
 
-    AboutRow(
-      startIcon = groupsInCommonIcon,
-      text = groupsInCommonText,
-      modifier = Modifier.fillMaxWidth()
-    )
+      AboutRow(
+        startIcon = groupsInCommonIcon,
+        text = groupsInCommonText,
+        modifier = Modifier.fillMaxWidth()
+      )
+    }
 
     if (model.note.isNotBlank()) {
       AboutRow(
diff --git a/app/src/main/java/org/thoughtcrime/securesms/registration/PushChallengeRequest.java b/app/src/main/java/org/thoughtcrime/securesms/registration/PushChallengeRequest.java
index 13dc4ad293..9f26cc1460 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/registration/PushChallengeRequest.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/registration/PushChallengeRequest.java
@@ -110,7 +110,7 @@ public void onChallengeEvent(@NonNull PushChallengeEvent pushChallengeEvent) {
     }
   }
 
-  static class PushChallengeEvent {
+  public static class PushChallengeEvent {
     private final String challenge;
 
     PushChallengeEvent(String challenge) {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/registration/RegistrationData.kt b/app/src/main/java/org/thoughtcrime/securesms/registration/RegistrationData.kt
index 41a7db86d5..a1f6ede3a6 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/registration/RegistrationData.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/registration/RegistrationData.kt
@@ -2,6 +2,7 @@ package org.thoughtcrime.securesms.registration
 
 import org.signal.libsignal.zkgroup.profiles.ProfileKey
 
+// TODO [regv2]: fold sessionId into this?
 data class RegistrationData(
   val code: String,
   val e164: String,
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 16e4cb8302..391c5ec7a9 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/registration/VerifyAccountRepository.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/registration/VerifyAccountRepository.kt
@@ -207,7 +207,7 @@ class VerifyAccountRepository(private val context: Application) {
     }.subscribeOn(Schedulers.io())
   }
 
-  interface MasterKeyProducer {
+  fun interface MasterKeyProducer {
     @Throws(IOException::class, SvrWrongPinException::class, SvrNoDataException::class)
     fun produceMasterKey(): MasterKey
   }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/registration/compose/GrantPermissionsScreen.kt b/app/src/main/java/org/thoughtcrime/securesms/registration/compose/GrantPermissionsScreen.kt
new file mode 100644
index 0000000000..666ee3b12c
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/registration/compose/GrantPermissionsScreen.kt
@@ -0,0 +1,212 @@
+/*
+ * Copyright 2024 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.thoughtcrime.securesms.registration.compose
+
+import androidx.compose.foundation.Image
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.lazy.LazyColumn
+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.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.alpha
+import androidx.compose.ui.graphics.vector.ImageVector
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.res.vectorResource
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+import org.signal.core.ui.Buttons
+import org.signal.core.ui.theme.SignalTheme
+import org.thoughtcrime.securesms.R
+
+@Preview
+@Composable
+fun GrantPermissionsScreenPreview() {
+  SignalTheme(isDarkMode = false) {
+    GrantPermissionsScreen(
+      deviceBuildVersion = 33,
+      isBackupSelectionRequired = true,
+      isSearchingForBackup = true,
+      {},
+      {}
+    )
+  }
+}
+
+/**
+ * Layout that explains permissions rationale to the user.
+ */
+@Composable
+fun GrantPermissionsScreen(
+  deviceBuildVersion: Int,
+  isBackupSelectionRequired: Boolean,
+  isSearchingForBackup: Boolean,
+  onNextClicked: () -> Unit,
+  onNotNowClicked: () -> Unit
+) {
+  Surface {
+    Column(
+      modifier = Modifier
+        .padding(horizontal = 24.dp)
+        .padding(top = 40.dp, bottom = 24.dp)
+    ) {
+      LazyColumn(
+        modifier = Modifier.weight(1f)
+      ) {
+        item {
+          Text(
+            text = stringResource(id = R.string.GrantPermissionsFragment__allow_permissions),
+            style = MaterialTheme.typography.headlineMedium
+          )
+        }
+
+        item {
+          Text(
+            text = stringResource(id = R.string.GrantPermissionsFragment__to_help_you_message_people_you_know),
+            color = MaterialTheme.colorScheme.onSurfaceVariant,
+            modifier = Modifier.padding(top = 12.dp, bottom = 41.dp)
+          )
+        }
+
+        if (deviceBuildVersion >= 33) {
+          item {
+            PermissionRow(
+              imageVector = ImageVector.vectorResource(id = R.drawable.permission_notification),
+              title = stringResource(id = R.string.GrantPermissionsFragment__notifications),
+              subtitle = stringResource(id = R.string.GrantPermissionsFragment__get_notified_when)
+            )
+          }
+        }
+
+        item {
+          PermissionRow(
+            imageVector = ImageVector.vectorResource(id = R.drawable.permission_contact),
+            title = stringResource(id = R.string.GrantPermissionsFragment__contacts),
+            subtitle = stringResource(id = R.string.GrantPermissionsFragment__find_people_you_know)
+          )
+        }
+
+        if (deviceBuildVersion < 29 || !isBackupSelectionRequired) {
+          item {
+            PermissionRow(
+              imageVector = ImageVector.vectorResource(id = R.drawable.permission_file),
+              title = stringResource(id = R.string.GrantPermissionsFragment__storage),
+              subtitle = stringResource(id = R.string.GrantPermissionsFragment__send_photos_videos_and_files)
+            )
+          }
+        }
+
+        item {
+          PermissionRow(
+            imageVector = ImageVector.vectorResource(id = R.drawable.permission_phone),
+            title = stringResource(id = R.string.GrantPermissionsFragment__phone_calls),
+            subtitle = stringResource(id = R.string.GrantPermissionsFragment__make_registering_easier)
+          )
+        }
+      }
+
+      Row {
+        TextButton(onClick = onNotNowClicked) {
+          Text(
+            text = stringResource(id = R.string.GrantPermissionsFragment__not_now)
+          )
+        }
+
+        Spacer(modifier = Modifier.weight(1f))
+
+        if (isSearchingForBackup) {
+          Box {
+            NextButton(
+              isSearchingForBackup = true,
+              onNextClicked = onNextClicked
+            )
+
+            CircularProgressIndicator(
+              modifier = Modifier.align(Alignment.Center)
+            )
+          }
+        } else {
+          NextButton(
+            isSearchingForBackup = false,
+            onNextClicked = onNextClicked
+          )
+        }
+      }
+    }
+  }
+}
+
+@Preview
+@Composable
+fun PermissionRowPreview() {
+  PermissionRow(
+    imageVector = ImageVector.vectorResource(id = R.drawable.permission_notification),
+    title = stringResource(id = R.string.GrantPermissionsFragment__notifications),
+    subtitle = stringResource(id = R.string.GrantPermissionsFragment__get_notified_when)
+  )
+}
+
+@Composable
+fun PermissionRow(
+  imageVector: ImageVector,
+  title: String,
+  subtitle: String
+) {
+  Row(modifier = Modifier.padding(bottom = 32.dp)) {
+    Image(
+      imageVector = imageVector,
+      contentDescription = null,
+      modifier = Modifier.size(48.dp)
+    )
+
+    Spacer(modifier = Modifier.size(16.dp))
+
+    Column {
+      Text(
+        text = title,
+        style = MaterialTheme.typography.titleSmall
+      )
+
+      Text(
+        text = subtitle,
+        color = MaterialTheme.colorScheme.onSurfaceVariant
+      )
+    }
+
+    Spacer(modifier = Modifier.size(32.dp))
+  }
+}
+
+@Composable
+fun NextButton(
+  isSearchingForBackup: Boolean,
+  onNextClicked: () -> Unit
+) {
+  val alpha = if (isSearchingForBackup) {
+    0f
+  } else {
+    1f
+  }
+
+  Buttons.LargeTonal(
+    onClick = onNextClicked,
+    enabled = !isSearchingForBackup,
+    modifier = Modifier.alpha(alpha)
+  ) {
+    Text(
+      text = stringResource(id = R.string.GrantPermissionsFragment__next)
+    )
+  }
+}
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
index 8e750d1a85..d567d840a4 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/registration/fragments/EnterPhoneNumberFragment.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/registration/fragments/EnterPhoneNumberFragment.java
@@ -10,7 +10,6 @@
 import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
-import android.view.inputmethod.InputMethodManager;
 import android.widget.EditText;
 import android.widget.ScrollView;
 
@@ -143,7 +142,7 @@ public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceStat
     }
     controller.setNumberAndCountryCode(viewModelNumber);
 
-    showKeyboard(number.getEditText());
+    ViewUtil.focusAndShowKeyboard(number.getEditText());
 
     if (viewModel.hasUserSkippedReRegisterFlow() && viewModel.shouldAutoShowSmsConfirmDialog()) {
       viewModel.setAutoShowSmsConfirmDialog(false);
@@ -151,12 +150,6 @@ public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceStat
     }
   }
 
-  private void showKeyboard(View viewToFocus) {
-    viewToFocus.requestFocus();
-    InputMethodManager imm = (InputMethodManager) requireContext().getSystemService(Context.INPUT_METHOD_SERVICE);
-    imm.showSoftInput(viewToFocus, InputMethodManager.SHOW_IMPLICIT);
-  }
-
   @Override
   public void onCreateOptionsMenu(@NonNull Menu menu, @NonNull MenuInflater inflater) {
     inflater.inflate(R.menu.enter_phone_number, menu);
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
index 94ccdbdab8..c37801b045 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/registration/fragments/GrantPermissionsFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/registration/fragments/GrantPermissionsFragment.kt
@@ -6,38 +6,15 @@
 package org.thoughtcrime.securesms.registration.fragments
 
 import android.os.Build
-import androidx.compose.foundation.Image
-import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.Spacer
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.size
-import androidx.compose.foundation.lazy.LazyColumn
-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.getValue
 import androidx.compose.runtime.mutableStateOf
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.draw.alpha
-import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.res.vectorResource
-import androidx.compose.ui.tooling.preview.Preview
-import androidx.compose.ui.unit.dp
 import androidx.fragment.app.activityViewModels
 import androidx.navigation.fragment.navArgs
-import org.signal.core.ui.Buttons
-import org.signal.core.ui.theme.SignalTheme
-import org.thoughtcrime.securesms.R
 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
 
@@ -124,180 +101,3 @@ class GrantPermissionsFragment : ComposeFragment() {
     RESTORE_BACKUP
   }
 }
-
-@Preview
-@Composable
-fun GrantPermissionsScreenPreview() {
-  SignalTheme(isDarkMode = false) {
-    GrantPermissionsScreen(
-      deviceBuildVersion = 33,
-      isBackupSelectionRequired = true,
-      isSearchingForBackup = true,
-      {},
-      {}
-    )
-  }
-}
-
-@Composable
-fun GrantPermissionsScreen(
-  deviceBuildVersion: Int,
-  isBackupSelectionRequired: Boolean,
-  isSearchingForBackup: Boolean,
-  onNextClicked: () -> Unit,
-  onNotNowClicked: () -> Unit
-) {
-  Surface {
-    Column(
-      modifier = Modifier
-        .padding(horizontal = 24.dp)
-        .padding(top = 40.dp, bottom = 24.dp)
-    ) {
-      LazyColumn(
-        modifier = Modifier.weight(1f)
-      ) {
-        item {
-          Text(
-            text = stringResource(id = R.string.GrantPermissionsFragment__allow_permissions),
-            style = MaterialTheme.typography.headlineMedium
-          )
-        }
-
-        item {
-          Text(
-            text = stringResource(id = R.string.GrantPermissionsFragment__to_help_you_message_people_you_know),
-            color = MaterialTheme.colorScheme.onSurfaceVariant,
-            modifier = Modifier.padding(top = 12.dp, bottom = 41.dp)
-          )
-        }
-
-        if (deviceBuildVersion >= 33) {
-          item {
-            PermissionRow(
-              imageVector = ImageVector.vectorResource(id = R.drawable.permission_notification),
-              title = stringResource(id = R.string.GrantPermissionsFragment__notifications),
-              subtitle = stringResource(id = R.string.GrantPermissionsFragment__get_notified_when)
-            )
-          }
-        }
-
-        item {
-          PermissionRow(
-            imageVector = ImageVector.vectorResource(id = R.drawable.permission_contact),
-            title = stringResource(id = R.string.GrantPermissionsFragment__contacts),
-            subtitle = stringResource(id = R.string.GrantPermissionsFragment__find_people_you_know)
-          )
-        }
-
-        if (deviceBuildVersion < 29 || !isBackupSelectionRequired) {
-          item {
-            PermissionRow(
-              imageVector = ImageVector.vectorResource(id = R.drawable.permission_file),
-              title = stringResource(id = R.string.GrantPermissionsFragment__storage),
-              subtitle = stringResource(id = R.string.GrantPermissionsFragment__send_photos_videos_and_files)
-            )
-          }
-        }
-
-        item {
-          PermissionRow(
-            imageVector = ImageVector.vectorResource(id = R.drawable.permission_phone),
-            title = stringResource(id = R.string.GrantPermissionsFragment__phone_calls),
-            subtitle = stringResource(id = R.string.GrantPermissionsFragment__make_registering_easier)
-          )
-        }
-      }
-
-      Row {
-        TextButton(onClick = onNotNowClicked) {
-          Text(
-            text = stringResource(id = R.string.GrantPermissionsFragment__not_now)
-          )
-        }
-
-        Spacer(modifier = Modifier.weight(1f))
-
-        if (isSearchingForBackup) {
-          Box {
-            NextButton(
-              isSearchingForBackup = true,
-              onNextClicked = onNextClicked
-            )
-
-            CircularProgressIndicator(
-              modifier = Modifier.align(Alignment.Center)
-            )
-          }
-        } else {
-          NextButton(
-            isSearchingForBackup = false,
-            onNextClicked = onNextClicked
-          )
-        }
-      }
-    }
-  }
-}
-
-@Preview
-@Composable
-fun PermissionRowPreview() {
-  PermissionRow(
-    imageVector = ImageVector.vectorResource(id = R.drawable.permission_notification),
-    title = stringResource(id = R.string.GrantPermissionsFragment__notifications),
-    subtitle = stringResource(id = R.string.GrantPermissionsFragment__get_notified_when)
-  )
-}
-
-@Composable
-fun PermissionRow(
-  imageVector: ImageVector,
-  title: String,
-  subtitle: String
-) {
-  Row(modifier = Modifier.padding(bottom = 32.dp)) {
-    Image(
-      imageVector = imageVector,
-      contentDescription = null,
-      modifier = Modifier.size(48.dp)
-    )
-
-    Spacer(modifier = Modifier.size(16.dp))
-
-    Column {
-      Text(
-        text = title,
-        style = MaterialTheme.typography.titleSmall
-      )
-
-      Text(
-        text = subtitle,
-        color = MaterialTheme.colorScheme.onSurfaceVariant
-      )
-    }
-
-    Spacer(modifier = Modifier.size(32.dp))
-  }
-}
-
-@Composable
-fun NextButton(
-  isSearchingForBackup: Boolean,
-  onNextClicked: () -> Unit
-) {
-  val alpha = if (isSearchingForBackup) {
-    0f
-  } else {
-    1f
-  }
-
-  Buttons.LargeTonal(
-    onClick = onNextClicked,
-    enabled = !isSearchingForBackup,
-    modifier = Modifier.alpha(alpha)
-  ) {
-    Text(
-      text = stringResource(id = R.string.GrantPermissionsFragment__next)
-    )
-  }
-}
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
index 6069288b7c..bab50b5ccb 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/registration/fragments/ReRegisterWithPinFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/registration/fragments/ReRegisterWithPinFragment.kt
@@ -7,6 +7,7 @@ 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
@@ -119,7 +120,30 @@ class ReRegisterWithPinFragment : LoggingFragment(R.layout.pin_restore_entry_fra
       .subscribe { processor ->
         if (processor.hasResult()) {
           Log.i(TAG, "Successfully re-registered via skip flow")
-          findNavController().safeNavigate(R.id.action_reRegisterWithPinFragment_to_registrationCompletePlaceHolderFragment)
+          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
         }
 
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 bf7c548b21..6c03397b14 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
@@ -1,3 +1,8 @@
+/*
+ * Copyright 2024 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
 package org.thoughtcrime.securesms.registration.fragments;
 
 import android.content.Context;
@@ -13,7 +18,8 @@
 import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
 import org.thoughtcrime.securesms.util.Debouncer;
 
-final class SignalStrengthPhoneStateListener extends PhoneStateListener
+// TODO [nicholas]: move to v2 package and make package-private. convert to Kotlin
+public final class SignalStrengthPhoneStateListener extends PhoneStateListener
                                              implements DefaultLifecycleObserver
 {
   private static final String TAG = Log.tag(SignalStrengthPhoneStateListener.class);
@@ -21,7 +27,8 @@ final class SignalStrengthPhoneStateListener extends PhoneStateListener
   private final Callback  callback;
   private final Debouncer debouncer = new Debouncer(1000);
 
-  SignalStrengthPhoneStateListener(@NonNull LifecycleOwner lifecycleOwner, @NonNull Callback callback) {
+  @SuppressWarnings("deprecation")
+  public SignalStrengthPhoneStateListener(@NonNull LifecycleOwner lifecycleOwner, @NonNull Callback callback) {
     this.callback = callback;
 
     lifecycleOwner.getLifecycle().addObserver(this);
@@ -45,7 +52,7 @@ private boolean isLowLevel(@NonNull SignalStrength signalStrength) {
     return signalStrength.getLevel() == 0;
   }
 
-  interface Callback {
+  public interface Callback {
     void onNoCellSignalPresent();
 
     void onCellSignalPresent();
diff --git a/app/src/main/java/org/thoughtcrime/securesms/registration/v2/data/RegistrationRepository.kt b/app/src/main/java/org/thoughtcrime/securesms/registration/v2/data/RegistrationRepository.kt
new file mode 100644
index 0000000000..b043ae431b
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/registration/v2/data/RegistrationRepository.kt
@@ -0,0 +1,458 @@
+/*
+ * Copyright 2024 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.thoughtcrime.securesms.registration.v2.data
+
+import android.app.backup.BackupManager
+import android.content.Context
+import androidx.annotation.WorkerThread
+import androidx.core.app.NotificationManagerCompat
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.withContext
+import org.greenrobot.eventbus.EventBus
+import org.greenrobot.eventbus.Subscribe
+import org.signal.core.util.Base64
+import org.signal.core.util.logging.Log
+import org.signal.libsignal.protocol.IdentityKeyPair
+import org.signal.libsignal.protocol.util.KeyHelper
+import org.signal.libsignal.zkgroup.profiles.ProfileKey
+import org.thoughtcrime.securesms.AppCapabilities
+import org.thoughtcrime.securesms.crypto.PreKeyUtil
+import org.thoughtcrime.securesms.crypto.ProfileKeyUtil
+import org.thoughtcrime.securesms.crypto.SenderKeyUtil
+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.gcm.FcmUtil
+import org.thoughtcrime.securesms.jobs.DirectoryRefreshJob
+import org.thoughtcrime.securesms.jobs.PreKeysSyncJob
+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.SvrRepository
+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.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.account.AccountAttributes
+import org.whispersystems.signalservice.api.account.PreKeyCollection
+import org.whispersystems.signalservice.api.crypto.UnidentifiedAccess
+import org.whispersystems.signalservice.api.kbs.MasterKey
+import org.whispersystems.signalservice.api.kbs.PinHashUtil
+import org.whispersystems.signalservice.api.push.ServiceId
+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.internal.push.AuthCredentials
+import org.whispersystems.signalservice.internal.push.RegistrationSessionMetadataHeaders
+import org.whispersystems.signalservice.internal.push.RegistrationSessionMetadataResponse
+import java.nio.charset.StandardCharsets
+import java.util.Locale
+import java.util.concurrent.CountDownLatch
+import java.util.concurrent.TimeUnit
+import kotlin.time.Duration.Companion.seconds
+
+/**
+ * A repository that deals with disk I/O during account registration.
+ */
+object RegistrationRepository {
+
+  private val TAG = Log.tag(RegistrationRepository::class.java)
+
+  private val PUSH_REQUEST_TIMEOUT = 5.seconds.inWholeMilliseconds
+
+  /**
+   * Retrieve the FCM token from the Firebase service.
+   */
+  suspend fun getFcmToken(context: Context): String? =
+    withContext(Dispatchers.Default) {
+      FcmUtil.getToken(context).orElse(null)
+    }
+
+  /**
+   * Queries the local store for whether a PIN is set.
+   */
+  @JvmStatic
+  fun hasPin(): Boolean {
+    return SignalStore.svr().hasPin()
+  }
+
+  /**
+   * Queries, and creates if needed, the local registration ID.
+   */
+  @JvmStatic
+  fun getRegistrationId(): Int {
+    // TODO [regv2]: make creation more explicit instead of hiding it in this getter
+    var registrationId = SignalStore.account().registrationId
+    if (registrationId == 0) {
+      registrationId = KeyHelper.generateRegistrationId(false)
+      SignalStore.account().registrationId = registrationId
+    }
+    return registrationId
+  }
+
+  /**
+   * Queries, and creates if needed, the local PNI registration ID.
+   */
+  @JvmStatic
+  fun getPniRegistrationId(): Int {
+    // TODO [regv2]: make creation more explicit instead of hiding it in this getter
+    var pniRegistrationId = SignalStore.account().pniRegistrationId
+    if (pniRegistrationId == 0) {
+      pniRegistrationId = KeyHelper.generateRegistrationId(false)
+      SignalStore.account().pniRegistrationId = pniRegistrationId
+    }
+    return pniRegistrationId
+  }
+
+  /**
+   * Queries, and creates if needed, the local profile key.
+   */
+  @JvmStatic
+  suspend fun getProfileKey(e164: String): ProfileKey =
+    withContext(Dispatchers.IO) {
+      // TODO [regv2]: make creation more explicit instead of hiding it in this getter
+      val recipientTable = SignalDatabase.recipients
+      val recipient = recipientTable.getByE164(e164)
+      var profileKey = if (recipient.isPresent) {
+        ProfileKeyUtil.profileKeyOrNull(Recipient.resolved(recipient.get()).profileKey)
+      } else {
+        null
+      }
+      if (profileKey == null) {
+        profileKey = ProfileKeyUtil.createNew()
+        Log.i(TAG, "No profile key found, created a new one")
+      }
+      profileKey
+    }
+
+  /**
+   * Takes a server response from a successful registration and persists the relevant data.
+   */
+  @WorkerThread
+  @JvmStatic
+  suspend fun registerAccountLocally(context: Context, registrationData: RegistrationData, response: AccountRegistrationResult, reglockEnabled: Boolean) =
+    withContext(Dispatchers.IO) {
+      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)
+
+      ApplicationDependencies.resetProtocolStores()
+
+      ApplicationDependencies.getProtocolStore().aci().sessions().archiveAllSessions()
+      ApplicationDependencies.getProtocolStore().pni().sessions().archiveAllSessions()
+      SenderKeyUtil.clearAllState()
+
+      val aciProtocolStore = ApplicationDependencies.getProtocolStore().aci()
+      val aciMetadataStore = SignalStore.account().aciPreKeys
+
+      val pniProtocolStore = ApplicationDependencies.getProtocolStore().pni()
+      val pniMetadataStore = SignalStore.account().pniPreKeys
+
+      storeSignedAndLastResortPreKeys(aciProtocolStore, aciMetadataStore, aciPreKeyCollection)
+      storeSignedAndLastResortPreKeys(pniProtocolStore, pniMetadataStore, pniPreKeyCollection)
+
+      val recipientTable = SignalDatabase.recipients
+      val selfId = Recipient.trustedPush(aci, pni, registrationData.e164).id
+
+      recipientTable.setProfileSharing(selfId, true)
+      recipientTable.markRegisteredOrThrow(selfId, aci)
+      recipientTable.linkIdsForSelf(aci, pni, registrationData.e164)
+      recipientTable.setProfileKey(selfId, registrationData.profileKey)
+
+      ApplicationDependencies.getRecipientCache().clearSelf()
+
+      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)
+      TextSecurePreferences.setPromptedPushRegistration(context, true)
+      TextSecurePreferences.setUnauthorizedReceived(context, false)
+      NotificationManagerCompat.from(context).cancel(NotificationIds.UNREGISTERED_NOTIFICATION_ID)
+
+      SvrRepository.onRegistrationComplete(response.masterKey, response.pin, hasPin, reglockEnabled)
+
+      ApplicationDependencies.closeConnections()
+      ApplicationDependencies.getIncomingMessageObserver()
+      PreKeysSyncJob.enqueue()
+
+      val jobManager = ApplicationDependencies.getJobManager()
+      jobManager.add(DirectoryRefreshJob(false))
+      jobManager.add(RotateCertificateJob())
+
+      DirectoryRefreshListener.schedule(context)
+      RotateSignedPreKeyListener.schedule(context)
+    }
+
+  @JvmStatic
+  private fun saveOwnIdentityKey(selfId: RecipientId, serviceId: ServiceId, protocolStore: SignalServiceAccountDataStoreImpl, now: Long) {
+    protocolStore.identities().saveIdentityWithoutSideEffects(
+      selfId,
+      serviceId,
+      protocolStore.identityKeyPair.publicKey,
+      IdentityTable.VerifiedStatus.VERIFIED,
+      true,
+      now,
+      true
+    )
+  }
+
+  @JvmStatic
+  private fun storeSignedAndLastResortPreKeys(protocolStore: SignalServiceAccountDataStoreImpl, metadataStore: PreKeyMetadataStore, preKeyCollection: PreKeyCollection) {
+    PreKeyUtil.storeSignedPreKey(protocolStore, metadataStore, preKeyCollection.signedPreKey)
+    metadataStore.isSignedPreKeyRegistered = true
+    metadataStore.activeSignedPreKeyId = preKeyCollection.signedPreKey.id
+    metadataStore.lastSignedPreKeyRotationTime = System.currentTimeMillis()
+
+    PreKeyUtil.storeLastResortKyberPreKey(protocolStore, metadataStore, preKeyCollection.lastResortKyberPreKey)
+    metadataStore.lastResortKyberPreKeyId = preKeyCollection.lastResortKyberPreKey.id
+    metadataStore.lastResortKyberPreKeyRotationTime = System.currentTimeMillis()
+  }
+
+  fun canUseLocalRecoveryPassword(): Boolean {
+    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!")
+    return PinHashUtil.verifyLocalPinHash(pinHash, pin)
+  }
+
+  suspend fun fetchMasterKeyFromSvrRemote(pin: String, authCredentials: AuthCredentials): MasterKey =
+    withContext(Dispatchers.IO) {
+      val masterKey = SvrRepository.restoreMasterKeyPreRegistration(SvrAuthCredentialSet(null, authCredentials), pin)
+      SignalStore.svr().setMasterKey(masterKey, pin)
+      return@withContext masterKey
+    }
+
+  /**
+   * Asks the service to send a verification code through one of our supported channels (SMS, phone call).
+   * This requires two or more network calls:
+   * 1. Create (or reuse) a session.
+   * 2. (Optional) If the session has any proof requirements ("challenges"), the user must solve them and submit the proof.
+   * 3. Once the service responds we are allowed to, we request the verification code.
+   */
+  suspend fun requestSmsCode(context: Context, e164: String, password: String, mcc: String?, mnc: String?, mode: Mode = Mode.SMS_WITHOUT_LISTENER): NetworkResult<RegistrationSessionMetadataResponse> =
+    withContext(Dispatchers.IO) {
+      val fcmToken: String? = FcmUtil.getToken(context).orElse(null)
+      val api: RegistrationApi = AccountManagerFactory.getInstance().createUnauthenticated(context, e164, SignalServiceAddress.DEFAULT_DEVICE_ID, password).registrationApi
+      val activeSession = if (fcmToken == null) {
+        // TODO [regv2]
+        val notImplementedError = NotImplementedError()
+        Log.w(TAG, "Not yet implemented!", notImplementedError)
+        NetworkResult.ApplicationError(notImplementedError)
+      } else {
+        createSessionAndBlockForPushChallenge(api, fcmToken, mcc, mnc)
+      }
+
+      activeSession.then { session ->
+        val sessionId = session.body.id
+        SignalStore.registrationValues().sessionId = sessionId
+        SignalStore.registrationValues().sessionE164 = e164
+        if (!session.body.allowedToRequestCode) {
+          val challenges = session.body.requestedInformation.joinToString()
+          Log.w(TAG, "Not allowed to request code! Remaining challenges: $challenges")
+          // TODO [regv2]: actually handle challenges
+        }
+        // TODO [regv2]: support other verification code [Mode] options
+        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)
+        }
+      }
+    }
+
+  /**
+   * Submits the user-entered verification code to the service.
+   */
+  suspend fun submitVerificationCode(context: Context, e164: String, password: String, sessionId: String, registrationData: RegistrationData): NetworkResult<RegistrationSessionMetadataResponse> =
+    withContext(Dispatchers.IO) {
+      val api: RegistrationApi = AccountManagerFactory.getInstance().createUnauthenticated(context, e164, SignalServiceAddress.DEFAULT_DEVICE_ID, password).registrationApi
+      api.verifyAccount(registrationData.code, sessionId)
+    }
+
+  /**
+   * 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> =
+    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 registrationLock: String? = masterKey?.deriveRegistrationLock()
+
+      val accountAttributes = AccountAttributes(
+        signalingKey = null,
+        registrationId = registrationData.registrationId,
+        fetchesMessages = registrationData.isNotFcm,
+        registrationLock = registrationLock,
+        unidentifiedAccessKey = unidentifiedAccessKey,
+        unrestrictedUnidentifiedAccess = universalUnidentifiedAccess,
+        capabilities = AppCapabilities.getCapabilities(true),
+        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().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)
+
+      api.registerAccount(sessionId, registrationData.recoveryPassword, accountAttributes, aciPreKeyCollection, pniPreKeyCollection, registrationData.fcmToken, true)
+        .map { accountRegistrationResponse ->
+          AccountRegistrationResult(
+            uuid = accountRegistrationResponse.uuid,
+            pni = accountRegistrationResponse.pni,
+            storageCapable = accountRegistrationResponse.storageCapable,
+            number = accountRegistrationResponse.number,
+            masterKey = masterKey,
+            pin = pin,
+            aciPreKeyCollection = aciPreKeyCollection,
+            pniPreKeyCollection = pniPreKeyCollection
+          )
+        }
+    }
+
+  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()
+      val eventBus = EventBus.getDefault()
+      eventBus.register(subscriber)
+
+      try {
+        val sessionCreationResponse = accountManager.createRegistrationSession(fcmToken, mcc, mnc)
+        if (sessionCreationResponse !is NetworkResult.Success) {
+          return@withContext sessionCreationResponse
+        }
+
+        val receivedPush = subscriber.latch.await(PUSH_REQUEST_TIMEOUT, TimeUnit.MILLISECONDS)
+        eventBus.unregister(subscriber)
+
+        if (receivedPush) {
+          val challenge = subscriber.challenge
+          if (challenge != null) {
+            Log.w(TAG, "Push challenge token received.")
+            return@withContext accountManager.submitPushChallengeToken(sessionCreationResponse.result.body.id, challenge)
+          } else {
+            Log.w(TAG, "Push received but challenge token was null.")
+          }
+        } else {
+          Log.i(TAG, "Push challenge timed out.")
+        }
+        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
+        return@withContext NetworkResult.ApplicationError<RegistrationSessionMetadataResponse>(ex)
+      }
+    }
+
+  @JvmStatic
+  fun deriveTimestamp(headers: RegistrationSessionMetadataHeaders, deltaSeconds: Int?): Long {
+    if (deltaSeconds == null) {
+      return 0L
+    }
+
+    val timestamp: Long = headers.timestamp
+    return timestamp + deltaSeconds.seconds.inWholeMilliseconds
+  }
+
+  suspend fun hasValidSvrAuthCredentials(context: Context, e164: String, password: String): AuthCredentials? =
+    withContext(Dispatchers.IO) {
+      val usernamePasswords = SignalStore.svr()
+        .authTokenList
+        .take(10)
+        .map {
+          it.replace("Basic ", "").trim()
+        }
+        .map {
+          Base64.decode(it) // TODO [regv2]: figure out why Android Studio doesn't like mapCatching
+        }
+        .map {
+          String(it, StandardCharsets.ISO_8859_1)
+        }
+
+      if (usernamePasswords.isEmpty()) {
+        return@withContext null
+      }
+      val api: RegistrationApi = AccountManagerFactory.getInstance().createUnauthenticated(context, e164, SignalServiceAddress.DEFAULT_DEVICE_ID, password).registrationApi
+
+      val authCheck = api.getSvrAuthCredential(e164, usernamePasswords)
+      if (authCheck !is NetworkResult.Success) {
+        return@withContext null
+      }
+
+      val removedInvalidTokens = SignalStore.svr().removeAuthTokens(authCheck.result.invalid)
+      if (removedInvalidTokens) {
+        BackupManager(context).dataChanged()
+      }
+
+      return@withContext authCheck.result.match
+    }
+
+  enum class Mode(val isSmsRetrieverSupported: Boolean) {
+    SMS_WITH_LISTENER(true), SMS_WITHOUT_LISTENER(false), PHONE_CALL(false)
+  }
+
+  private class PushTokenChallengeSubscriber {
+    var challenge: String? = null
+    val latch = CountDownLatch(1)
+
+    @Subscribe
+    fun onChallengeEvent(pushChallengeEvent: PushChallengeRequest.PushChallengeEvent) {
+      challenge = pushChallengeEvent.challenge
+      latch.countDown()
+    }
+  }
+
+  data class AccountRegistrationResult(
+    val uuid: String,
+    val pni: String,
+    val storageCapable: Boolean,
+    val number: String,
+    val masterKey: MasterKey?,
+    val pin: String?,
+    val aciPreKeyCollection: PreKeyCollection,
+    val pniPreKeyCollection: PreKeyCollection
+  )
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/registration/v2/ui/RegistrationCheckpoint.kt b/app/src/main/java/org/thoughtcrime/securesms/registration/v2/ui/RegistrationCheckpoint.kt
new file mode 100644
index 0000000000..f679d3fcd0
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/registration/v2/ui/RegistrationCheckpoint.kt
@@ -0,0 +1,28 @@
+/*
+ * Copyright 2024 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.thoughtcrime.securesms.registration.v2.ui
+
+/**
+ * An ordered list of checkpoints of the registration process.
+ * This is used for screens to know when to advance, as well as restoring state after process death.
+ */
+enum class RegistrationCheckpoint {
+  INITIALIZATION,
+  PERMISSIONS_GRANTED,
+  BACKUP_DETECTED,
+  BACKUP_SELECTED,
+  BACKUP_RESTORED,
+  PUSH_NETWORK_AUDITED,
+  PHONE_NUMBER_CONFIRMED,
+  PIN_CONFIRMED,
+  VERIFICATION_CODE_REQUESTED,
+  CHALLENGE_RECEIVED,
+  CHALLENGE_COMPLETED,
+  VERIFICATION_CODE_ENTERED,
+  VERIFICATION_CODE_VALIDATED,
+  SERVICE_REGISTRATION_COMPLETED,
+  LOCAL_REGISTRATION_COMPLETE
+}
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
new file mode 100644
index 0000000000..163b4e4691
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/registration/v2/ui/RegistrationV2Activity.kt
@@ -0,0 +1,83 @@
+/*
+ * 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/RegistrationV2Extensions.kt b/app/src/main/java/org/thoughtcrime/securesms/registration/v2/ui/RegistrationV2Extensions.kt
new file mode 100644
index 0000000000..9b76f73561
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/registration/v2/ui/RegistrationV2Extensions.kt
@@ -0,0 +1,13 @@
+/*
+ * Copyright 2024 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.thoughtcrime.securesms.registration.v2.ui
+
+import com.google.i18n.phonenumbers.PhoneNumberUtil
+import com.google.i18n.phonenumbers.Phonenumber.PhoneNumber
+
+fun PhoneNumber.toE164(): String {
+  return PhoneNumberUtil.getInstance().format(this, PhoneNumberUtil.PhoneNumberFormat.E164)
+}
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
new file mode 100644
index 0000000000..e39cb5697a
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/registration/v2/ui/RegistrationV2State.kt
@@ -0,0 +1,32 @@
+/*
+ * 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 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
new file mode 100644
index 0000000000..4229b17622
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/registration/v2/ui/RegistrationV2ViewModel.kt
@@ -0,0 +1,337 @@
+/*
+ * 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.Dispatchers
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.update
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
+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.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 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
+
+  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 fetchFcmToken(context: Context) {
+    viewModelScope.launch {
+      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, 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)
+      }
+    } else {
+      viewModelScope.launch {
+        val svrCredentials = RegistrationRepository.hasValidSvrAuthCredentials(context, e164, password)
+
+        if (svrCredentials != null) {
+          // Re-registration when credentials stored in backup.
+          store.update {
+            it.copy(canSkipSms = true, svrAuthCredentials = svrCredentials)
+          }
+        } else {
+          val codeRequestResponse = RegistrationRepository.requestSmsCode(context, e164, password, mccMncProducer.mcc, mccMncProducer.mnc).successOrThrow()
+          store.update {
+            it.copy(sessionId = codeRequestResponse.body.id, nextSms = RegistrationRepository.deriveTimestamp(codeRequestResponse.headers, codeRequestResponse.body.nextSms), nextCall = RegistrationRepository.deriveTimestamp(codeRequestResponse.headers, codeRequestResponse.body.nextCall), registrationCheckpoint = RegistrationCheckpoint.VERIFICATION_CODE_REQUESTED)
+          }
+        }
+      }
+    }
+  }
+
+  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 {
+          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 {
+        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 {
+      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
new file mode 100644
index 0000000000..ac31b27215
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/registration/v2/ui/entercode/EnterCodeV2Fragment.kt
@@ -0,0 +1,86 @@
+/*
+ * 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/grantpermissions/GrantPermissionsV2Fragment.kt b/app/src/main/java/org/thoughtcrime/securesms/registration/v2/ui/grantpermissions/GrantPermissionsV2Fragment.kt
new file mode 100644
index 0000000000..114e5ca311
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/registration/v2/ui/grantpermissions/GrantPermissionsV2Fragment.kt
@@ -0,0 +1,123 @@
+/*
+ * Copyright 2024 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.thoughtcrime.securesms.registration.v2.ui.grantpermissions
+
+import android.app.Activity
+import android.content.pm.PackageManager
+import android.os.Build
+import android.os.Bundle
+import androidx.activity.result.ActivityResult
+import androidx.activity.result.contract.ActivityResultContracts
+import androidx.annotation.RequiresApi
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+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.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.restore.RestoreActivity
+import org.thoughtcrime.securesms.util.BackupUtil
+import org.thoughtcrime.securesms.util.navigation.safeNavigate
+
+/**
+ * Screen in account registration that provides rationales for the suggested runtime permissions.
+ */
+@RequiresApi(23)
+class GrantPermissionsV2Fragment : ComposeFragment() {
+
+  private val sharedViewModel by activityViewModels<RegistrationV2ViewModel>()
+  private val args by navArgs<GrantPermissionsV2FragmentArgs>()
+  private val isSearchingForBackup = mutableStateOf(false)
+
+  private val requestPermissionLauncher = registerForActivityResult(
+    ActivityResultContracts.RequestMultiplePermissions(),
+    ::onPermissionsGranted
+  )
+
+  private val launchRestoreActivity = registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { result: ActivityResult ->
+    when (val resultCode = result.resultCode) {
+      Activity.RESULT_OK -> {
+        sharedViewModel.onBackupSuccessfullyRestored()
+        NavHostFragment.findNavController(this).safeNavigate(GrantPermissionsV2FragmentDirections.actionEnterPhoneNumber())
+      }
+      Activity.RESULT_CANCELED -> Log.w(TAG, "Backup restoration canceled.")
+      else -> Log.w(TAG, "Backup restoration activity ended with unknown result code: $resultCode")
+    }
+  }
+
+  private lateinit var welcomeAction: WelcomeAction
+
+  override fun onCreate(savedInstanceState: Bundle?) {
+    super.onCreate(savedInstanceState)
+    welcomeAction = args.welcomeAction
+  }
+
+  @Composable
+  override fun FragmentContent() {
+    val isSearchingForBackup by this.isSearchingForBackup
+
+    GrantPermissionsScreen(
+      deviceBuildVersion = Build.VERSION.SDK_INT,
+      isSearchingForBackup = isSearchingForBackup,
+      isBackupSelectionRequired = BackupUtil.isUserSelectionRequired(LocalContext.current),
+      onNextClicked = this::launchPermissionRequests,
+      onNotNowClicked = this::proceedToNextScreen
+    )
+  }
+
+  private fun launchPermissionRequests() {
+    val isUserSelectionRequired = BackupUtil.isUserSelectionRequired(requireContext())
+
+    val neededPermissions = WelcomePermissions.getWelcomePermissions(isUserSelectionRequired).filterNot {
+      ContextCompat.checkSelfPermission(requireContext(), it) == PackageManager.PERMISSION_GRANTED
+    }
+
+    if (neededPermissions.isEmpty()) {
+      proceedToNextScreen()
+    } else {
+      requestPermissionLauncher.launch(neededPermissions.toTypedArray())
+    }
+  }
+
+  private fun onPermissionsGranted(permissions: Map<String, Boolean>) {
+    permissions.forEach {
+      Log.d(TAG, "${it.key} = ${it.value}")
+    }
+    sharedViewModel.setRegistrationCheckpoint(RegistrationCheckpoint.PERMISSIONS_GRANTED)
+    proceedToNextScreen()
+  }
+
+  private fun proceedToNextScreen() {
+    when (welcomeAction) {
+      WelcomeAction.CONTINUE -> NavHostFragment.findNavController(this).safeNavigate(GrantPermissionsV2FragmentDirections.actionEnterPhoneNumber())
+      WelcomeAction.RESTORE_BACKUP -> {
+        val restoreIntent = RestoreActivity.getIntentForRestore(requireActivity())
+        launchRestoreActivity.launch(restoreIntent)
+      }
+    }
+  }
+
+  /**
+   * Which welcome action the user selected which prompted this
+   * screen.
+   */
+  enum class WelcomeAction {
+    CONTINUE,
+    RESTORE_BACKUP
+  }
+
+  companion object {
+    private val TAG = Log.tag(GrantPermissionsV2Fragment::class.java)
+  }
+}
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
new file mode 100644
index 0000000000..7e8918bd31
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/registration/v2/ui/phonenumber/EnterPhoneNumberV2Fragment.kt
@@ -0,0 +1,369 @@
+/*
+ * 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)
+      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 {
+        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(getString(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 -> {
+        Log.w(TAG, "Not yet implemented!", NotImplementedError()) // TODO [regv2]
+      }
+    }
+  }
+
+  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.setInProgress(false)
+      // TODO [regv2]: handle if FCM isn't available
+    }
+  }
+
+  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)
+    }
+  }
+
+  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()
+      }
+
+      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) {
+    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.")
+        sharedViewModel.onUserConfirmedPhoneNumber(requireContext())
+      }
+      setNegativeButton(R.string.RegistrationActivity_edit_number) { _, _ -> onConfirmNumberDialogCanceled() }
+      setOnCancelListener { _ -> onConfirmNumberDialogCanceled() }
+    }.show()
+  }
+
+  private fun moveToEnterPinScreen() {
+    sharedViewModel.setInProgress(false)
+    findNavController().safeNavigate(EnterPhoneNumberV2FragmentDirections.actionReRegisterWithPinV2Fragment())
+  }
+
+  private fun moveToVerificationEntryScreen() {
+    NavHostFragment.findNavController(this).safeNavigate(EnterPhoneNumberV2FragmentDirections.actionEnterVerificationCode())
+    sharedViewModel.setInProgress(false)
+  }
+
+  private fun popBackStack() {
+    sharedViewModel.setRegistrationCheckpoint(RegistrationCheckpoint.INITIALIZATION)
+    NavHostFragment.findNavController(this).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
new file mode 100644
index 0000000000..d311bcaa6e
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/registration/v2/ui/phonenumber/EnterPhoneNumberV2State.kt
@@ -0,0 +1,27 @@
+/*
+ * 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/v2/ui/phonenumber/EnterPhoneNumberV2ViewModel.kt b/app/src/main/java/org/thoughtcrime/securesms/registration/v2/ui/phonenumber/EnterPhoneNumberV2ViewModel.kt
new file mode 100644
index 0000000000..7920f69038
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/registration/v2/ui/phonenumber/EnterPhoneNumberV2ViewModel.kt
@@ -0,0 +1,110 @@
+/*
+ * Copyright 2024 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.thoughtcrime.securesms.registration.v2.ui.phonenumber
+
+import android.telephony.PhoneNumberFormattingTextWatcher
+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.PhoneNumber
+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.logging.Log
+import org.thoughtcrime.securesms.registration.util.CountryPrefix
+
+/**
+ * ViewModel for the phone number entry screen.
+ */
+class EnterPhoneNumberV2ViewModel : ViewModel() {
+
+  private val TAG = Log.tag(EnterPhoneNumberV2ViewModel::class.java)
+
+  private val store = MutableStateFlow(EnterPhoneNumberV2State.INIT)
+  val uiState = store.asLiveData()
+
+  val supportedCountryPrefixes: List<CountryPrefix> = PhoneNumberUtil.getInstance().supportedCallingCodes
+    .map { CountryPrefix(it, PhoneNumberUtil.getInstance().getRegionCodeForCountryCode(it)) }
+    .sortedBy { it.digits.toString() }
+
+  fun countryPrefix(): CountryPrefix {
+    return supportedCountryPrefixes[store.value.countryPrefixIndex]
+  }
+
+  fun phoneNumber(): PhoneNumber? {
+    return try {
+      parsePhoneNumber(store.value)
+    } catch (ex: NumberParseException) {
+      Log.w(TAG, "Could not parse phone number in current state.", ex)
+      null
+    }
+  }
+
+  fun setPhoneNumber(phoneNumber: String?) {
+    store.update { it.copy(phoneNumber = phoneNumber ?: "") }
+  }
+
+  fun setCountry(digits: Int) {
+    val matchingIndex = countryCodeToAdapterIndex(digits)
+    store.update {
+      it.copy(countryPrefixIndex = matchingIndex)
+    }
+
+    viewModelScope.launch {
+      withContext(Dispatchers.Default) {
+        val regionCode = PhoneNumberUtil.getInstance().getRegionCodeForCountryCode(digits)
+        val textWatcher = PhoneNumberFormattingTextWatcher(regionCode)
+
+        store.update {
+          Log.d(TAG, "Updating phone number formatter in state")
+          it.copy(phoneNumberFormatter = textWatcher)
+        }
+      }
+    }
+  }
+
+  fun parsePhoneNumber(state: EnterPhoneNumberV2State): PhoneNumber {
+    return PhoneNumberUtil.getInstance().parse(state.phoneNumber, supportedCountryPrefixes[state.countryPrefixIndex].regionCode)
+  }
+
+  fun isEnteredNumberValid(state: EnterPhoneNumberV2State): Boolean {
+    return try {
+      PhoneNumberUtil.getInstance().isValidNumber(parsePhoneNumber(state))
+    } catch (ex: NumberParseException) {
+      false
+    }
+  }
+
+  fun restoreState(value: PhoneNumber) {
+    val prefixIndex = countryCodeToAdapterIndex(value.countryCode)
+    if (prefixIndex != -1) {
+      store.update {
+        it.copy(
+          countryPrefixIndex = prefixIndex,
+          phoneNumber = value.nationalNumber.toString()
+        )
+      }
+    }
+  }
+
+  private fun countryCodeToAdapterIndex(countryCode: Int): Int {
+    return supportedCountryPrefixes.indexOfFirst { prefix -> prefix.digits == countryCode }
+  }
+
+  fun clearError() {
+    setError(EnterPhoneNumberV2State.Error.NONE)
+  }
+
+  fun setError(error: EnterPhoneNumberV2State.Error) {
+    store.update {
+      it.copy(error = error)
+    }
+  }
+}
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/v2/ui/reregisterwithpin/ReRegisterWithPinV2Fragment.kt
new file mode 100644
index 0000000000..f9bc892c23
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/registration/v2/ui/reregisterwithpin/ReRegisterWithPinV2Fragment.kt
@@ -0,0 +1,243 @@
+/*
+ * Copyright 2024 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.thoughtcrime.securesms.registration.v2.ui.reregisterwithpin
+
+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.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.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.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.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) {
+  companion object {
+    private val TAG = Log.tag(ReRegisterWithPinV2Fragment::class.java)
+  }
+
+  private val registrationViewModel by activityViewModels<RegistrationV2ViewModel>()
+  private val reRegisterViewModel by viewModels<ReRegisterWithPinV2ViewModel>()
+
+  private val binding: FragmentRegistrationPinRestoreEntryV2Binding by ViewBinderDelegate(FragmentRegistrationPinRestoreEntryV2Binding::bind)
+
+  override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+    super.onViewCreated(view, savedInstanceState)
+
+    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.pinRestorePinContinue.setOnClickListener {
+      handlePinEntry()
+    }
+
+    binding.pinRestoreKeyboardToggle.setOnClickListener {
+      val currentKeyboardType: PinKeyboardType = getPinEntryKeyboardType()
+      updateKeyboard(currentKeyboardType.other)
+      binding.pinRestoreKeyboardToggle.setIconResource(currentKeyboardType.iconResource)
+    }
+
+    binding.pinRestoreKeyboardToggle.setIconResource(getPinEntryKeyboardType().other.iconResource)
+
+    registrationViewModel.uiState.observe(viewLifecycleOwner, ::updateViewState)
+  }
+
+  private fun updateViewState(state: RegistrationV2State) {
+    if (state.networkError != null) {
+      genericErrorDialog()
+    } else if (!state.canSkipSms) {
+      abortSkipSmsFlow()
+    } else if (state.isRegistrationLockEnabled && state.svrTriesRemaining == 0) {
+      Log.w(TAG, "Unable to continue skip flow, KBS is locked")
+      onAccountLocked()
+    } else {
+      presentProgress(state.inProgress)
+      presentTriesRemaining(state.svrTriesRemaining)
+    }
+  }
+
+  private fun abortSkipSmsFlow() {
+    findNavController().safeNavigate(ReRegisterWithPinV2FragmentDirections.actionReRegisterWithPinFragmentToEnterPhoneNumberV2Fragment())
+  }
+
+  private fun presentProgress(inProgress: Boolean) {
+    if (inProgress) {
+      ViewUtil.hideKeyboard(requireContext(), binding.pinRestorePinInput)
+      binding.pinRestorePinInput.isEnabled = false
+      binding.pinRestorePinContinue.setSpinning()
+    } else {
+      binding.pinRestorePinInput.isEnabled = true
+      binding.pinRestorePinContinue.cancelSpinning()
+    }
+  }
+
+  private fun handlePinEntry() {
+    val pin: String? = binding.pinRestorePinInput.text?.toString()
+
+    if (pin.isNullOrBlank()) {
+      Toast.makeText(requireContext(), R.string.RegistrationActivity_you_must_enter_your_registration_lock_PIN, Toast.LENGTH_LONG).show()
+      enableAndFocusPinEntry()
+      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()
+      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
+  }
+
+  private fun presentTriesRemaining(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)
+  }
+
+  private fun genericErrorDialog() {
+    MaterialAlertDialogBuilder(requireContext())
+      .setMessage(R.string.RegistrationActivity_error_connecting_to_service)
+      .setPositiveButton(android.R.string.ok, null)
+      .create()
+      .show()
+  }
+}
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/v2/ui/reregisterwithpin/ReRegisterWithPinV2State.kt
new file mode 100644
index 0000000000..7f8bf609fa
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/registration/v2/ui/reregisterwithpin/ReRegisterWithPinV2State.kt
@@ -0,0 +1,12 @@
+/*
+ * Copyright 2024 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.thoughtcrime.securesms.registration.v2.ui.reregisterwithpin
+
+data class ReRegisterWithPinV2State(
+  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/v2/ui/reregisterwithpin/ReRegisterWithPinV2ViewModel.kt
new file mode 100644
index 0000000000..2f8b2b4098
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/registration/v2/ui/reregisterwithpin/ReRegisterWithPinV2ViewModel.kt
@@ -0,0 +1,32 @@
+/*
+ * Copyright 2024 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.thoughtcrime.securesms.registration.v2.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() {
+  companion object {
+    private val TAG = Log.tag(ReRegisterWithPinV2ViewModel::class.java)
+  }
+
+  private val store = MutableStateFlow(ReRegisterWithPinV2State())
+  val uiState = store.asLiveData()
+
+  val isLocalVerification: Boolean
+    get() = store.value.isLocalVerification
+  val hasIncorrectGuess: Boolean
+    get() = store.value.hasIncorrectGuess
+
+  fun markIncorrectGuess() {
+    store.update {
+      it.copy(hasIncorrectGuess = true)
+    }
+  }
+}
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/v2/ui/welcome/WelcomeV2Fragment.kt
new file mode 100644
index 0000000000..b8e417a0c7
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/registration/v2/ui/welcome/WelcomeV2Fragment.kt
@@ -0,0 +1,118 @@
+/*
+ * Copyright 2024 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.thoughtcrime.securesms.registration.v2.ui.welcome
+
+import android.Manifest
+import android.app.Activity
+import android.content.pm.PackageManager
+import android.os.Bundle
+import android.view.View
+import androidx.activity.result.ActivityResult
+import androidx.activity.result.contract.ActivityResultContracts
+import androidx.core.content.ContextCompat
+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.components.ViewBinderDelegate
+import org.thoughtcrime.securesms.databinding.FragmentRegistrationWelcomeV2Binding
+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.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.navigation.safeNavigate
+import kotlin.jvm.optionals.getOrNull
+
+/**
+ * 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)
+
+  private val launchRestoreActivity = registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { result: ActivityResult ->
+    when (val resultCode = result.resultCode) {
+      Activity.RESULT_OK -> {
+        sharedViewModel.onBackupSuccessfullyRestored()
+        findNavController().safeNavigate(WelcomeV2FragmentDirections.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")
+    }
+  }
+
+  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() }
+  }
+
+  private fun onContinueClicked() {
+    if (Permissions.isRuntimePermissionsRequired() && !hasAllPermissions()) {
+      findNavController().safeNavigate(WelcomeV2FragmentDirections.actionWelcomeFragmentToGrantPermissionsV2Fragment(GrantPermissionsV2Fragment.WelcomeAction.CONTINUE))
+    } else {
+      skipRestore()
+    }
+  }
+
+  private fun hasAllPermissions(): Boolean {
+    val isUserSelectionRequired = BackupUtil.isUserSelectionRequired(requireContext())
+    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))
+    } else {
+      sharedViewModel.setRegistrationCheckpoint(RegistrationCheckpoint.PERMISSIONS_GRANTED)
+
+      val restoreIntent = RestoreActivity.getIntentForRestore(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 const val TERMS_AND_CONDITIONS_URL = "https://signal.org/legal"
+  }
+}
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 14ae56500c..1d5a9b861e 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/releasechannel/ReleaseChannel.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/releasechannel/ReleaseChannel.kt
@@ -1,5 +1,6 @@
 package org.thoughtcrime.securesms.releasechannel
 
+import org.thoughtcrime.securesms.attachments.Cdn
 import org.thoughtcrime.securesms.attachments.PointerAttachment
 import org.thoughtcrime.securesms.database.MessageTable
 import org.thoughtcrime.securesms.database.MessageType
@@ -20,8 +21,6 @@ import java.util.UUID
  */
 object ReleaseChannel {
 
-  const val CDN_NUMBER = -1
-
   fun insertReleaseChannelMessage(
     recipientId: RecipientId,
     body: String,
@@ -36,8 +35,8 @@ object ReleaseChannel {
   ): MessageTable.InsertResult? {
     val attachments: Optional<List<SignalServiceAttachment>> = if (media != null) {
       val attachment = SignalServiceAttachmentPointer(
-        CDN_NUMBER,
-        SignalServiceAttachmentRemoteId.from(""),
+        Cdn.S3.cdnNumber,
+        SignalServiceAttachmentRemoteId.S3,
         mediaType,
         null,
         Optional.empty(),
diff --git a/app/src/main/java/org/thoughtcrime/securesms/restore/RestoreActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/restore/RestoreActivity.kt
new file mode 100644
index 0000000000..fea5fb263b
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/restore/RestoreActivity.kt
@@ -0,0 +1,46 @@
+/*
+ * Copyright 2024 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.thoughtcrime.securesms.restore
+
+import android.content.Context
+import android.content.Intent
+import android.os.Bundle
+import androidx.activity.viewModels
+import org.signal.core.util.getParcelableExtraCompat
+import org.thoughtcrime.securesms.BaseActivity
+import org.thoughtcrime.securesms.PassphraseRequiredActivity
+import org.thoughtcrime.securesms.R
+
+/**
+ * Activity to hold the restore from backup flow.
+ */
+class RestoreActivity : BaseActivity() {
+
+  private val sharedViewModel: RestoreViewModel by viewModels()
+
+  override fun onCreate(savedInstanceState: Bundle?) {
+    super.onCreate(savedInstanceState)
+
+    setResult(RESULT_CANCELED)
+
+    setContentView(R.layout.activity_restore)
+    intent.getParcelableExtraCompat(PassphraseRequiredActivity.NEXT_INTENT_EXTRA, Intent::class.java)?.let {
+      sharedViewModel.setNextIntent(it)
+    }
+  }
+
+  fun finishActivitySuccessfully() {
+    setResult(RESULT_OK)
+    finish()
+  }
+
+  companion object {
+    @JvmStatic
+    fun getIntentForRestore(context: Context): Intent {
+      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
new file mode 100644
index 0000000000..a919d0a279
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/restore/RestoreRepository.kt
@@ -0,0 +1,91 @@
+/*
+ * Copyright 2024 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.thoughtcrime.securesms.restore
+
+import android.content.Context
+import android.net.Uri
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.withContext
+import org.signal.core.util.logging.Log
+import org.thoughtcrime.securesms.AppInitialization
+import org.thoughtcrime.securesms.backup.BackupPassphrase
+import org.thoughtcrime.securesms.backup.FullBackupImporter
+import org.thoughtcrime.securesms.crypto.AttachmentSecretProvider
+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.service.LocalBackupListener
+import org.thoughtcrime.securesms.util.BackupUtil
+import java.io.IOException
+
+/**
+ * Repository to handle restoring a backup of a user's message history.
+ */
+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 restoreBackupAsynchronously(context: Context, backupFileUri: Uri, passphrase: String): BackupImportResult = withContext(Dispatchers.IO) {
+    // TODO [regv2]: migrate this to a service
+    try {
+      Log.i(TAG, "Starting backup restore.")
+      DataRestoreConstraint.isRestoringData = true
+
+      val database = SignalDatabase.backupDatabase
+
+      BackupPassphrase.set(context, passphrase)
+
+      if (!FullBackupImporter.validatePassphrase(context, backupFileUri, passphrase)) {
+        // TODO [regv2]: implement a specific, user-visible error for wrong passphrase.
+        return@withContext BackupImportResult.FAILURE_UNKNOWN
+      }
+
+      FullBackupImporter.importFile(
+        context,
+        AttachmentSecretProvider.getInstance(context).getOrCreateAttachmentSecret(),
+        database,
+        backupFileUri,
+        passphrase
+      )
+
+      SignalDatabase.runPostBackupRestoreTasks(database)
+      NotificationChannels.getInstance().restoreContactNotificationChannels()
+
+      if (BackupUtil.canUserAccessBackupDirectory(context)) {
+        LocalBackupListener.setNextBackupTimeToIntervalFromNow(context)
+        SignalStore.settings().isBackupEnabled = true
+        LocalBackupListener.schedule(context)
+      }
+
+      AppInitialization.onPostBackupRestore(context)
+
+      Log.i(TAG, "Backup restore complete.")
+      return@withContext BackupImportResult.SUCCESS
+    } catch (e: FullBackupImporter.DatabaseDowngradeException) {
+      Log.w(TAG, "Failed due to the backup being from a newer version of Signal.", e)
+      return@withContext BackupImportResult.FAILURE_VERSION_DOWNGRADE
+    } catch (e: FullBackupImporter.ForeignKeyViolationException) {
+      Log.w(TAG, "Failed due to foreign key constraint violations.", e)
+      return@withContext BackupImportResult.FAILURE_FOREIGN_KEY
+    } catch (e: IOException) {
+      Log.w(TAG, e)
+      return@withContext BackupImportResult.FAILURE_UNKNOWN
+    } finally {
+      DataRestoreConstraint.isRestoringData = false
+    }
+  }
+
+  enum class BackupImportResult {
+    SUCCESS,
+    FAILURE_VERSION_DOWNGRADE,
+    FAILURE_FOREIGN_KEY,
+    FAILURE_UNKNOWN
+  }
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/restore/RestoreState.kt b/app/src/main/java/org/thoughtcrime/securesms/restore/RestoreState.kt
new file mode 100644
index 0000000000..e2df0cf003
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/restore/RestoreState.kt
@@ -0,0 +1,15 @@
+/*
+ * Copyright 2024 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.thoughtcrime.securesms.restore
+
+import android.content.Intent
+import android.net.Uri
+import org.thoughtcrime.securesms.devicetransfer.newdevice.BackupRestorationType
+
+/**
+ * Shared state holder for the restore flow.
+ */
+data class RestoreState(val restorationType: BackupRestorationType = BackupRestorationType.LOCAL_BACKUP, val backupFile: Uri? = null, val nextIntent: Intent? = null)
diff --git a/app/src/main/java/org/thoughtcrime/securesms/restore/RestoreViewModel.kt b/app/src/main/java/org/thoughtcrime/securesms/restore/RestoreViewModel.kt
new file mode 100644
index 0000000000..c75adbd296
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/restore/RestoreViewModel.kt
@@ -0,0 +1,60 @@
+/*
+ * Copyright 2024 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.thoughtcrime.securesms.restore
+
+import android.content.Intent
+import android.net.Uri
+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
+
+/**
+ * Shared view model for the restore flow.
+ */
+class RestoreViewModel : ViewModel() {
+  private val store = MutableStateFlow(RestoreState())
+  val uiState = store.asLiveData()
+
+  fun setNextIntent(nextIntent: Intent) {
+    store.update {
+      it.copy(nextIntent = nextIntent)
+    }
+  }
+
+  fun onTransferFromAndroidDeviceSelected() {
+    store.update {
+      it.copy(restorationType = BackupRestorationType.DEVICE_TRANSFER)
+    }
+  }
+
+  fun onRestoreFromLocalBackupSelected() {
+    store.update {
+      it.copy(restorationType = BackupRestorationType.LOCAL_BACKUP)
+    }
+  }
+
+  fun onRestoreFromRemoteBackupSelected() {
+    store.update {
+      it.copy(restorationType = BackupRestorationType.REMOTE_BACKUP)
+    }
+  }
+
+  fun getBackupRestorationType(): BackupRestorationType {
+    return store.value.restorationType
+  }
+
+  fun setBackupFileUri(backupFileUri: Uri) {
+    store.update {
+      it.copy(backupFile = backupFileUri)
+    }
+  }
+
+  fun getBackupFileUri(): Uri? = store.value.backupFile
+
+  fun getNextIntent(): Intent? = store.value.nextIntent
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/restore/choosebackup/ChooseBackupV2Fragment.kt b/app/src/main/java/org/thoughtcrime/securesms/restore/choosebackup/ChooseBackupV2Fragment.kt
new file mode 100644
index 0000000000..51a0caa594
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/restore/choosebackup/ChooseBackupV2Fragment.kt
@@ -0,0 +1,77 @@
+/*
+ * Copyright 2024 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.thoughtcrime.securesms.restore.choosebackup
+
+import android.content.Context
+import android.content.Intent
+import android.net.Uri
+import android.os.Build
+import android.os.Bundle
+import android.provider.DocumentsContract
+import android.text.method.LinkMovementMethod
+import android.view.View
+import androidx.activity.result.contract.ActivityResultContracts
+import androidx.core.text.HtmlCompat
+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.FragmentChooseBackupV2Binding
+import org.thoughtcrime.securesms.keyvalue.SignalStore
+import org.thoughtcrime.securesms.registration.fragments.RegistrationViewDelegate
+import org.thoughtcrime.securesms.restore.RestoreViewModel
+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) {
+  private val sharedViewModel by activityViewModels<RestoreViewModel>()
+  private val binding: FragmentChooseBackupV2Binding by ViewBinderDelegate(FragmentChooseBackupV2Binding::bind)
+
+  private val pickMedia = registerForActivityResult(BackupFileContract()) {
+    if (it != null) {
+      onUserChoseBackupFile(it)
+    } else {
+      Log.i(TAG, "Null URI returned for backup file selection.")
+    }
+  }
+
+  override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+    super.onViewCreated(view, savedInstanceState)
+    RegistrationViewDelegate.setDebugLogSubmitMultiTapView(binding.chooseBackupFragmentTitle)
+    binding.chooseBackupFragmentButton.setOnClickListener { onChooseBackupSelected() }
+
+    binding.chooseBackupFragmentLearnMore.text = HtmlCompat.fromHtml(String.format("<a href=\"%s\">%s</a>", getString(R.string.backup_support_url), getString(R.string.ChooseBackupFragment__learn_more)), 0)
+    binding.chooseBackupFragmentLearnMore.movementMethod = LinkMovementMethod.getInstance()
+  }
+
+  private fun onChooseBackupSelected() {
+    pickMedia.launch("application/octet-stream")
+  }
+
+  private fun onUserChoseBackupFile(backupFileUri: Uri) {
+    sharedViewModel.setBackupFileUri(backupFileUri)
+    NavHostFragment.findNavController(this).safeNavigate(ChooseBackupV2FragmentDirections.actionChooseLocalBackupFragmentToRestoreLocalBackupFragment())
+  }
+
+  private class BackupFileContract : ActivityResultContracts.GetContent() {
+    override fun createIntent(context: Context, input: String): Intent {
+      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)
+        }
+      }
+    }
+  }
+
+  companion object {
+    private val TAG = Log.tag(ChooseBackupV2Fragment::class.java)
+  }
+}
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
new file mode 100644
index 0000000000..276acfa927
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/restore/restorelocalbackup/RestoreLocalBackupFragment.kt
@@ -0,0 +1,167 @@
+/*
+ * Copyright 2024 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.thoughtcrime.securesms.restore.restorelocalbackup
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.widget.EditText
+import android.widget.Toast
+import androidx.fragment.app.activityViewModels
+import androidx.fragment.app.viewModels
+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.backup.BackupEvent
+import org.thoughtcrime.securesms.components.ViewBinderDelegate
+import org.thoughtcrime.securesms.databinding.FragmentRestoreLocalBackupV2Binding
+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.DateUtils
+import org.thoughtcrime.securesms.util.Util
+import org.thoughtcrime.securesms.util.ViewModelFactory
+import org.thoughtcrime.securesms.util.ViewUtil
+import org.thoughtcrime.securesms.util.visible
+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) {
+  private val navigationViewModel: RestoreViewModel by activityViewModels()
+  private val restoreLocalBackupViewModel: RestoreLocalBackupViewModel by viewModels(
+    factoryProducer = ViewModelFactory.factoryProducer {
+      val fileBackupUri = navigationViewModel.getBackupFileUri()!!
+      RestoreLocalBackupViewModel(fileBackupUri)
+    }
+  )
+  private val binding: FragmentRestoreLocalBackupV2Binding by ViewBinderDelegate(FragmentRestoreLocalBackupV2Binding::bind)
+
+  override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+    super.onViewCreated(view, savedInstanceState)
+    setDebugLogSubmitMultiTapView(binding.verifyHeader)
+    Log.i(TAG, "Backup restore.")
+
+    binding.restoreButton.setOnClickListener { presentBackupPassPhrasePromptDialog() }
+
+    restoreLocalBackupViewModel.uiState.observe(viewLifecycleOwner) { fragmentState ->
+      fragmentState.backupInfo?.let {
+        presentBackupFileInfo(backupSize = it.size, backupTimestamp = it.timestamp)
+      }
+
+      if (fragmentState.restoreInProgress) {
+        presentRestoreProgress(fragmentState.backupProgressCount)
+      } else {
+        presentProgressEnded()
+      }
+
+      if (fragmentState.backupRestoreComplete) {
+        val importResult = fragmentState.backupImportResult
+        if (importResult == null) {
+          onBackupCompletedSuccessfully()
+        } else {
+          handleBackupImportError(importResult)
+        }
+      }
+    }
+
+    restoreLocalBackupViewModel.prepareRestore(requireContext())
+  }
+
+  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}")
+      activity.startActivity(it)
+    }
+    activity.finishActivitySuccessfully()
+  }
+
+  override fun onStart() {
+    super.onStart()
+    EventBus.getDefault().register(this)
+  }
+
+  override fun onStop() {
+    super.onStop()
+    EventBus.getDefault().unregister(this)
+  }
+
+  @Subscribe(threadMode = ThreadMode.MAIN)
+  fun onEvent(event: BackupEvent) {
+    restoreLocalBackupViewModel.onBackupProgressUpdate(event)
+  }
+
+  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()
+      RestoreRepository.BackupImportResult.FAILURE_FOREIGN_KEY -> Toast.makeText(requireContext(), R.string.RegistrationActivity_backup_failure_foreign_key, Toast.LENGTH_LONG).show()
+      RestoreRepository.BackupImportResult.FAILURE_UNKNOWN -> Toast.makeText(requireContext(), R.string.RegistrationActivity_incorrect_backup_passphrase, Toast.LENGTH_LONG).show()
+      RestoreRepository.BackupImportResult.SUCCESS -> Log.w(TAG, "Successful backup import should not be handled in this function.", IllegalStateException())
+    }
+  }
+
+  private fun presentProgressEnded() {
+    binding.restoreButton.cancelSpinning()
+    binding.cancelLocalRestoreButton.visible = true
+    binding.backupProgressText.text = ""
+  }
+
+  private fun presentRestoreProgress(backupProgressCount: Long) {
+    binding.restoreButton.setSpinning()
+    binding.cancelLocalRestoreButton.visibility = View.INVISIBLE
+    if (backupProgressCount > 0L) {
+      binding.backupProgressText.text = getString(R.string.RegistrationActivity_d_messages_so_far, backupProgressCount)
+    } else {
+      binding.backupProgressText.setText(R.string.RegistrationActivity_checking)
+    }
+  }
+
+  private fun presentBackupPassPhrasePromptDialog() {
+    val view = LayoutInflater.from(requireContext()).inflate(R.layout.enter_backup_passphrase_dialog, null)
+    val prompt = view.findViewById<EditText>(R.id.restore_passphrase_input)
+
+    prompt.addTextChangedListener(PassphraseAsYouTypeFormatter())
+
+    MaterialAlertDialogBuilder(requireContext())
+      .setTitle(R.string.RegistrationActivity_enter_backup_passphrase)
+      .setView(view)
+      .setPositiveButton(R.string.RegistrationActivity_restore) { _, _ ->
+        ViewUtil.hideKeyboard(requireContext(), prompt)
+
+        val passphrase = prompt.getText().toString()
+        restoreLocalBackupViewModel.confirmPassphraseAndBeginRestore(requireContext(), passphrase)
+      }
+      .setNegativeButton(android.R.string.cancel, null)
+      .show()
+
+    Log.i(TAG, "Prompt for backup passphrase shown to user.")
+  }
+
+  private fun presentBackupFileInfo(backupSize: Long, backupTimestamp: Long) {
+    if (backupSize > 0) {
+      binding.backupSizeText.text = getString(R.string.RegistrationActivity_backup_size_s, Util.getPrettyFileSize(backupSize))
+    }
+
+    if (backupTimestamp > 0) {
+      binding.backupCreatedText.text = getString(R.string.RegistrationActivity_backup_timestamp_s, DateUtils.getExtendedRelativeTimeSpanString(requireContext(), Locale.getDefault(), backupTimestamp))
+    }
+  }
+
+  companion object {
+    private val TAG = Log.tag(RestoreLocalBackupFragment::class.java)
+  }
+}
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
new file mode 100644
index 0000000000..fbf2305fe0
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/restore/restorelocalbackup/RestoreLocalBackupState.kt
@@ -0,0 +1,26 @@
+/*
+ * Copyright 2024 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.thoughtcrime.securesms.restore.restorelocalbackup
+
+import android.net.Uri
+import org.thoughtcrime.securesms.restore.RestoreRepository
+import org.thoughtcrime.securesms.util.BackupUtil.BackupInfo
+
+/**
+ * State holder for a backup restore.
+ */
+data class RestoreLocalBackupState(
+  val uri: Uri,
+  val backupInfo: BackupInfo? = null,
+  val backupPassphrase: String = "",
+  val restoreInProgress: Boolean = false,
+  val backupVerifyingInProgress: Boolean = false,
+  val backupProgressCount: Long = -1,
+  val backupEstimatedTotalCount: Long = -1,
+  val backupRestoreComplete: Boolean = false,
+  val backupImportResult: RestoreRepository.BackupImportResult? = null,
+  val abort: 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
new file mode 100644
index 0000000000..20c9f3f9b3
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/restore/restorelocalbackup/RestoreLocalBackupViewModel.kt
@@ -0,0 +1,104 @@
+/*
+ * Copyright 2024 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.thoughtcrime.securesms.restore.restorelocalbackup
+
+import android.content.Context
+import android.net.Uri
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.asLiveData
+import androidx.lifecycle.viewModelScope
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.update
+import kotlinx.coroutines.launch
+import org.signal.core.util.logging.Log
+import org.thoughtcrime.securesms.backup.BackupEvent
+import org.thoughtcrime.securesms.restore.RestoreRepository
+
+/**
+ * ViewModel for [RestoreLocalBackupFragment]
+ */
+class RestoreLocalBackupViewModel(fileBackupUri: Uri) : ViewModel() {
+  private val store = MutableStateFlow(RestoreLocalBackupState(fileBackupUri))
+  val uiState = store.asLiveData()
+
+  fun prepareRestore(context: Context) {
+    val backupFileUri = store.value.uri
+    viewModelScope.launch {
+      val backupInfo = RestoreRepository.getLocalBackupFromUri(context, backupFileUri)
+
+      if (backupInfo == null) {
+        abort()
+        return@launch
+      }
+
+      store.update {
+        it.copy(
+          backupInfo = backupInfo
+        )
+      }
+    }
+  }
+
+  private fun abort() {
+    store.update {
+      it.copy(abort = true)
+    }
+  }
+
+  fun confirmPassphraseAndBeginRestore(context: Context, passphrase: String) {
+    store.update {
+      it.copy(
+        backupPassphrase = passphrase,
+        restoreInProgress = true
+      )
+    }
+
+    val backupFileUri = store.value.backupInfo?.uri
+    val backupPassphrase = store.value.backupPassphrase
+    if (backupFileUri == null) {
+      Log.w(TAG, "Could not begin backup import because backup file URI was null!")
+      abort()
+      return
+    }
+
+    if (backupPassphrase.isEmpty()) {
+      Log.w(TAG, "Could not begin backup import because backup passphrase was empty!")
+      abort()
+      return
+    }
+
+    viewModelScope.launch {
+      val importResult = RestoreRepository.restoreBackupAsynchronously(context, backupFileUri, backupPassphrase)
+
+      store.update {
+        it.copy(
+          backupImportResult = if (importResult == RestoreRepository.BackupImportResult.SUCCESS) null else importResult,
+          restoreInProgress = false,
+          backupRestoreComplete = true,
+          backupEstimatedTotalCount = -1L,
+          backupProgressCount = -1L,
+          backupVerifyingInProgress = false
+        )
+      }
+    }
+  }
+
+  fun onBackupProgressUpdate(event: BackupEvent) {
+    store.update {
+      it.copy(
+        backupProgressCount = event.count,
+        backupEstimatedTotalCount = event.estimatedTotalCount,
+        backupVerifyingInProgress = event.type == BackupEvent.Type.PROGRESS_VERIFYING,
+        backupRestoreComplete = event.type == BackupEvent.Type.FINISHED,
+        restoreInProgress = event.type != BackupEvent.Type.FINISHED
+      )
+    }
+  }
+
+  companion object {
+    private val TAG = Log.tag(RestoreLocalBackupViewModel::class.java)
+  }
+}
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
new file mode 100644
index 0000000000..b96b888302
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/restore/transferorrestore/TransferOrRestoreV2Fragment.kt
@@ -0,0 +1,90 @@
+/*
+ * 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.View
+import android.widget.Toast
+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.FragmentTransferRestoreV2Binding
+import org.thoughtcrime.securesms.devicetransfer.newdevice.BackupRestorationType
+import org.thoughtcrime.securesms.registration.fragments.RegistrationViewDelegate
+import org.thoughtcrime.securesms.restore.RestoreViewModel
+import org.thoughtcrime.securesms.util.FeatureFlags
+import org.thoughtcrime.securesms.util.SpanUtil
+import org.thoughtcrime.securesms.util.navigation.safeNavigate
+import org.thoughtcrime.securesms.util.visible
+
+/**
+ * This presents a list of options for the user to restore (or skip) a backup.
+ */
+class TransferOrRestoreV2Fragment : LoggingFragment(R.layout.fragment_transfer_restore_v2) {
+  private val sharedViewModel by activityViewModels<RestoreViewModel>()
+  private val binding: FragmentTransferRestoreV2Binding by ViewBinderDelegate(FragmentTransferRestoreV2Binding::bind)
+
+  override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+    super.onViewCreated(view, savedInstanceState)
+
+    RegistrationViewDelegate.setDebugLogSubmitMultiTapView(binding.transferOrRestoreTitle)
+    binding.transferOrRestoreFragmentTransfer.setOnClickListener { sharedViewModel.onTransferFromAndroidDeviceSelected() }
+    binding.transferOrRestoreFragmentRestore.setOnClickListener { sharedViewModel.onRestoreFromLocalBackupSelected() }
+    binding.transferOrRestoreFragmentRestoreRemote.setOnClickListener { sharedViewModel.onRestoreFromRemoteBackupSelected() }
+    binding.transferOrRestoreFragmentNext.setOnClickListener { launchSelection(sharedViewModel.getBackupRestorationType()) }
+    binding.transferOrRestoreFragmentMoreOptions.setOnClickListener {
+      Log.w(TAG, "Not yet implemented!", NotImplementedError()) // TODO [regv2]
+    }
+
+    binding.transferOrRestoreFragmentRestoreRemoteCard.visible = FeatureFlags.messageBackups()
+    binding.transferOrRestoreFragmentMoreOptions.visible = FeatureFlags.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)
+
+    binding.transferOrRestoreFragmentTransferDescription.text = SpanUtil.boldSubstring(description, toBold)
+
+    sharedViewModel.uiState.observe(viewLifecycleOwner) { state ->
+      updateSelection(state.restorationType)
+    }
+
+    // TODO [regv2]: port backup file detection to here
+  }
+
+  private fun updateSelection(restorationType: BackupRestorationType) {
+    binding.transferOrRestoreFragmentTransferCard.isSelected = restorationType == BackupRestorationType.DEVICE_TRANSFER
+    binding.transferOrRestoreFragmentRestoreCard.isSelected = restorationType == BackupRestorationType.LOCAL_BACKUP
+    binding.transferOrRestoreFragmentRestoreRemoteCard.isSelected = restorationType == BackupRestorationType.REMOTE_BACKUP
+  }
+
+  private fun launchSelection(restorationType: BackupRestorationType) {
+    when (restorationType) {
+      BackupRestorationType.DEVICE_TRANSFER -> {
+        // TODO [regv2]
+        Log.w(TAG, "Not yet implemented!", NotImplementedError())
+        Toast.makeText(requireContext(), "Not yet implemented!", Toast.LENGTH_LONG).show()
+      }
+      BackupRestorationType.LOCAL_BACKUP -> {
+        NavHostFragment.findNavController(this).safeNavigate(TransferOrRestoreV2FragmentDirections.actionTransferOrRestoreToRestore())
+      }
+      BackupRestorationType.REMOTE_BACKUP -> {
+        // TODO [regv2]
+        Log.w(TAG, "Not yet implemented!", NotImplementedError())
+        Toast.makeText(requireContext(), "Not yet implemented!", Toast.LENGTH_LONG).show()
+      }
+      else -> {
+        throw IllegalArgumentException()
+      }
+    }
+  }
+
+  companion object {
+    private val TAG = Log.tag(TransferOrRestoreV2Fragment::class.java)
+  }
+}
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 9414b40726..779b662e81 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/service/AnalyzeDatabaseAlarmListener.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/service/AnalyzeDatabaseAlarmListener.kt
@@ -5,6 +5,7 @@ import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
 import org.thoughtcrime.securesms.jobs.AnalyzeDatabaseJob
 import org.thoughtcrime.securesms.keyvalue.SignalStore
 import org.thoughtcrime.securesms.util.toMillis
+import java.security.SecureRandom
 import java.time.LocalDateTime
 
 /**
@@ -43,12 +44,13 @@ class AnalyzeDatabaseAlarmListener : PersistentAlarmManagerListener() {
   }
 
   private fun getNextTime(): Long {
+    val random = SecureRandom()
     return LocalDateTime
       .now()
       .plusDays(1)
-      .withHour(3)
-      .withMinute(0)
-      .withSecond(0)
+      .withHour(2 + random.nextInt(3))
+      .withMinute(random.nextInt(60))
+      .withSecond(random.nextInt(60))
       .toMillis()
   }
 }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/service/AttachmentProgressService.kt b/app/src/main/java/org/thoughtcrime/securesms/service/AttachmentProgressService.kt
index a340d0ff1d..0ea40e1e68 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/service/AttachmentProgressService.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/service/AttachmentProgressService.kt
@@ -150,8 +150,8 @@ class AttachmentProgressService : SafeForegroundService() {
 
     /** Has to have separate setter to avoid infinite loops when [progress] and [indeterminate] interact. */
     fun setIndeterminate(value: Boolean) {
-      indeterminate = value
       progress = 0f
+      indeterminate = value
       onControllersChanged(context)
     }
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/service/BackupProgressService.kt b/app/src/main/java/org/thoughtcrime/securesms/service/BackupProgressService.kt
new file mode 100644
index 0000000000..466b19e4e6
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/service/BackupProgressService.kt
@@ -0,0 +1,120 @@
+/*
+ * Copyright 2024 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.thoughtcrime.securesms.service
+
+import android.annotation.SuppressLint
+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.MainActivity
+import org.thoughtcrime.securesms.R
+import org.thoughtcrime.securesms.notifications.NotificationChannels
+import org.thoughtcrime.securesms.notifications.NotificationIds
+import java.util.concurrent.locks.ReentrantLock
+import javax.annotation.CheckReturnValue
+import kotlin.concurrent.withLock
+
+/**
+ * Foreground service to provide "long" run support to backup jobs.
+ */
+class BackupProgressService : SafeForegroundService() {
+
+  companion object {
+    private val TAG = Log.tag(BackupProgressService::class)
+
+    @SuppressLint("StaticFieldLeak")
+    private var controller: Controller? = null
+    private val controllerLock = ReentrantLock()
+
+    private var title: String = ""
+    private var progress: Float = 0f
+    private var indeterminate: Boolean = true
+
+    @CheckReturnValue
+    fun start(context: Context, startingTitle: String): Controller {
+      controllerLock.withLock {
+        if (controller != null) {
+          Log.w(TAG, "Starting service with existing controller")
+        }
+
+        controller = Controller(context, startingTitle)
+        val started = SafeForegroundService.start(context, BackupProgressService::class.java)
+        if (started) {
+          Log.i(TAG, "[start] Starting")
+        } else {
+          Log.w(TAG, "[start] Service already started")
+        }
+
+        return controller!!
+      }
+    }
+
+    private fun stop(context: Context) {
+      SafeForegroundService.stop(context, BackupProgressService::class.java)
+      controllerLock.withLock {
+        controller = null
+      }
+    }
+
+    private fun getForegroundNotification(context: Context): Notification {
+      return NotificationCompat.Builder(context, NotificationChannels.getInstance().OTHER)
+        .setSmallIcon(R.drawable.ic_notification)
+        .setContentTitle(title)
+        .setProgress(100, (progress * 100).toInt(), indeterminate)
+        .setContentIntent(PendingIntent.getActivity(context, 0, MainActivity.clearTop(context), PendingIntentFlags.mutable()))
+        .setVibrate(longArrayOf(0))
+        .build()
+    }
+  }
+
+  override val tag: String = TAG
+  override val notificationId: Int = NotificationIds.BACKUP_PROGRESS
+
+  override fun getForegroundNotification(intent: Intent): Notification {
+    return getForegroundNotification(this)
+  }
+
+  /**
+   * Use to update notification progress/state.
+   */
+  class Controller(private val context: Context, startingTitle: String) : AutoCloseable {
+
+    init {
+      title = startingTitle
+      progress = 0f
+      indeterminate = true
+    }
+
+    fun update(title: String, progress: Float, indeterminate: Boolean) {
+      controllerLock.withLock {
+        if (this != controller) {
+          return
+        }
+
+        BackupProgressService.title = title
+        BackupProgressService.progress = progress
+        BackupProgressService.indeterminate = indeterminate
+
+        if (NotificationManagerCompat.from(context).activeNotifications.any { n -> n.id == NotificationIds.BACKUP_PROGRESS }) {
+          NotificationManagerCompat.from(context).notify(NotificationIds.BACKUP_PROGRESS, getForegroundNotification(context))
+        }
+      }
+    }
+
+    override fun close() {
+      controllerLock.withLock {
+        if (this == controller) {
+          stop(context)
+        }
+      }
+    }
+  }
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/service/LocalBackupListener.java b/app/src/main/java/org/thoughtcrime/securesms/service/LocalBackupListener.java
index 04848ff714..605e4c44d8 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/service/LocalBackupListener.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/service/LocalBackupListener.java
@@ -56,7 +56,7 @@ public static long setNextBackupTimeToIntervalFromNow(@NonNull Context context)
 
     int jitter = (new Random().nextInt(BACKUP_JITTER_WINDOW_SECONDS)) - (BACKUP_JITTER_WINDOW_SECONDS / 2);
 
-    next.plusSeconds(jitter);
+    next = next.plusSeconds(jitter);
 
     if (nextInstant.isAfter(next)) {
       next = next.plusDays(1);
diff --git a/app/src/main/java/org/thoughtcrime/securesms/service/MessageBackupListener.kt b/app/src/main/java/org/thoughtcrime/securesms/service/MessageBackupListener.kt
new file mode 100644
index 0000000000..ddd95042e8
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/service/MessageBackupListener.kt
@@ -0,0 +1,58 @@
+/*
+ * Copyright 2024 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.thoughtcrime.securesms.service
+
+import android.content.Context
+import org.thoughtcrime.securesms.jobs.BackupMessagesJob
+import org.thoughtcrime.securesms.keyvalue.SignalStore
+import org.thoughtcrime.securesms.util.FeatureFlags
+import org.thoughtcrime.securesms.util.toMillis
+import java.time.LocalDateTime
+import java.util.Random
+import java.util.concurrent.TimeUnit
+
+class MessageBackupListener : PersistentAlarmManagerListener() {
+  override fun shouldScheduleExact(): Boolean {
+    return true
+  }
+
+  override fun getNextScheduledExecutionTime(context: Context): Long {
+    return SignalStore.backup().nextBackupTime
+  }
+
+  override fun onAlarm(context: Context, scheduledTime: Long): Long {
+    if (SignalStore.backup().areBackupsEnabled) {
+      BackupMessagesJob.enqueue()
+    }
+    return setNextBackupTimeToIntervalFromNow()
+  }
+
+  companion object {
+    private val BACKUP_JITTER_WINDOW_SECONDS = Math.toIntExact(TimeUnit.MINUTES.toSeconds(10))
+
+    @JvmStatic
+    fun schedule(context: Context?) {
+      if (FeatureFlags.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
+      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())
+      if (now.isAfter(next)) {
+        next = next.plusDays(1)
+      }
+      val nextTime = next.toMillis()
+      SignalStore.backup().nextBackupTime = nextTime
+      return nextTime
+    }
+  }
+}
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 e963ba94aa..ca8b34046c 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
@@ -38,7 +38,7 @@ class AndroidCallConnection(
 
   override fun onShowIncomingCallUi() {
     Log.i(TAG, "onShowIncomingCallUi()")
-    ActiveCallManager.update(context, CallNotificationBuilder.TYPE_INCOMING_CONNECTING, recipientId, isVideoCall)
+    WebRtcCallService.update(context, CallNotificationBuilder.TYPE_INCOMING_CONNECTING, recipientId, isVideoCall)
     setRinging()
   }
 
@@ -74,17 +74,17 @@ class AndroidCallConnection(
   }
 
   override fun onSilence() {
-    ActiveCallManager.sendAudioManagerCommand(context, AudioManagerCommand.SilenceIncomingRinger())
+    WebRtcCallService.sendAudioManagerCommand(context, AudioManagerCommand.SilenceIncomingRinger())
   }
 
   override fun onReject() {
     Log.i(TAG, "onReject()")
-    ActiveCallManager.denyCall()
+    WebRtcCallService.denyCall(context)
   }
 
   override fun onDisconnect() {
     Log.i(TAG, "onDisconnect()")
-    ActiveCallManager.hangup()
+    WebRtcCallService.hangup(context)
   }
 
   companion object {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/service/webrtc/GroupConnectedActionProcessor.java b/app/src/main/java/org/thoughtcrime/securesms/service/webrtc/GroupConnectedActionProcessor.java
index f91451d7cb..773f4243d4 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/service/webrtc/GroupConnectedActionProcessor.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/service/webrtc/GroupConnectedActionProcessor.java
@@ -260,10 +260,10 @@ private GroupCallReactionEvent createGroupCallReaction(Collection<CallParticipan
   protected @NonNull WebRtcServiceState handleGroupCallRaisedHand(@NonNull WebRtcServiceState currentState, List<Long> raisedHands) {
     Log.i(TAG, "handleGroupCallRaisedHand():");
 
-    boolean                                        playSound    = !raisedHands.isEmpty();
-    long                                           now          = System.currentTimeMillis();
-    WebRtcServiceStateBuilder.CallInfoStateBuilder builder      = currentState.builder().changeCallInfoState();
-    Long                                           localDemuxId = currentState.getCallInfoState().requireGroupCall().getLocalDeviceState().getDemuxId();
+    boolean                                        playSound       = !raisedHands.isEmpty();
+    long                                           now             = System.currentTimeMillis();
+    WebRtcServiceStateBuilder.CallInfoStateBuilder callInfoBuilder = currentState.builder().changeCallInfoState();
+    Long                                           localDemuxId    = currentState.getCallInfoState().requireGroupCall().getLocalDeviceState().getDemuxId();
 
     List<CallParticipant> participants = currentState.getCallInfoState().getRemoteCallParticipants();
 
@@ -276,31 +276,25 @@ private GroupCallReactionEvent createGroupCallReaction(Collection<CallParticipan
       }
       
       if (raisedHandIndex >= 0 && !wasHandAlreadyRaised) {
-        builder.putParticipant(updatedParticipant.getCallParticipantId(), updatedParticipant.withHandRaisedTimestamp(now + raisedHandIndex));
+        callInfoBuilder.putParticipant(updatedParticipant.getCallParticipantId(), updatedParticipant.withHandRaisedTimestamp(now + raisedHandIndex));
       } else if (raisedHandIndex < 0 && wasHandAlreadyRaised) {
-        builder.putParticipant(updatedParticipant.getCallParticipantId(), updatedParticipant.withHandRaisedTimestamp(CallParticipant.HAND_LOWERED));
+        callInfoBuilder.putParticipant(updatedParticipant.getCallParticipantId(), updatedParticipant.withHandRaisedTimestamp(CallParticipant.HAND_LOWERED));
       }
     }
 
+    currentState = callInfoBuilder.build();
+
     if (localDemuxId != null) {
-      if (raisedHands.contains(localDemuxId)) {
-        builder.setLocalParticipant(CallParticipant.createLocal(currentState.getLocalDeviceState().getCameraState(),
-                                                                currentState.getVideoState().requireLocalSink(),
-                                                                currentState.getLocalDeviceState().isMicrophoneEnabled(),
-                                                                now,
-                                                                new CallParticipantId(localDemuxId, Recipient.self().getId())));
-      } else {
-        builder.setLocalParticipant(CallParticipant.createLocal(currentState.getLocalDeviceState().getCameraState(),
-                                                                currentState.getVideoState().requireLocalSink(),
-                                                                currentState.getLocalDeviceState().isMicrophoneEnabled(),
-                                                                CallParticipant.HAND_LOWERED,
-                                                                new CallParticipantId(localDemuxId, Recipient.self().getId())));
-      }
+      currentState = currentState.builder()
+                                 .changeLocalDeviceState()
+                                 .setHandRaisedTimestamp(raisedHands.contains(localDemuxId) ? now : CallParticipant.HAND_LOWERED)
+                                 .build();
     }
+
     if (playSound) {
       webRtcInteractor.playStateChangeUp();
     }
 
-    return builder.build();
+    return currentState;
   }
 }
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 a25bef554a..28fee3f30a 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
@@ -91,6 +91,7 @@
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
@@ -759,10 +760,10 @@ public void onSendBusy(@NonNull CallId callId, @Nullable Remote remote, @NonNull
   }
 
   @Override
-  public void onSendCallMessage(@NonNull UUID aciUuid, @NonNull byte[] bytes, @NonNull CallManager.CallMessageUrgency urgency) {
+  public void onSendCallMessage(@NonNull UUID aciUuid, @NonNull byte[] message, @NonNull CallManager.CallMessageUrgency urgency) {
     Log.i(TAG, "onSendCallMessage():");
 
-    OpaqueMessage            opaqueMessage = new OpaqueMessage(bytes, getUrgencyFromCallUrgency(urgency));
+    OpaqueMessage            opaqueMessage = new OpaqueMessage(message, getUrgencyFromCallUrgency(urgency));
     SignalServiceCallMessage callMessage   = SignalServiceCallMessage.forOpaque(opaqueMessage, null);
 
     networkExecutor.execute(() -> {
@@ -776,27 +777,36 @@ public void onSendCallMessage(@NonNull UUID aciUuid, @NonNull byte[] bytes, @Non
                                                 recipient.isSelf() ? Optional.empty() : UnidentifiedAccessUtil.getAccessFor(context, recipient),
                                                 callMessage);
       } catch (UntrustedIdentityException e) {
-        Log.i(TAG, "sendOpaqueCallMessage onFailure: ", e);
+        Log.i(TAG, "onSendCallMessage onFailure: ", e);
         RetrieveProfileJob.enqueue(recipient.getId());
         process((s, p) -> p.handleGroupMessageSentError(s, Collections.singletonList(recipient.getId()), UNTRUSTED_IDENTITY));
       } catch (IOException e) {
-        Log.i(TAG, "sendOpaqueCallMessage onFailure: ", e);
+        Log.i(TAG, "onSendCallMessage onFailure: ", e);
         process((s, p) -> p.handleGroupMessageSentError(s, Collections.singletonList(recipient.getId()), NETWORK_FAILURE));
       }
     });
   }
 
   @Override
-  public void onSendCallMessageToGroup(@NonNull byte[] groupIdBytes, @NonNull byte[] message, @NonNull CallManager.CallMessageUrgency urgency) {
+  public void onSendCallMessageToGroup(@NonNull byte[] groupIdBytes, @NonNull byte[] message, @NonNull CallManager.CallMessageUrgency urgency, @NonNull List<UUID> overrideRecipients) {
     Log.i(TAG, "onSendCallMessageToGroup():");
 
     networkExecutor.execute(() -> {
       try {
         GroupId         groupId    = GroupId.v2(new GroupIdentifier(groupIdBytes));
         List<Recipient> recipients = SignalDatabase.groups().getGroupMembers(groupId, GroupTable.MemberSet.FULL_MEMBERS_EXCLUDING_SELF);
+        Set<UUID>       toInclude  = new HashSet<>(overrideRecipients.size());
+
+        toInclude.addAll(overrideRecipients);
 
         recipients = RecipientUtil.getEligibleForSending((recipients.stream()
                                                                     .map(Recipient::resolve)
+                                                                    .filter(r -> {
+                                                                      if (toInclude.isEmpty()) {
+                                                                        return true;
+                                                                      }
+                                                                      return r.getHasServiceId() && toInclude.contains(r.requireServiceId().getRawUuid());
+                                                                    })
                                                                     .collect(Collectors.toList())));
 
         OpaqueMessage            opaqueMessage = new OpaqueMessage(message, getUrgencyFromCallUrgency(urgency));
@@ -909,9 +919,7 @@ public void onLowBandwidthForVideo(@NonNull GroupCall groupCall, boolean recover
 
   @Override
   public void onReactions(@NonNull GroupCall groupCall, List<Reaction> reactions) {
-    if (FeatureFlags.groupCallReactions()) {
-      processStateless(s -> serviceState.getActionProcessor().handleGroupCallReaction(serviceState, s, reactions));
-    }
+    processStateless(s -> serviceState.getActionProcessor().handleGroupCallReaction(serviceState, s, reactions));
   }
 
   @Override
@@ -1041,7 +1049,27 @@ public void sendGroupCallUpdateMessage(@NonNull Recipient recipient, @Nullable S
     Log.i(TAG, "sendGroupCallUpdateMessage id: " + recipient.getId() + " era: " + groupCallEraId + " isIncoming: " + isIncoming + " isJoinEvent: " + isJoinEvent);
 
     if (recipient.isCallLink()) {
-      Log.i(TAG, "sendGroupCallUpdateMessage -- ignoring for call link");
+      if (isJoinEvent) {
+        SignalExecutors.BOUNDED.execute(() -> {
+          CallId callIdLocal = callId;
+
+          if (callIdLocal == null && groupCallEraId != null) {
+            callIdLocal = CallId.fromEra(groupCallEraId);
+          }
+
+          if (callIdLocal != null) {
+            ApplicationDependencies.getJobManager().add(
+                CallSyncEventJob.createForJoin(
+                    recipient.getId(),
+                    callIdLocal.longValue(),
+                    isIncoming
+                )
+            );
+          }
+        });
+      } else {
+        Log.i(TAG, "sendGroupCallUpdateMessage -- ignoring non-join event for call link");
+      }
       return;
     }
 
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
new file mode 100644
index 0000000000..a128ac9e21
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/service/webrtc/WebRtcCallService.java
@@ -0,0 +1,467 @@
+package org.thoughtcrime.securesms.service.webrtc;
+
+import android.app.Notification;
+import android.app.PendingIntent;
+import android.app.Service;
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.content.pm.ServiceInfo;
+import android.net.ConnectivityManager;
+import android.net.NetworkInfo;
+import android.os.Build;
+import android.os.IBinder;
+import android.telephony.PhoneStateListener;
+import android.telephony.TelephonyManager;
+
+import androidx.annotation.MainThread;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import org.signal.core.util.PendingIntentFlags;
+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.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.TelephonyUtil;
+import org.thoughtcrime.securesms.webrtc.CallNotificationBuilder;
+import org.thoughtcrime.securesms.webrtc.UncaughtExceptionHandlerManager;
+import org.thoughtcrime.securesms.webrtc.audio.AudioManagerCommand;
+import org.thoughtcrime.securesms.webrtc.audio.SignalAudioManager;
+import org.thoughtcrime.securesms.webrtc.locks.LockManager;
+
+import java.util.Objects;
+import java.util.Set;
+import java.util.concurrent.Executor;
+import java.util.concurrent.TimeUnit;
+
+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;
+
+/**
+ * Provide a foreground service for {@link SignalCallManager} to leverage to run in the background when necessary. Also
+ * provides devices listeners needed for during a call (i.e., bluetooth, power button).
+ */
+public final class WebRtcCallService extends Service implements SignalAudioManager.EventListener {
+
+  private static final String TAG                        = Log.tag(WebRtcCallService.class);
+  private static final String WEBSOCKET_KEEP_ALIVE_TOKEN = WebRtcCallService.class.getName();
+
+  private static final String ACTION_UPDATE              = "UPDATE";
+  private static final String ACTION_STOP                = "STOP";
+  private static final String ACTION_DENY_CALL           = "DENY_CALL";
+  private static final String ACTION_LOCAL_HANGUP        = "LOCAL_HANGUP";
+  private static final String ACTION_CHANGE_POWER_BUTTON = "CHANGE_POWER_BUTTON";
+  private static final String ACTION_SEND_AUDIO_COMMAND  = "SEND_AUDIO_COMMAND";
+
+  private static final String EXTRA_UPDATE_TYPE   = "UPDATE_TYPE";
+  private static final String EXTRA_RECIPIENT_ID  = "RECIPIENT_ID";
+  private static final String EXTRA_ENABLED       = "ENABLED";
+  private static final String EXTRA_AUDIO_COMMAND = "AUDIO_COMMAND";
+  private static final String EXTRA_IS_VIDEO_CALL = "IS_VIDEO_CALL";
+
+  private static final int  INVALID_NOTIFICATION_ID           = -1;
+  private static final long REQUEST_WEBSOCKET_STAY_OPEN_DELAY = TimeUnit.MINUTES.toMillis(1);
+  private static final long FOREGROUND_SERVICE_TIMEOUT        = TimeUnit.SECONDS.toMillis(10);
+
+  private final WebSocketKeepAliveTask webSocketKeepAliveTask = new WebSocketKeepAliveTask();
+  private final Executor               singleThreadExecutor   = SignalExecutors.newCachedSingleThreadExecutor("signal-webrtc-in-call", ThreadUtil.PRIORITY_IMPORTANT_BACKGROUND_THREAD);
+
+  private SignalCallManager callManager;
+
+  private NetworkReceiver                 networkReceiver;
+  private PowerButtonReceiver             powerButtonReceiver;
+  private UncaughtExceptionHandlerManager uncaughtExceptionHandlerManager;
+  private PhoneStateListener              hangUpRtcOnDeviceCallAnswered;
+  private SignalAudioManager              signalAudioManager;
+  private int                             lastNotificationId;
+  private Notification                    lastNotification;
+  private long                            lastNotificationRequestTime;
+  private Disposable                      lastNotificationDisposable = Disposable.disposed();
+  private boolean                         stopping                   = false;
+
+  public synchronized static void update(@NonNull Context context, int type, @NonNull RecipientId recipientId, boolean isVideoCall) {
+    if (FeatureFlags.useActiveCallManager()) {
+      ActiveCallManager.update(context, type, recipientId, isVideoCall);
+
+      return;
+    }
+
+    Intent intent = new Intent(context, WebRtcCallService.class);
+    intent.setAction(ACTION_UPDATE)
+          .putExtra(EXTRA_UPDATE_TYPE, type)
+          .putExtra(EXTRA_RECIPIENT_ID, recipientId)
+          .putExtra(EXTRA_IS_VIDEO_CALL, isVideoCall);
+
+    ForegroundServiceUtil.tryToStartWhenCapable(context, intent, FOREGROUND_SERVICE_TIMEOUT);
+  }
+
+  public static void denyCall(@NonNull Context context) {
+    if (FeatureFlags.useActiveCallManager()) {
+      ActiveCallManager.denyCall();
+      return;
+    }
+
+    ForegroundServiceUtil.tryToStartWhenCapable(context, new Intent(context, WebRtcCallService.class).setAction(ACTION_DENY_CALL), FOREGROUND_SERVICE_TIMEOUT);
+  }
+
+  public static void hangup(@NonNull Context context) {
+    if (FeatureFlags.useActiveCallManager()) {
+      ActiveCallManager.hangup();
+      return;
+    }
+
+    ForegroundServiceUtil.tryToStartWhenCapable(context, new Intent(context, WebRtcCallService.class).setAction(ACTION_LOCAL_HANGUP), FOREGROUND_SERVICE_TIMEOUT);
+  }
+
+  public synchronized static void stop(@NonNull Context context) {
+    if (FeatureFlags.useActiveCallManager()) {
+      ActiveCallManager.stop();
+      return;
+    }
+
+    Intent intent = new Intent(context, WebRtcCallService.class);
+    intent.setAction(ACTION_STOP);
+
+    ForegroundServiceUtil.tryToStartWhenCapable(context, intent, FOREGROUND_SERVICE_TIMEOUT);
+  }
+
+  public synchronized static @NonNull PendingIntent denyCallIntent(@NonNull Context context) {
+    if (FeatureFlags.useActiveCallManager()) {
+      return ActiveCallManager.denyCallIntent(context);
+    }
+
+    return getServicePendingIntent(context, new Intent(context, WebRtcCallService.class).setAction(ACTION_DENY_CALL));
+  }
+
+  public synchronized static @NonNull PendingIntent hangupIntent(@NonNull Context context) {
+    if (FeatureFlags.useActiveCallManager()) {
+      return ActiveCallManager.hangupIntent(context);
+    }
+
+    return getServicePendingIntent(context, new Intent(context, WebRtcCallService.class).setAction(ACTION_LOCAL_HANGUP));
+  }
+
+  public synchronized static void sendAudioManagerCommand(@NonNull Context context, @NonNull AudioManagerCommand command) {
+    if (FeatureFlags.useActiveCallManager()) {
+      ActiveCallManager.sendAudioManagerCommand(context, command);
+      return;
+    }
+
+    Intent intent = new Intent(context, WebRtcCallService.class);
+    intent.setAction(ACTION_SEND_AUDIO_COMMAND)
+          .putExtra(EXTRA_AUDIO_COMMAND, command);
+    ForegroundServiceUtil.tryToStartWhenCapable(context, intent, FOREGROUND_SERVICE_TIMEOUT);
+  }
+
+  public synchronized static void changePowerButtonReceiver(@NonNull Context context, boolean register) {
+    if (FeatureFlags.useActiveCallManager()) {
+      ActiveCallManager.changePowerButtonReceiver(context, register);
+      return;
+    }
+
+    Intent intent = new Intent(context, WebRtcCallService.class);
+    intent.setAction(ACTION_CHANGE_POWER_BUTTON)
+          .putExtra(EXTRA_ENABLED, register);
+
+    ForegroundServiceUtil.tryToStartWhenCapable(context, intent, FOREGROUND_SERVICE_TIMEOUT);
+  }
+
+  @Override
+  public void onCreate() {
+    Log.v(TAG, "onCreate");
+    super.onCreate();
+    this.callManager                   = ApplicationDependencies.getSignalCallManager();
+    this.hangUpRtcOnDeviceCallAnswered = new HangUpRtcOnPstnCallAnsweredListener();
+    this.lastNotificationId            = INVALID_NOTIFICATION_ID;
+
+    registerUncaughtExceptionHandler();
+    registerNetworkReceiver();
+
+    if (!AndroidTelecomUtil.getTelecomSupported()) {
+      try {
+        TelephonyUtil.getManager(this).listen(hangUpRtcOnDeviceCallAnswered, PhoneStateListener.LISTEN_CALL_STATE);
+      } catch (SecurityException e) {
+        Log.w(TAG, "Failed to listen to PSTN call answers!", e);
+      }
+    }
+  }
+
+  @Override
+  public void onDestroy() {
+    Log.v(TAG, "onDestroy");
+    super.onDestroy();
+
+    if (uncaughtExceptionHandlerManager != null) {
+      uncaughtExceptionHandlerManager.unregister();
+    }
+
+    if (signalAudioManager != null) {
+      signalAudioManager.shutdown();
+    }
+
+    unregisterNetworkReceiver();
+    unregisterPowerButtonReceiver();
+
+    if (!AndroidTelecomUtil.getTelecomSupported()) {
+      TelephonyUtil.getManager(this).listen(hangUpRtcOnDeviceCallAnswered, PhoneStateListener.LISTEN_NONE);
+    }
+
+    webSocketKeepAliveTask.stop();
+  }
+
+  @Override
+  public int onStartCommand(Intent intent, int flags, int startId) {
+    if (intent == null || intent.getAction() == null) {
+      Log.w(TAG, "Service running with null intent/action likely from system restart, stopping");
+      stop();
+      return START_NOT_STICKY;
+    }
+
+    Log.i(TAG, "action: " + intent.getAction());
+    webSocketKeepAliveTask.start();
+
+    switch (intent.getAction()) {
+      case ACTION_UPDATE:
+        setCallInProgressNotification(intent.getIntExtra(EXTRA_UPDATE_TYPE, 0),
+                                      Objects.requireNonNull(intent.getParcelableExtra(EXTRA_RECIPIENT_ID)),
+                                      intent.getBooleanExtra(EXTRA_IS_VIDEO_CALL, false));
+        return START_STICKY;
+      case ACTION_SEND_AUDIO_COMMAND:
+        setCallNotification();
+        if (signalAudioManager == null) {
+          signalAudioManager = SignalAudioManager.create(this, this);
+        }
+        AudioManagerCommand audioCommand = Objects.requireNonNull(intent.getParcelableExtra(EXTRA_AUDIO_COMMAND));
+        Log.i(TAG, "Sending audio command [" + audioCommand.getClass().getSimpleName() + "] to " + signalAudioManager.getClass().getSimpleName());
+        signalAudioManager.handleCommand(audioCommand);
+        return START_STICKY;
+      case ACTION_CHANGE_POWER_BUTTON:
+        setCallNotification();
+        if (intent.getBooleanExtra(EXTRA_ENABLED, false)) {
+          registerPowerButtonReceiver();
+        } else {
+          unregisterPowerButtonReceiver();
+        }
+        return START_STICKY;
+      case ACTION_STOP:
+        setCallNotification(true);
+        stop();
+        return START_NOT_STICKY;
+      case ACTION_DENY_CALL:
+        setCallNotification();
+        callManager.denyCall();
+        return START_NOT_STICKY;
+      case ACTION_LOCAL_HANGUP:
+        setCallNotification();
+        callManager.localHangup();
+        return START_NOT_STICKY;
+      default:
+        throw new AssertionError("Unknown action: " + intent.getAction());
+    }
+  }
+
+  private void setCallNotification() {
+    setCallNotification(false);
+  }
+
+  private void setCallNotification(boolean stopping) {
+    if (!stopping && lastNotificationId != INVALID_NOTIFICATION_ID) {
+      startForegroundCompat(lastNotificationId, lastNotification);
+    } else {
+      if (!stopping) {
+        Log.i(TAG, "Service was started without calling UPDATE first, using temporary notification.");
+      }
+      startForegroundCompat(CallNotificationBuilder.getStartingStoppingNotificationId(), stopping ? CallNotificationBuilder.getStoppingNotification(this)
+                                                                                                  : CallNotificationBuilder.getStartingNotification(this));
+    }
+  }
+
+  public void setCallInProgressNotification(int type, @NonNull RecipientId id, boolean isVideoCall) {
+    lastNotificationDisposable.dispose();
+
+    boolean requiresAsyncNotificationLoad = Build.VERSION.SDK_INT <= 29;
+
+    lastNotificationId = CallNotificationBuilder.getNotificationId(type);
+    lastNotification   = CallNotificationBuilder.getCallInProgressNotification(this, type, Recipient.resolved(id), isVideoCall, requiresAsyncNotificationLoad);
+
+    startForegroundCompat(lastNotificationId, lastNotification);
+
+    if (requiresAsyncNotificationLoad) {
+      final long requestTime = System.currentTimeMillis();
+      lastNotificationRequestTime = requestTime;
+      lastNotificationDisposable  = Single
+          .fromCallable(() -> CallNotificationBuilder.getCallInProgressNotification(this, type, Recipient.resolved(id), isVideoCall, false))
+          .subscribeOn(Schedulers.from(singleThreadExecutor))
+          .observeOn(AndroidSchedulers.mainThread())
+          .filter(unused -> requestTime == lastNotificationRequestTime && !stopping)
+          .subscribe(notification -> {
+            lastNotification = notification;
+            startForegroundCompat(lastNotificationId, lastNotification);
+          });
+    }
+  }
+
+  private synchronized void startForegroundCompat(int notificationId, Notification notification) {
+    if (stopping) {
+      return;
+    }
+
+    if (Build.VERSION.SDK_INT >= 30) {
+      startForeground(notificationId, notification, ServiceInfo.FOREGROUND_SERVICE_TYPE_CAMERA | ServiceInfo.FOREGROUND_SERVICE_TYPE_MICROPHONE);
+    } else {
+      startForeground(notificationId, notification);
+    }
+  }
+
+  private synchronized void stop() {
+    stopping = true;
+    stopForeground(true);
+    stopSelf();
+  }
+
+  private void registerUncaughtExceptionHandler() {
+    uncaughtExceptionHandlerManager = new UncaughtExceptionHandlerManager();
+    uncaughtExceptionHandlerManager.registerHandler(new ProximityLockRelease(callManager.getLockManager()));
+  }
+
+  private void registerNetworkReceiver() {
+    if (networkReceiver == null) {
+      networkReceiver = new NetworkReceiver();
+
+      registerReceiver(networkReceiver, new IntentFilter(ConnectivityManager.CONNECTIVITY_ACTION));
+    }
+  }
+
+  private void unregisterNetworkReceiver() {
+    if (networkReceiver != null) {
+      unregisterReceiver(networkReceiver);
+
+      networkReceiver = null;
+    }
+  }
+
+  public void registerPowerButtonReceiver() {
+    if (!AndroidTelecomUtil.getTelecomSupported() && powerButtonReceiver == null) {
+      powerButtonReceiver = new PowerButtonReceiver();
+
+      registerReceiver(powerButtonReceiver, new IntentFilter(Intent.ACTION_SCREEN_OFF));
+    }
+  }
+
+  public void unregisterPowerButtonReceiver() {
+    if (powerButtonReceiver != null) {
+      unregisterReceiver(powerButtonReceiver);
+
+      powerButtonReceiver = null;
+    }
+  }
+
+  @Override
+  public @Nullable IBinder onBind(Intent intent) {
+    return null;
+  }
+
+  @Override
+  public void onAudioDeviceChanged(@NonNull SignalAudioManager.AudioDevice activeDevice, @NonNull Set<SignalAudioManager.AudioDevice> availableDevices) {
+    callManager.onAudioDeviceChanged(activeDevice, availableDevices);
+  }
+
+  @Override
+  public void onBluetoothPermissionDenied() {
+    callManager.onBluetoothPermissionDenied();
+  }
+
+  public static PendingIntent getServicePendingIntent(@NonNull Context context, @NonNull Intent intent) {
+    return Build.VERSION.SDK_INT >= 26 ? PendingIntent.getForegroundService(context, 0, intent, PendingIntentFlags.mutable())
+                                       : PendingIntent.getService(context, 0, intent, PendingIntentFlags.mutable());
+  }
+
+  @SuppressWarnings("deprecation")
+  private class HangUpRtcOnPstnCallAnsweredListener extends PhoneStateListener {
+    @Override
+    public void onCallStateChanged(int state, @NonNull String phoneNumber) {
+      super.onCallStateChanged(state, phoneNumber);
+      if (state == TelephonyManager.CALL_STATE_OFFHOOK) {
+        hangup();
+        Log.i(TAG, "Device phone call ended Signal call.");
+      }
+    }
+
+    private void hangup() {
+      callManager.localHangup();
+    }
+  }
+
+  /**
+   * Periodically request the web socket stay open if we are doing anything call related.
+   */
+  private class WebSocketKeepAliveTask implements Runnable {
+    private boolean keepRunning = false;
+
+    @MainThread
+    public void start() {
+      if (!keepRunning) {
+        keepRunning = true;
+        run();
+      }
+    }
+
+    @MainThread
+    public void stop() {
+      keepRunning = false;
+      ThreadUtil.cancelRunnableOnMain(webSocketKeepAliveTask);
+      ApplicationDependencies.getIncomingMessageObserver().removeKeepAliveToken(WEBSOCKET_KEEP_ALIVE_TOKEN);
+    }
+
+    @MainThread
+    @Override
+    public void run() {
+      if (keepRunning) {
+        ApplicationDependencies.getIncomingMessageObserver().registerKeepAliveToken(WEBSOCKET_KEEP_ALIVE_TOKEN);
+        ThreadUtil.runOnMainDelayed(this, REQUEST_WEBSOCKET_STAY_OPEN_DELAY);
+      }
+    }
+  }
+
+  private static class NetworkReceiver extends BroadcastReceiver {
+    @Override
+    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();
+    }
+  }
+
+  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();
+      }
+    }
+  }
+
+  private static class ProximityLockRelease implements Thread.UncaughtExceptionHandler {
+    private final LockManager lockManager;
+
+    private ProximityLockRelease(@NonNull LockManager lockManager) {
+      this.lockManager = lockManager;
+    }
+
+    @Override
+    public void uncaughtException(@NonNull Thread thread, @NonNull Throwable throwable) {
+      Log.i(TAG, "Uncaught exception - releasing proximity lock", throwable);
+      lockManager.updatePhoneState(LockManager.PhoneState.IDLE);
+    }
+  }
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/service/webrtc/WebRtcInteractor.java b/app/src/main/java/org/thoughtcrime/securesms/service/webrtc/WebRtcInteractor.java
index 219c3431cd..2e5d5d248b 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/service/webrtc/WebRtcInteractor.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/service/webrtc/WebRtcInteractor.java
@@ -95,11 +95,11 @@ void updateGroupCallUpdateMessage(@NonNull RecipientId groupId, @Nullable String
   }
 
   void setCallInProgressNotification(int type, @NonNull RemotePeer remotePeer, boolean isVideoCall) {
-    ActiveCallManager.update(context, type, remotePeer.getRecipient().getId(), isVideoCall);
+    WebRtcCallService.update(context, type, remotePeer.getRecipient().getId(), isVideoCall);
   }
 
   void setCallInProgressNotification(int type, @NonNull Recipient recipient, boolean isVideoCall) {
-    ActiveCallManager.update(context, type, recipient.getId(), isVideoCall);
+    WebRtcCallService.update(context, type, recipient.getId(), isVideoCall);
   }
 
   void retrieveTurnServers(@NonNull RemotePeer remotePeer) {
@@ -107,7 +107,7 @@ void retrieveTurnServers(@NonNull RemotePeer remotePeer) {
   }
 
   void stopForegroundService() {
-    ActiveCallManager.stop();
+    WebRtcCallService.stop(context);
   }
 
   void insertMissedCall(@NonNull RemotePeer remotePeer, long timestamp, boolean isVideoOffer) {
@@ -127,51 +127,51 @@ boolean startWebRtcCallActivityIfPossible() {
   }
 
   void registerPowerButtonReceiver() {
-    ActiveCallManager.changePowerButtonReceiver(context, true);
+    WebRtcCallService.changePowerButtonReceiver(context, true);
   }
 
   void unregisterPowerButtonReceiver() {
-    ActiveCallManager.changePowerButtonReceiver(context, false);
+    WebRtcCallService.changePowerButtonReceiver(context, false);
   }
 
   void silenceIncomingRinger() {
-    ActiveCallManager.sendAudioManagerCommand(context, new AudioManagerCommand.SilenceIncomingRinger());
+    WebRtcCallService.sendAudioManagerCommand(context, new AudioManagerCommand.SilenceIncomingRinger());
   }
 
   void initializeAudioForCall() {
-    ActiveCallManager.sendAudioManagerCommand(context, new AudioManagerCommand.Initialize());
+    WebRtcCallService.sendAudioManagerCommand(context, new AudioManagerCommand.Initialize());
   }
 
   void startIncomingRinger(@Nullable Uri ringtoneUri, boolean vibrate) {
-    ActiveCallManager.sendAudioManagerCommand(context, new AudioManagerCommand.StartIncomingRinger(ringtoneUri, vibrate));
+    WebRtcCallService.sendAudioManagerCommand(context, new AudioManagerCommand.StartIncomingRinger(ringtoneUri, vibrate));
   }
 
   void startOutgoingRinger() {
-    ActiveCallManager.sendAudioManagerCommand(context, new AudioManagerCommand.StartOutgoingRinger());
+    WebRtcCallService.sendAudioManagerCommand(context, new AudioManagerCommand.StartOutgoingRinger());
   }
 
   void stopAudio(boolean playDisconnect) {
-    ActiveCallManager.sendAudioManagerCommand(context, new AudioManagerCommand.Stop(playDisconnect));
+    WebRtcCallService.sendAudioManagerCommand(context, new AudioManagerCommand.Stop(playDisconnect));
   }
 
   void startAudioCommunication() {
-    ActiveCallManager.sendAudioManagerCommand(context, new AudioManagerCommand.Start());
+    WebRtcCallService.sendAudioManagerCommand(context, new AudioManagerCommand.Start());
   }
 
   public void setUserAudioDevice(@Nullable RecipientId recipientId, @NonNull SignalAudioManager.ChosenAudioDeviceIdentifier userDevice) {
     if (userDevice.isLegacy()) {
-      ActiveCallManager.sendAudioManagerCommand(context, new AudioManagerCommand.SetUserDevice(recipientId, userDevice.getDesiredAudioDeviceLegacy().ordinal(), false));
+      WebRtcCallService.sendAudioManagerCommand(context, new AudioManagerCommand.SetUserDevice(recipientId, userDevice.getDesiredAudioDeviceLegacy().ordinal(), false));
     } else {
-      ActiveCallManager.sendAudioManagerCommand(context, new AudioManagerCommand.SetUserDevice(recipientId, userDevice.getDesiredAudioDevice31(), true));
+      WebRtcCallService.sendAudioManagerCommand(context, new AudioManagerCommand.SetUserDevice(recipientId, userDevice.getDesiredAudioDevice31(), true));
     }
   }
 
   public void setDefaultAudioDevice(@NonNull RecipientId recipientId, @NonNull SignalAudioManager.AudioDevice userDevice, boolean clearUserEarpieceSelection) {
-    ActiveCallManager.sendAudioManagerCommand(context, new AudioManagerCommand.SetDefaultDevice(recipientId, userDevice, clearUserEarpieceSelection));
+    WebRtcCallService.sendAudioManagerCommand(context, new AudioManagerCommand.SetDefaultDevice(recipientId, userDevice, clearUserEarpieceSelection));
   }
 
   public void playStateChangeUp() {
-    ActiveCallManager.sendAudioManagerCommand(context, new AudioManagerCommand.PlayStateChangeUp());
+    WebRtcCallService.sendAudioManagerCommand(context, new AudioManagerCommand.PlayStateChangeUp());
   }
 
   void peekGroupCallForRingingCheck(@NonNull GroupCallRingCheckInfo groupCallRingCheckInfo) {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/service/webrtc/state/CallInfoState.kt b/app/src/main/java/org/thoughtcrime/securesms/service/webrtc/state/CallInfoState.kt
index 81a8be220e..511aa45993 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/service/webrtc/state/CallInfoState.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/service/webrtc/state/CallInfoState.kt
@@ -22,7 +22,6 @@ data class CallInfoState(
   var callRecipient: Recipient = Recipient.UNKNOWN,
   var callConnectedTime: Long = -1,
   @get:JvmName("getRemoteCallParticipantsMap") var remoteParticipants: MutableMap<CallParticipantId, CallParticipant> = mutableMapOf(),
-  var localParticipant: CallParticipant? = null,
   var peerMap: MutableMap<Int, RemotePeer> = mutableMapOf(),
   var activePeer: RemotePeer? = null,
   var groupCall: GroupCall? = null,
diff --git a/app/src/main/java/org/thoughtcrime/securesms/service/webrtc/state/LocalDeviceState.kt b/app/src/main/java/org/thoughtcrime/securesms/service/webrtc/state/LocalDeviceState.kt
index 05300c71f6..82422bd3e2 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/service/webrtc/state/LocalDeviceState.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/service/webrtc/state/LocalDeviceState.kt
@@ -1,6 +1,7 @@
 package org.thoughtcrime.securesms.service.webrtc.state
 
 import org.thoughtcrime.securesms.components.sensors.Orientation
+import org.thoughtcrime.securesms.events.CallParticipant
 import org.thoughtcrime.securesms.ringrtc.CameraState
 import org.thoughtcrime.securesms.webrtc.audio.SignalAudioManager
 import org.webrtc.PeerConnection
@@ -8,7 +9,7 @@ import org.webrtc.PeerConnection
 /**
  * Local device specific state.
  */
-data class LocalDeviceState constructor(
+data class LocalDeviceState(
   var cameraState: CameraState = CameraState.UNKNOWN,
   var isMicrophoneEnabled: Boolean = true,
   var orientation: Orientation = Orientation.PORTRAIT_BOTTOM_EDGE,
@@ -17,7 +18,8 @@ data class LocalDeviceState constructor(
   var activeDevice: SignalAudioManager.AudioDevice = SignalAudioManager.AudioDevice.NONE,
   var availableDevices: Set<SignalAudioManager.AudioDevice> = emptySet(),
   var bluetoothPermissionDenied: Boolean = false,
-  var networkConnectionType: PeerConnection.AdapterType = PeerConnection.AdapterType.UNKNOWN
+  var networkConnectionType: PeerConnection.AdapterType = PeerConnection.AdapterType.UNKNOWN,
+  var handRaisedTimestamp: Long = CallParticipant.HAND_LOWERED
 ) {
 
   fun duplicate(): LocalDeviceState {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/service/webrtc/state/WebRtcServiceStateBuilder.java b/app/src/main/java/org/thoughtcrime/securesms/service/webrtc/state/WebRtcServiceStateBuilder.java
index 714e6c05b6..773c21fed6 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/service/webrtc/state/WebRtcServiceStateBuilder.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/service/webrtc/state/WebRtcServiceStateBuilder.java
@@ -137,6 +137,11 @@ public LocalDeviceStateBuilder() {
       toBuild.setNetworkConnectionType(type);
       return this;
     }
+
+    public @NonNull LocalDeviceStateBuilder setHandRaisedTimestamp(long handRaisedTimestamp) {
+      toBuild.setHandRaisedTimestamp(handRaisedTimestamp);
+      return this;
+    }
   }
 
   public class CallSetupStateBuilder {
@@ -364,10 +369,5 @@ public CallInfoStateBuilder() {
       toBuild.setCallLinkDisconnectReason(callLinkDisconnectReason);
       return this;
     }
-
-    public @NonNull CallInfoStateBuilder setLocalParticipant(@NonNull CallParticipant callParticipant) {
-      toBuild.setLocalParticipant(callParticipant);
-      return this;
-    }
   }
 }
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 19277acc22..f82b2ce45e 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/stories/Stories.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/stories/Stories.kt
@@ -141,7 +141,7 @@ object Stories {
 
     if (record.hasLinkPreview() && record.linkPreviews[0].attachmentId != null) {
       ApplicationDependencies.getJobManager().add(
-        AttachmentDownloadJob(record.id, record.linkPreviews[0].attachmentId, true)
+        AttachmentDownloadJob(record.id, record.linkPreviews[0].attachmentId!!, true)
       )
     }
   }
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 aa92ca3dc7..b74bedfe31 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
@@ -498,7 +498,7 @@ class StoryViewerPageFragment :
     childFragmentManager.setFragmentResultListener(StoryDirectReplyDialogFragment.REQUEST_EMOJI, viewLifecycleOwner) { _, bundle ->
       val emoji = bundle.getString(StoryDirectReplyDialogFragment.REQUEST_EMOJI)
       if (emoji != null) {
-        reactionAnimationView.playForEmoji(emoji)
+        reactionAnimationView.playForEmoji(listOf(emoji))
         viewModel.setIsDisplayingReactionAnimation(true)
       }
     }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/stories/viewer/reply/group/StoryGroupReplyBottomSheetDialogFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/stories/viewer/reply/group/StoryGroupReplyBottomSheetDialogFragment.kt
index e5734e3cd3..c00dc10bed 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/stories/viewer/reply/group/StoryGroupReplyBottomSheetDialogFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/stories/viewer/reply/group/StoryGroupReplyBottomSheetDialogFragment.kt
@@ -122,7 +122,7 @@ class StoryGroupReplyBottomSheetDialogFragment : FixedRoundedCornerBottomSheetDi
   }
 
   override fun onReactionEmojiSelected(emoji: String) {
-    reactionView.playForEmoji(emoji)
+    reactionView.playForEmoji(listOf(emoji))
   }
 
   companion object {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/stories/viewer/reply/reaction/MultiReactionBurstLayout.kt b/app/src/main/java/org/thoughtcrime/securesms/stories/viewer/reply/reaction/MultiReactionBurstLayout.kt
index 2b366eafc9..5318d312b5 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/stories/viewer/reply/reaction/MultiReactionBurstLayout.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/stories/viewer/reply/reaction/MultiReactionBurstLayout.kt
@@ -47,13 +47,13 @@ class MultiReactionBurstLayout @JvmOverloads constructor(
       .filter { it.value.groupBy { event -> event.sender }.size >= REACTION_COUNT_THRESHOLD }
       .values
       .map { it.sortedBy { event -> event.timestamp } }
-      .map { it[REACTION_COUNT_THRESHOLD - 1] }
-      .sortedBy { it.timestamp }
+      .sortedBy { it.last().timestamp }
       .take(MAX_SIMULTANEOUS_REACTIONS - cooldownTimes.filter { it.value > System.currentTimeMillis() }.size)
       .forEach {
         val reactionView = getNextReactionView()
-        reactionView.playForEmoji(it.reaction)
-        cooldownTimes[EmojiUtil.getCanonicalRepresentation(it.reaction)] = it.timestamp + cooldownDuration.inWholeMilliseconds
+        reactionView.playForEmoji(it.map { event -> event.reaction })
+        val lastEvent = it.last()
+        cooldownTimes[EmojiUtil.getCanonicalRepresentation(lastEvent.reaction)] = lastEvent.timestamp + cooldownDuration.inWholeMilliseconds
       }
   }
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/stories/viewer/reply/reaction/OnReactionSentView.kt b/app/src/main/java/org/thoughtcrime/securesms/stories/viewer/reply/reaction/OnReactionSentView.kt
index 074b8362c4..a79f29f05b 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/stories/viewer/reply/reaction/OnReactionSentView.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/stories/viewer/reply/reaction/OnReactionSentView.kt
@@ -32,7 +32,7 @@ class OnReactionSentView @JvmOverloads constructor(
     })
   }
 
-  fun playForEmoji(emoji: CharSequence) {
+  fun playForEmoji(emojis: List<CharSequence>) {
     motionLayout.progress = 0f
 
     listOf(
@@ -47,8 +47,9 @@ class OnReactionSentView @JvmOverloads constructor(
       R.id.emoji_9,
       R.id.emoji_10,
       R.id.emoji_11
-    ).forEach {
-      findViewById<EmojiImageView>(it).setImageEmoji(emoji)
+    ).forEachIndexed { index, it ->
+      val emojiIndex = index % emojis.size
+      findViewById<EmojiImageView>(it).setImageEmoji(emojis[emojiIndex])
     }
 
     motionLayout.requestLayout()
diff --git a/app/src/main/java/org/thoughtcrime/securesms/stories/viewer/reply/tabs/StoryViewsAndRepliesDialogFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/stories/viewer/reply/tabs/StoryViewsAndRepliesDialogFragment.kt
index e536683c5e..88d520c1d8 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/stories/viewer/reply/tabs/StoryViewsAndRepliesDialogFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/stories/viewer/reply/tabs/StoryViewsAndRepliesDialogFragment.kt
@@ -159,7 +159,7 @@ class StoryViewsAndRepliesDialogFragment : FixedRoundedCornerBottomSheetDialogFr
   }
 
   override fun onReactionEmojiSelected(emoji: String) {
-    reactionView.playForEmoji(emoji)
+    reactionView.playForEmoji(listOf(emoji))
   }
 
   private inner class PageChangeCallback : ViewPager2.OnPageChangeCallback() {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/stories/viewer/views/StoryViewsFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/stories/viewer/views/StoryViewsFragment.kt
index f04c6bd4d4..5fcdbca46f 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/stories/viewer/views/StoryViewsFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/stories/viewer/views/StoryViewsFragment.kt
@@ -75,7 +75,7 @@ class StoryViewsFragment :
 
   private fun getConfiguration(state: StoryViewsState): DSLConfiguration {
     return configure {
-      state.views.forEach { storyViewItemData ->
+      state.views.sortedBy { it.recipient.getDisplayName(requireContext()) }.forEach { storyViewItemData ->
         customPref(
           StoryViewItem.Model(
             storyViewItemData = storyViewItemData,
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 ea075cd9ae..f0e3a10b44 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/util/CommunicationActions.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/util/CommunicationActions.java
@@ -19,6 +19,7 @@
 import androidx.core.app.TaskStackBuilder;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentActivity;
+import androidx.fragment.app.FragmentManager;
 
 import com.google.android.material.dialog.MaterialAlertDialogBuilder;
 
@@ -26,8 +27,6 @@
 import org.signal.core.util.concurrent.SignalExecutors;
 import org.signal.core.util.concurrent.SimpleTask;
 import org.signal.core.util.logging.Log;
-import org.signal.libsignal.usernames.BaseUsernameException;
-import org.signal.libsignal.usernames.Username;
 import org.signal.ringrtc.CallLinkRootKey;
 import org.thoughtcrime.securesms.R;
 import org.thoughtcrime.securesms.WebRtcCallActivity;
@@ -44,15 +43,12 @@
 import org.thoughtcrime.securesms.groups.v2.GroupInviteLinkUrl;
 import org.thoughtcrime.securesms.permissions.Permissions;
 import org.thoughtcrime.securesms.profiles.manage.UsernameRepository;
-import org.thoughtcrime.securesms.profiles.manage.UsernameRepository.UsernameAciFetchResult;
 import org.thoughtcrime.securesms.profiles.manage.UsernameRepository.UsernameLinkConversionResult;
 import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.service.webrtc.links.CallLinkRoomId;
 import org.thoughtcrime.securesms.sms.MessageSender;
 import org.thoughtcrime.securesms.util.views.SimpleProgressDialog;
-import org.whispersystems.signalservice.api.push.ServiceId;
 import org.whispersystems.signalservice.api.push.UsernameLinkComponents;
-import org.whispersystems.signalservice.internal.storage.protos.AccountRecord;
 
 import java.io.IOException;
 import java.util.Objects;
@@ -73,7 +69,7 @@ public static void startVoiceCall(@NonNull Fragment fragment, @NonNull Recipient
   /**
    * Start a voice call. Assumes that permission request results will be routed to a handler on the Activity.
    */
-  public static void startVoiceCall(@NonNull Activity activity, @NonNull Recipient recipient) {
+  public static void startVoiceCall(@NonNull FragmentActivity activity, @NonNull Recipient recipient) {
     startVoiceCall(new ActivityCallContext(activity), recipient);
   }
 
@@ -117,7 +113,7 @@ public static void startVideoCall(@NonNull Fragment fragment, @NonNull Recipient
   /**
    * Start a video call. Assumes that permission request results will be routed to a handler on the Activity.
    */
-  public static void startVideoCall(@NonNull Activity activity, @NonNull Recipient recipient) {
+  public static void startVideoCall(@NonNull FragmentActivity activity, @NonNull Recipient recipient) {
     startVideoCall(new ActivityCallContext(activity), recipient, false);
   }
 
@@ -171,7 +167,7 @@ protected void onPostExecute(@NonNull Long threadId) {
     }.execute();
   }
 
-  public static void startInsecureCall(@NonNull Activity activity, @NonNull Recipient recipient) {
+  public static void startInsecureCall(@NonNull FragmentActivity activity, @NonNull Recipient recipient) {
     startInsecureCall(new ActivityCallContext(activity), recipient);
   }
 
@@ -376,9 +372,9 @@ private static void startAudioCallInternal(@NonNull CallContext callContext, @No
     callContext.getPermissionsBuilder()
                .request(Manifest.permission.RECORD_AUDIO)
                .ifNecessary()
-               .withRationaleDialog(callContext.getContext().getString(R.string.ConversationActivity__to_call_s_signal_needs_access_to_your_microphone, recipient.getDisplayName(callContext.getContext())),
-                   R.drawable.ic_mic_solid_24)
-               .withPermanentDenialDialog(callContext.getContext().getString(R.string.ConversationActivity__to_call_s_signal_needs_access_to_your_microphone, recipient.getDisplayName(callContext.getContext())))
+               .withRationaleDialog(callContext.getContext().getString(R.string.ConversationActivity_allow_access_microphone), callContext.getContext().getString(R.string.ConversationActivity__to_call_signal_needs_access_to_your_microphone), R.drawable.symbol_phone_24)
+               .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);
 
@@ -480,12 +476,13 @@ private interface CallContext {
     @NonNull Permissions.PermissionsBuilder getPermissionsBuilder();
     void startActivity(@NonNull Intent intent);
     @NonNull Context getContext();
+    @NonNull FragmentManager getFragmentManager();
   }
 
   private static class ActivityCallContext implements CallContext {
-    private final Activity activity;
+    private final FragmentActivity activity;
 
-    private ActivityCallContext(Activity activity) {
+    private ActivityCallContext(FragmentActivity activity) {
       this.activity = activity;
     }
 
@@ -503,6 +500,11 @@ public void startActivity(@NonNull Intent intent) {
     public @NonNull Context getContext() {
       return activity;
     }
+
+    @Override
+    public @NonNull FragmentManager getFragmentManager() {
+      return activity.getSupportFragmentManager();
+    }
   }
 
   private static class FragmentCallContext implements CallContext {
@@ -526,5 +528,10 @@ public void startActivity(@NonNull Intent intent) {
     public @NonNull Context getContext() {
       return fragment.requireContext();
     }
+
+    @Override
+    public @NonNull FragmentManager getFragmentManager() {
+      return fragment.getParentFragmentManager();
+    }
   }
 }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/FeatureFlags.java b/app/src/main/java/org/thoughtcrime/securesms/util/FeatureFlags.java
index 502b353291..b9a48543f1 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/util/FeatureFlags.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/util/FeatureFlags.java
@@ -90,9 +90,9 @@ public final class FeatureFlags {
   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";
+  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";
@@ -104,18 +104,18 @@ public final class FeatureFlags {
   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";
+  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";
+  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 CALLING_REACTIONS                 = "android.calling.reactions";
+  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";
@@ -123,10 +123,13 @@ public final class FeatureFlags {
   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";
+  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";
 
   /**
    * We will only store remote values for flags in this set. If you want a flag to be controllable
@@ -193,9 +196,9 @@ public final class FeatureFlags {
       IDEAL_DONATIONS,
       IDEAL_ENABLED_REGIONS,
       SEPA_ENABLED_REGIONS,
-      CALLING_REACTIONS,
       NOTIFICATION_THUMBNAIL_BLOCKLIST,
       CALLING_RAISE_HAND,
+      USE_ACTIVE_CALL_MANAGER,
       GIF_SEARCH,
       AUDIO_REMUXING,
       VIDEO_RECORD_1X_ZOOM,
@@ -205,11 +208,12 @@ public final class FeatureFlags {
       CDSI_LIBSIGNAL_NET,
       RX_MESSAGE_SEND,
       LINKED_DEVICE_LIFESPAN_SECONDS,
-      CAMERAX_CUSTOM_CONTROLLER
+      CAMERAX_CUSTOM_CONTROLLER,
+      LIBSIGNAL_WEB_SOCKET_ENABLED
   );
 
   @VisibleForTesting
-  static final Set<String> NOT_REMOTE_CAPABLE = SetUtil.newHashSet(MESSAGE_BACKUPS);
+  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
@@ -272,7 +276,6 @@ public final class FeatureFlags {
       PROMPT_FOR_NOTIFICATION_CONFIG,
       PROMPT_BATTERY_SAVER,
       CRASH_PROMPT_CONFIG,
-      CALLING_REACTIONS,
       NOTIFICATION_THUMBNAIL_BLOCKLIST,
       CALLING_RAISE_HAND,
       VIDEO_RECORD_1X_ZOOM,
@@ -598,13 +601,6 @@ public static boolean instantVideoPlayback() {
     return getBoolean(INSTANT_VIDEO_PLAYBACK, false);
   }
 
-  /**
-   * Whether or not group call reactions are enabled.
-   */
-  public static boolean groupCallReactions() {
-    return getBoolean(CALLING_REACTIONS, false);
-  }
-
   /**
    * Whether or not group call raise hand is enabled.
    */
@@ -617,6 +613,11 @@ 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);
@@ -658,7 +659,7 @@ public static long linkedDeviceLifespan() {
    * Note: This feature is in active development and is not intended to currently function.
    */
   public static boolean messageBackups() {
-    return getBoolean(MESSAGE_BACKUPS, false);
+    return false;
   }
 
   /** Whether or not to use the custom CameraX controller class */
@@ -666,6 +667,19 @@ 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);
+  }
+
   /** Only for rendering debug info. */
   public static synchronized @NonNull Map<String, Object> getMemoryValues() {
     return new TreeMap<>(REMOTE_VALUES);
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 8a7dd3566a..7e82026e09 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/util/ProfileUtil.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/util/ProfileUtil.java
@@ -43,6 +43,7 @@
 import org.whispersystems.signalservice.api.profiles.AvatarUploadParams;
 import org.whispersystems.signalservice.api.profiles.ProfileAndCredential;
 import org.whispersystems.signalservice.api.profiles.SignalServiceProfile;
+import org.whispersystems.signalservice.api.push.ServiceId;
 import org.whispersystems.signalservice.api.push.SignalServiceAddress;
 import org.whispersystems.signalservice.api.services.ProfileService;
 import org.whispersystems.signalservice.api.util.StreamDetails;
@@ -108,6 +109,22 @@ public static void handleSelfProfileKeyChange() {
     return new ProfileService.ProfileResponseProcessor(response.second()).getResultOrThrow();
   }
 
+  @WorkerThread
+  public static @NonNull ProfileAndCredential retrieveProfileSync(@NonNull ServiceId.PNI pni,
+                                                                  @NonNull SignalServiceProfile.RequestType requestType)
+      throws IOException
+  {
+    ProfileService               profileService     = ApplicationDependencies.getProfileService();
+
+    ServiceResponse<ProfileAndCredential> response = Single
+        .fromCallable(() -> new SignalServiceAddress(pni))
+        .flatMap(address -> profileService.getProfile(address, Optional.empty(), Optional.empty(), requestType, Locale.getDefault()))
+        .onErrorReturn(t -> ServiceResponse.forUnknownError(t))
+        .blockingGet();
+
+    return new ProfileService.ProfileResponseProcessor(response).getResultOrThrow();
+  }
+
   public static Single<Pair<Recipient, ServiceResponse<ProfileAndCredential>>> retrieveProfile(@NonNull Context context,
                                                                                                @NonNull Recipient recipient,
                                                                                                @NonNull SignalServiceProfile.RequestType requestType)
diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/livedata/LiveDataObserverCallback.kt b/app/src/main/java/org/thoughtcrime/securesms/util/livedata/LiveDataObserverCallback.kt
new file mode 100644
index 0000000000..8f6caff24b
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/util/livedata/LiveDataObserverCallback.kt
@@ -0,0 +1,31 @@
+/*
+ * Copyright 2024 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.thoughtcrime.securesms.util.livedata
+
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.Observer
+
+/**
+ * A wrapper class that can be implemented in order to create a [LiveData] [Observer] that cleans up after itself.
+ *
+ * Useful for one-shot observers that can be executed as a callback on an asynchronous call that updates a [LiveData] upon completion.
+ */
+abstract class LiveDataObserverCallback<T>(private val liveData: LiveData<T>) : Observer<T> {
+  final override fun onChanged(value: T) {
+    val shouldRemove = onValue(value)
+    if (shouldRemove) {
+      liveData.removeObserver(this)
+    }
+  }
+
+  /**
+   * The body of the observer that gets executed when the value is changed.
+   * Recommended usage is to check some condition in the [LiveData] to determine whether the data has been handled and therefore can be removed.
+   *
+   * @return should remove this observer from the [LiveData]
+   */
+  abstract fun onValue(value: T): Boolean
+}
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 261e64fa08..a5e4e872e7 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
@@ -1,11 +1,14 @@
 package org.thoughtcrime.securesms.util.views;
 
+import android.app.Activity;
 import android.content.Context;
 
 import androidx.annotation.AnyThread;
 import androidx.annotation.MainThread;
 import androidx.annotation.NonNull;
 import androidx.appcompat.app.AlertDialog;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.lifecycle.Lifecycle;
 
 import org.signal.core.util.ThreadUtil;
 import org.signal.core.util.logging.Log;
@@ -61,6 +64,11 @@ private SimpleProgressDialog() {}
     AtomicLong                   shownAt               = new AtomicLong();
 
     Runnable showRunnable = () -> {
+      if (!isContextValid(context)) {
+        Log.w(TAG, "Context is no longer valid. Not showing dialog.");
+        return;
+      }
+
       Log.i(TAG, "Taking some time. Showing a progress dialog.");
       shownAt.set(System.currentTimeMillis());
       dialogAtomicReference.set(show(context));
@@ -73,13 +81,25 @@ private SimpleProgressDialog() {}
       public void dismiss() {
         ThreadUtil.cancelRunnableOnMain(showRunnable);
         ThreadUtil.runOnMain(() -> {
+          if (!isContextValid(context)) {
+            Log.w(TAG, "Context is no longer valid. Not dismissing dialog.");
+            return;
+          }
+
           AlertDialog alertDialog = dialogAtomicReference.getAndSet(null);
           if (alertDialog != null) {
             long beenShowingForMs = System.currentTimeMillis() - shownAt.get();
             long remainingTimeMs  = minimumShowTimeMs - beenShowingForMs;
 
             if (remainingTimeMs > 0) {
-              ThreadUtil.runOnMainDelayed(alertDialog::dismiss, remainingTimeMs);
+              ThreadUtil.runOnMainDelayed(() -> {
+                if (!isContextValid(context)) {
+                  Log.w(TAG, "Context is no longer valid. Not dismissing dialog.");
+                  return;
+                }
+
+                alertDialog.dismiss();
+              }, remainingTimeMs);
             } else {
               alertDialog.dismiss();
             }
@@ -100,6 +120,18 @@ public void dismissNow() {
     };
   }
 
+  private static boolean isContextValid(@NonNull Context context) {
+    if (context instanceof AppCompatActivity) {
+      AppCompatActivity activity = (AppCompatActivity) context;
+      return !activity.isFinishing() && !activity.isDestroyed() && activity.getLifecycle().getCurrentState().isAtLeast(Lifecycle.State.STARTED);
+    } else if (context instanceof Activity) {
+      Activity activity = (Activity) context;
+      return !activity.isFinishing() && !activity.isDestroyed();
+    } else {
+      return true;
+    }
+  }
+
   public interface DismissibleDialog {
     @AnyThread
     void dismiss();
diff --git a/app/src/main/java/org/thoughtcrime/securesms/webrtc/CallNotificationBuilder.java b/app/src/main/java/org/thoughtcrime/securesms/webrtc/CallNotificationBuilder.java
index 3ed5fa2649..506f75f2ce 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/webrtc/CallNotificationBuilder.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/webrtc/CallNotificationBuilder.java
@@ -19,6 +19,7 @@
 import org.thoughtcrime.securesms.notifications.NotificationChannels;
 import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.service.webrtc.ActiveCallManager;
+import org.thoughtcrime.securesms.service.webrtc.WebRtcCallService;
 import org.thoughtcrime.securesms.util.ConversationUtil;
 
 /**
@@ -114,7 +115,7 @@ public static Notification getCallInProgressNotification(
       if (deviceVersionSupportsIncomingCallStyle()) {
         builder.setStyle(NotificationCompat.CallStyle.forIncomingCall(
             person,
-            ActiveCallManager.denyCallIntent(context),
+            WebRtcCallService.denyCallIntent(context),
             getActivityPendingIntent(context, isVideoCall ? LaunchCallScreenIntentState.VIDEO : LaunchCallScreenIntentState.AUDIO)
         ).setIsVideo(isVideoCall));
       }
@@ -122,7 +123,7 @@ public static Notification getCallInProgressNotification(
       return builder.build();
     } else if (type == TYPE_OUTGOING_RINGING) {
       builder.setContentText(context.getString(R.string.NotificationBarManager__establishing_signal_call));
-      builder.addAction(getServiceNotificationAction(context, ActiveCallManager.hangupIntent(context), R.drawable.symbol_phone_down_fill_24, R.string.NotificationBarManager__cancel_call));
+      builder.addAction(getServiceNotificationAction(context, WebRtcCallService.hangupIntent(context), R.drawable.symbol_phone_down_fill_24, R.string.NotificationBarManager__cancel_call));
       return builder.build();
     } else {
       builder.setContentText(getOngoingCallContentText(context, recipient, isVideoCall));
@@ -138,7 +139,7 @@ public static Notification getCallInProgressNotification(
       if (deviceVersionSupportsIncomingCallStyle()) {
         builder.setStyle(NotificationCompat.CallStyle.forOngoingCall(
             person,
-            ActiveCallManager.hangupIntent(context)
+            WebRtcCallService.hangupIntent(context)
         ).setIsVideo(isVideoCall));
       }
 
diff --git a/app/src/main/protowire/Backup.proto b/app/src/main/protowire/Backup.proto
index 875020948f..a258d90c37 100644
--- a/app/src/main/protowire/Backup.proto
+++ b/app/src/main/protowire/Backup.proto
@@ -121,6 +121,74 @@ message Group {
   bool hideStory = 3;
   StorySendMode storySendMode = 4;
   string name = 5;
+  GroupSnapshot snapshot = 6;
+
+  // These are simply plaintext copies of the groups proto from Groups.proto.
+  // They should be kept completely in-sync with Groups.proto.
+  // These exist to allow us to have the latest snapshot of a group during restoration without having to hit the network.
+  // We would use Groups.proto if we could, but we want a plaintext version to improve export readability.
+  // For documentation, defer to Groups.proto. The only name change is Group -> GroupSnapshot to avoid the naming conflict.
+  message GroupSnapshot {
+    bytes publicKey = 1;
+    string title = 2;
+    string description = 11;
+    string avatar = 3;
+    uint32 disappearingMessagesTimer = 4;
+    AccessControl accessControl = 5;
+    uint32 version = 6;
+    repeated Member members = 7;
+    repeated MemberPendingProfileKey membersPendingProfileKey = 8;
+    repeated MemberPendingAdminApproval membersPendingAdminApproval = 9;
+    bytes inviteLinkPassword = 10;
+    bool announcements_only = 12;
+    repeated MemberBanned members_banned = 13;
+  }
+
+  message Member {
+    enum Role {
+      UNKNOWN = 0;
+      DEFAULT = 1;
+      ADMINISTRATOR = 2;
+    }
+
+    bytes userId = 1;
+    Role role = 2;
+    bytes profileKey = 3;
+    bytes presentation = 4;
+    uint32 joinedAtVersion = 5;
+  }
+
+  message MemberPendingProfileKey {
+    Member member = 1;
+    bytes addedByUserId = 2;
+    uint64 timestamp = 3;
+  }
+
+  message MemberPendingAdminApproval {
+    bytes userId = 1;
+    bytes profileKey = 2;
+    bytes presentation = 3;
+    uint64 timestamp = 4;
+  }
+
+  message MemberBanned {
+    bytes userId = 1;
+    uint64 timestamp = 2;
+  }
+
+  message AccessControl {
+    enum AccessRequired {
+      UNKNOWN = 0;
+      ANY = 1;
+      MEMBER = 2;
+      ADMINISTRATOR = 3;
+      UNSATISFIABLE = 4;
+    }
+
+    AccessRequired attributes = 1;
+    AccessRequired members = 2;
+    AccessRequired addFromInviteLink = 3;
+  }
 }
 
 message Self {}
@@ -381,13 +449,23 @@ message MessageAttachment {
 
   FilePointer pointer = 1;
   Flag flag = 2;
+  bool wasDownloaded = 3;
 }
 
 message FilePointer {
   // References attachments in the backup (media) storage tier.
   message BackupLocator {
     string mediaName = 1;
-    uint32 cdnNumber = 2;
+    // If present, the cdn number of the succesful upload.
+    // If empty/0, may still have been uploaded, and clients
+    // can discover the cdn number via the list endpoint.
+    optional uint32 cdnNumber = 2;
+    bytes key = 3;
+    bytes digest = 4;
+    uint32 size = 5;
+    // Fallback in case backup tier upload failed.
+    optional string transitCdnKey = 6;
+    optional uint32 transitCdnNumber = 7;
   }
 
   // References attachments in the transit storage tier.
@@ -398,37 +476,33 @@ message FilePointer {
     string cdnKey = 1;
     uint32 cdnNumber = 2;
     uint64 uploadTimestamp = 3;
+    bytes key = 4;
+    bytes digest = 5;
+    uint32 size = 6;
   }
 
-  // An attachment that was copied from the transit storage tier
-  // to the backup (media) storage tier up without being downloaded.
-  // Its MediaName should be generated as “{sender_aci}_{cdn_attachment_key}”,
-  // but should eventually transition to a BackupLocator with mediaName
-  // being the content hash once it is downloaded.
-  message UndownloadedBackupLocator {
-    bytes senderAci = 1;
-    string cdnKey = 2;
-    uint32 cdnNumber = 3;
+  // References attachments that are invalid in such a way where download
+  // cannot be attempted. Could range from missing digests to missing
+  // CDN keys or anything else that makes download attempts impossible.
+  // This serves as a 'tombstone' so that the UX can show that an attachment
+  // did exist, but for whatever reason it's not retrievable.
+  message InvalidAttachmentLocator {
   }
 
   oneof locator {
     BackupLocator backupLocator = 1;
     AttachmentLocator attachmentLocator= 2;
-    UndownloadedBackupLocator undownloadedBackupLocator = 3;
+    InvalidAttachmentLocator invalidAttachmentLocator = 3;
   }
 
-  optional bytes key = 5;
-  optional string contentType = 6;
-  // Size of fullsize decrypted media blob in bytes.
-  // Can be ignored if unset/unavailable.
-  optional uint32 size = 7;
-  optional bytes incrementalMac = 8;
-  optional uint32 incrementalMacChunkSize = 9;
-  optional string fileName = 10;
-  optional uint32 width = 11;
-  optional uint32 height = 12;
-  optional string caption = 13;
-  optional string blurHash = 14;
+  optional string contentType = 4;
+  optional bytes incrementalMac = 5;
+  optional uint32 incrementalMacChunkSize = 6;
+  optional string fileName = 7;
+  optional uint32 width = 8;
+  optional uint32 height = 9;
+  optional string caption = 10;
+  optional string blurHash = 11;
 }
 
 message Quote {
@@ -516,9 +590,17 @@ message IndividualCallChatUpdate {
 }
 
 message GroupCallChatUpdate {
+  enum LocalUserJoined {
+    UNKNOWN = 0;
+    JOINED = 1;
+    DID_NOT_JOIN = 2;
+  }
+
   optional bytes startedCallAci = 1;
   uint64 startedCallTimestamp = 2;
   repeated bytes inCallAcis = 3;
+  uint64 endedCallTimestamp = 4; // 0 indicates we do not know
+  LocalUserJoined localUserJoined = 5;
 }
 
 message SimpleChatUpdate {
diff --git a/app/src/main/protowire/Database.proto b/app/src/main/protowire/Database.proto
index f5ffc95987..c5800aeb4f 100644
--- a/app/src/main/protowire/Database.proto
+++ b/app/src/main/protowire/Database.proto
@@ -116,11 +116,14 @@ message CryptoValue {
 }
 
 message GroupCallUpdateDetails {
-             string eraId                = 1;
-             string startedCallUuid      = 2;
-             int64  startedCallTimestamp = 3;
-    repeated string inCallUuids          = 4;
-             bool   isCallFull           = 5;
+             string eraId                  = 1;
+             string startedCallUuid        = 2;
+             int64  startedCallTimestamp   = 3;
+    repeated string inCallUuids            = 4;
+             bool   isCallFull             = 5;
+             bool   localUserJoined        = 6;
+             int64  endedCallTimestamp     = 7;
+             bool   isRingingOnLocalDevice = 8;
 }
 
 message ExpiringProfileKeyCredentialColumnData {
diff --git a/app/src/main/protowire/JobData.proto b/app/src/main/protowire/JobData.proto
index 7e2f51847d..29964bc2dc 100644
--- a/app/src/main/protowire/JobData.proto
+++ b/app/src/main/protowire/JobData.proto
@@ -46,4 +46,13 @@ message AttachmentUploadJobData {
 
 message PreKeysSyncJobData {
   bool forceRefreshRequested = 1;
+}
+
+message ArchiveAttachmentJobData {
+  uint64 attachmentId = 1;
+}
+
+message ArchiveAttachmentBackfillJobData {
+  optional uint64 attachmentId = 1;
+  ResumableUpload uploadSpec = 2;
 }
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_radio_button_checked.xml b/app/src/main/res/drawable/ic_radio_button_checked.xml
new file mode 100644
index 0000000000..7465d286ca
--- /dev/null
+++ b/app/src/main/res/drawable/ic_radio_button_checked.xml
@@ -0,0 +1,7 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:viewportHeight="25" android:viewportWidth="24" android:width="23.04dp">
+      
+    <path android:fillColor="#00000000" android:pathData="M12,12.801m-9,0a9,9 0,1 1,18 0a9,9 0,1 1,-18 0" android:strokeColor="#2C58C3" android:strokeWidth="2"/>
+      
+    <path android:fillColor="#2C58C3" android:pathData="M12,12.801m-4,0a4,4 0,1 1,8 0a4,4 0,1 1,-8 0" android:strokeColor="#2C58C3" android:strokeWidth="2"/>
+    
+</vector>
diff --git a/app/src/main/res/layout/activity_registration_navigation_v2.xml b/app/src/main/res/layout/activity_registration_navigation_v2.xml
new file mode 100644
index 0000000000..37a71416cd
--- /dev/null
+++ b/app/src/main/res/layout/activity_registration_navigation_v2.xml
@@ -0,0 +1,22 @@
+<?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.v2.ui.RegistrationV2Activity">
+
+    <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_v2" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_restore.xml b/app/src/main/res/layout/activity_restore.xml
new file mode 100644
index 0000000000..09b7fa8162
--- /dev/null
+++ b/app/src/main/res/layout/activity_restore.xml
@@ -0,0 +1,25 @@
+<?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"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context=".restore.RestoreActivity">
+
+    <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/restore" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/call_overflow_holder.xml b/app/src/main/res/layout/call_overflow_holder.xml
index e916da1e85..71d26510d5 100644
--- a/app/src/main/res/layout/call_overflow_holder.xml
+++ b/app/src/main/res/layout/call_overflow_holder.xml
@@ -7,15 +7,15 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:orientation="vertical">
+    android:orientation="vertical"
+    android:gravity="bottom">
 
     <org.thoughtcrime.securesms.components.webrtc.CallReactionScrubber
         android:id="@+id/reaction_scrubber"
         android:layout_width="match_parent"
         android:layout_height="@dimen/calling_reaction_emoji_height"
         android:background="@drawable/conversation_reaction_overlay_background"
-        android:elevation="4dp"
-        android:visibility="gone" />
+        android:elevation="4dp"/>
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/raise_hand_layout_parent"
diff --git a/app/src/main/res/layout/conversation_item_double_tap_edit_education_sheet.xml b/app/src/main/res/layout/conversation_item_double_tap_edit_education_sheet.xml
new file mode 100644
index 0000000000..5ee2d608be
--- /dev/null
+++ b/app/src/main/res/layout/conversation_item_double_tap_edit_education_sheet.xml
@@ -0,0 +1,74 @@
+<?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"
+    tools:viewBindingIgnore="true">
+
+    <ImageView
+        android:id="@+id/handle"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_horizontal"
+        android:layout_marginTop="10dp"
+        android:importantForAccessibility="no"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:srcCompat="@drawable/bottom_sheet_handle" />
+
+    <ImageView
+        android:id="@+id/image"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="24dp"
+        android:importantForAccessibility="no"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/handle"
+        app:tint="@color/signal_icon_tint_primary"
+        app:srcCompat="@drawable/ic_tap_outline_24" />
+
+    <TextView
+        android:id="@+id/title"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="16dp"
+        android:layout_marginBottom="24dp"
+        android:text="@string/DoubleTapEditEducationSheet__double_tap_edit_title"
+        android:textAppearance="@style/Signal.Text.TitleLarge"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/image" />
+
+    <TextView
+        android:id="@+id/double_tap_details"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="24dp"
+        android:layout_marginHorizontal="30dp"
+        android:gravity="center"
+        android:text="@string/DoubleTapEditEducationSheet__quickly_tap_twice"
+        android:textAppearance="@style/Signal.Text.BodyLarge"
+        android:textColor="@color/signal_colorSecondary"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/title" />
+
+    <com.google.android.material.button.MaterialButton
+        android:id="@+id/got_it"
+        style="@style/Signal.Widget.Button.Medium.Primary"
+        android:backgroundTint="@color/signal_colorPrimaryContainer"
+        android:textColor="@color/signal_colorOnPrimaryContainer"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="36dp"
+        android:layout_marginEnd="24dp"
+        android:layout_marginBottom="16dp"
+        android:text="@string/DoubleTapEditEducationSheet__got_it"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/double_tap_details" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/fragment_choose_backup_v2.xml b/app/src/main/res/layout/fragment_choose_backup_v2.xml
new file mode 100644
index 0000000000..123d54be0d
--- /dev/null
+++ b/app/src/main/res/layout/fragment_choose_backup_v2.xml
@@ -0,0 +1,77 @@
+<?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">
+
+    <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_v2.xml b/app/src/main/res/layout/fragment_registration_enter_code_v2.xml
new file mode 100644
index 0000000000..3d30f729dd
--- /dev/null
+++ b/app/src/main/res/layout/fragment_registration_enter_code_v2.xml
@@ -0,0 +1,141 @@
+<?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_v2.xml b/app/src/main/res/layout/fragment_registration_enter_phone_number_v2.xml
new file mode 100644
index 0000000000..fea95edc37
--- /dev/null
+++ b/app/src/main/res/layout/fragment_registration_enter_phone_number_v2.xml
@@ -0,0 +1,133 @@
+<?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_pin_restore_entry_v2.xml b/app/src/main/res/layout/fragment_registration_pin_restore_entry_v2.xml
new file mode 100644
index 0000000000..9f947c0d81
--- /dev/null
+++ b/app/src/main/res/layout/fragment_registration_pin_restore_entry_v2.xml
@@ -0,0 +1,135 @@
+<?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">
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <TextView
+            android:id="@+id/pin_restore_pin_title"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="24dp"
+            android:layout_marginTop="32dp"
+            android:layout_marginEnd="24dp"
+            android:text="@string/RegistrationLockFragment__enter_your_pin"
+            android:textAppearance="@style/Signal.Text.HeadlineMedium"
+            app:layout_constraintBottom_toTopOf="@id/pin_restore_pin_description"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintVertical_bias="0.0" />
+
+        <TextView
+            android:id="@+id/pin_restore_pin_description"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="24dp"
+            android:layout_marginTop="12dp"
+            android:layout_marginEnd="24dp"
+            android:minHeight="66dp"
+            android:text="@string/RegistrationLockFragment__enter_the_pin_you_created"
+            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/pin_restore_pin_title" />
+
+
+        <com.google.android.material.textfield.TextInputLayout
+            android:id="@+id/edit_kbs_textinputlayout"
+            style="@style/Widget.Signal.TextInputLayout"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="24dp"
+            android:layout_marginTop="16dp"
+            android:layout_marginEnd="24dp"
+            android:minWidth="210dp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/pin_restore_pin_description"
+            app:materialThemeOverlay="@style/Signal.ThemeOverlay.TextInputLayout">
+
+            <com.google.android.material.textfield.TextInputEditText
+                android:id="@+id/pin_restore_pin_input"
+                style="@style/Widget.MaterialComponents.TextInputEditText.FilledBox"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="center_horizontal"
+                android:imeOptions="actionDone"
+                android:inputType="numberPassword"
+                tools:text="1234567890" />
+        </com.google.android.material.textfield.TextInputLayout>
+
+        <TextView
+            android:id="@+id/pin_restore_pin_input_label"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="8dp"
+            android:gravity="center_horizontal"
+            android:textAppearance="@style/Signal.Text.BodyMedium"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/edit_kbs_textinputlayout"
+            tools:text="@string/RegistrationLockFragment__incorrect_pin_try_again" />
+
+        <com.google.android.material.button.MaterialButton
+            android:id="@+id/pin_restore_forgot_pin"
+            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:text="@string/PinRestoreEntryFragment_need_help"
+            android:visibility="gone"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/pin_restore_pin_input_label"
+            tools:visibility="visible" />
+
+        <com.google.android.material.button.MaterialButton
+            android:id="@+id/pin_restore_keyboard_toggle"
+            style="@style/Signal.Widget.Button.Large.Secondary"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/RegistrationLockFragment__switch_keyboard"
+            app:icon="@drawable/ic_keyboard_24"
+            app:iconGravity="textStart"
+            app:iconPadding="8dp"
+            app:layout_constraintTop_toBottomOf="@id/pin_restore_forgot_pin"
+            app:layout_constraintVertical_bias="0.0"
+            tools:layout_editor_absoluteX="32dp" />
+
+        <org.thoughtcrime.securesms.util.views.CircularProgressMaterialButton
+            android:id="@+id/pin_restore_pin_continue"
+            style="@style/Signal.Widget.Button.Large.Tonal"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="32dp"
+            android:layout_marginEnd="32dp"
+            android:layout_marginBottom="16dp"
+            app:circularProgressMaterialButton__label="@string/RegistrationActivity_continue"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="1.0"
+            app:layout_constraintStart_toStartOf="parent"
+            app:materialThemeOverlay="@style/ThemeOverlay.Signal.CircularProgressIndicator.Tonal" />
+
+        <com.google.android.material.button.MaterialButton
+            android:id="@+id/pin_restore_skip_button"
+            style="@style/Signal.Widget.Button.Large.Secondary"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/PinRestoreEntryFragment_skip"
+            android:textColor="@color/signal_colorOnSurfaceVariant"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            tools:visibility="visible" />
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</ScrollView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_registration_welcome_v2.xml b/app/src/main/res/layout/fragment_registration_welcome_v2.xml
new file mode 100644
index 0000000000..5f5a350be4
--- /dev/null
+++ b/app/src/main/res/layout/fragment_registration_welcome_v2.xml
@@ -0,0 +1,71 @@
+<?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_v2.xml
new file mode 100644
index 0000000000..e0f7121202
--- /dev/null
+++ b/app/src/main/res/layout/fragment_restore_local_backup_v2.xml
@@ -0,0 +1,107 @@
+<?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"
+    tools:context=".registration.fragments.RestoreBackupFragment">
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="0dp">
+
+        <com.google.android.material.button.MaterialButton
+            android:id="@+id/cancel_local_restore_button"
+            style="@style/Signal.Widget.Button.Large.Secondary"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_horizontal"
+            android:layout_marginTop="16dp"
+            android:paddingStart="30dp"
+            android:paddingTop="10dp"
+            android:paddingEnd="30dp"
+            android:paddingBottom="10dp"
+            android:text="@string/RegistrationActivity_cancel"
+            android:textColor="@color/signal_text_secondary"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0.5"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/restore_button" />
+
+        <TextView
+            android:id="@+id/verify_subheader"
+            style="@style/Signal.Text.Body.Registration"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="32dp"
+            android:layout_marginTop="16dp"
+            android:layout_marginEnd="32dp"
+            android:gravity="center"
+            android:text="@string/RegistrationActivity_restore_your_messages_and_media_from_a_local_backup"
+            app:layout_constraintTop_toBottomOf="@+id/verify_header"
+            tools:layout_editor_absoluteX="0dp" />
+
+        <TextView
+            android:id="@+id/backup_created_text"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="32dp"
+            app:layout_constraintStart_toStartOf="@+id/verify_subheader"
+            app:layout_constraintTop_toBottomOf="@+id/verify_subheader"
+            tools:text="Backup created: 1 min ago" />
+
+        <TextView
+            android:id="@+id/backup_size_text"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="16dp"
+            app:layout_constraintStart_toStartOf="@+id/backup_created_text"
+            app:layout_constraintTop_toBottomOf="@+id/backup_created_text"
+            tools:text="Backup size: 899 KB" />
+
+        <TextView
+            android:id="@+id/backup_progress_text"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_horizontal"
+            android:layout_marginTop="16dp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0.5"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/backup_size_text"
+            tools:text="100 messages so far..." />
+
+        <TextView
+            android:id="@+id/verify_header"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:layout_marginStart="32dp"
+            android:layout_marginTop="40dp"
+            android:layout_marginEnd="32dp"
+            android:gravity="center"
+            android:text="@string/RegistrationActivity_restore_from_backup"
+            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_toTopOf="parent" />
+
+        <org.thoughtcrime.securesms.util.views.CircularProgressMaterialButton
+            android:id="@+id/restore_button"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_horizontal"
+            android:layout_marginStart="16dp"
+            android:layout_marginTop="16dp"
+            android:layout_marginEnd="16dp"
+            app:circularProgressMaterialButton__label="@string/registration_activity__restore_backup"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0.5"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/backup_progress_text" />
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+</ScrollView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_transfer_restore_v2.xml b/app/src/main/res/layout/fragment_transfer_restore_v2.xml
new file mode 100644
index 0000000000..883b564737
--- /dev/null
+++ b/app/src/main/res/layout/fragment_transfer_restore_v2.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/permission_allow_dialog.xml b/app/src/main/res/layout/permission_allow_dialog.xml
new file mode 100644
index 0000000000..980ee79484
--- /dev/null
+++ b/app/src/main/res/layout/permission_allow_dialog.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical"
+    android:paddingTop="20dp"
+    android:paddingHorizontal="20dp"
+    tools:viewBindingIgnore="true">
+
+    <LinearLayout
+        android:id="@+id/permission_header_container"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:gravity="center"
+        android:layout_gravity="center"
+        android:orientation="horizontal"
+        android:layout_marginBottom="10dp">
+
+    </LinearLayout>
+
+    <TextView
+        android:id="@+id/permission_title"
+        style="@style/Signal.Text.Title"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center"
+        tools:text="@string/AttachmentManager_signal_allow_access_location" />
+
+    <TextView
+        android:id="@+id/permission_details"
+        style="@style/Signal.Text.BodySmall"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="15dp"
+        tools:text="@string/AttachmentManager_signal_allow_signal_access_location" />
+
+</LinearLayout>
diff --git a/app/src/main/res/layout/webrtc_call_controls.xml b/app/src/main/res/layout/webrtc_call_controls.xml
index 76ccefabd2..1b62cad7e9 100644
--- a/app/src/main/res/layout/webrtc_call_controls.xml
+++ b/app/src/main/res/layout/webrtc_call_controls.xml
@@ -56,12 +56,28 @@
                 android:scaleType="fitXY"
                 android:visibility="gone"
                 app:layout_constraintBottom_toTopOf="@id/call_screen_start_call_controls"
-                app:layout_constraintEnd_toStartOf="@id/call_screen_video_toggle"
+                app:layout_constraintEnd_toStartOf="@id/call_screen_camera_direction_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"
@@ -74,7 +90,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_speaker_toggle"
+                app:layout_constraintStart_toEndOf="@id/call_screen_camera_direction_toggle"
                 tools:checked="true" />
 
             <org.thoughtcrime.securesms.components.AccessibleToggleButton
diff --git a/app/src/main/res/navigation/app_settings.xml b/app/src/main/res/navigation/app_settings.xml
index d95329ebe7..4efae3e847 100644
--- a/app/src/main/res/navigation/app_settings.xml
+++ b/app/src/main/res/navigation/app_settings.xml
@@ -293,6 +293,13 @@
             app:exitAnim="@anim/fragment_open_exit"
             app:popEnterAnim="@anim/fragment_close_enter"
             app:popExitAnim="@anim/fragment_close_exit" />
+        <action
+            android:id="@+id/action_chatsSettingsFragment_to_remoteBackupsSettingsFragment"
+            app:destination="@id/remoteBackupsSettingsFragment"
+            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
@@ -783,6 +790,23 @@
             app:argType="org.thoughtcrime.securesms.profiles.manage.UsernameEditMode" />
     </fragment>
 
+    <fragment
+        android:id="@+id/remoteBackupsSettingsFragment"
+        android:name="org.thoughtcrime.securesms.components.settings.app.chats.backups.RemoteBackupsSettingsFragment">
+
+        <action
+            android:id="@+id/action_remoteBackupsSettingsFragment_to_backupsTypeSettingsFragment"
+            app:destination="@id/backupsTypeSettingsFragment"
+            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/backupsTypeSettingsFragment"
+        android:name="org.thoughtcrime.securesms.components.settings.app.chats.backups.type.BackupsTypeSettingsFragment" />
+
     <include app:graph="@navigation/username_link_settings" />
     <include app:graph="@navigation/story_privacy_settings" />
 
diff --git a/app/src/main/res/navigation/registration_v2.xml b/app/src/main/res/navigation/registration_v2.xml
new file mode 100644
index 0000000000..0548fe4e7f
--- /dev/null
+++ b/app/src/main/res/navigation/registration_v2.xml
@@ -0,0 +1,453 @@
+<?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/chooseBackupV2Fragment"
+        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/restoreBackupV2Fragment"
+            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/chooseBackupV2Fragment"
+            app:popUpToInclusive="true" />
+
+        <action
+            android:id="@+id/action_skip"
+            app:destination="@id/enterPhoneNumberV2Fragment"
+            app:enterAnim="@anim/slide_from_end"
+            app:exitAnim="@anim/slide_to_start"
+            app:popEnterAnim="@anim/slide_from_start"
+            app:popExitAnim="@anim/slide_to_end" />
+
+    </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.fragments.CaptchaFragment"
+        android:label="fragment_captcha"
+        tools:layout="@layout/fragment_registration_captcha" />
+
+    <fragment
+        android:id="@+id/restoreBackupV2Fragment"
+        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/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/restoreBackupV2Fragment"
+            app:popUpToInclusive="true" />
+
+        <action
+            android:id="@+id/action_skip"
+            app:destination="@id/enterPhoneNumberV2Fragment"
+            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/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/restoreBackupV2Fragment"
+            app:popUpToInclusive="true" />
+
+        <action
+            android:id="@+id/action_skip_no_return"
+            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/restoreBackupV2Fragment"
+            app:popUpToInclusive="true" />
+
+        <argument
+            android:name="uri"
+            android:defaultValue="@null"
+            app:argType="android.net.Uri"
+            app:nullable="true" />
+
+    </fragment>
+
+    <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" />
+
+    <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/chooseBackupV2Fragment"
+            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/restoreFromBackupV2Fragment"
+        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/welcomeV2Fragment" />
+
+    </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_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" />
+
+    </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
new file mode 100644
index 0000000000..1446b50e78
--- /dev/null
+++ b/app/src/main/res/navigation/restore.xml
@@ -0,0 +1,41 @@
+<?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/restore"
+    app:startDestination="@id/transfer_or_restore_v2_fragment">
+
+    <fragment
+        android:id="@+id/transfer_or_restore_v2_fragment"
+        android:name="org.thoughtcrime.securesms.restore.transferorrestore.TransferOrRestoreV2Fragment"
+        android:label="transfer_or_restore"
+        tools:layout="@layout/fragment_transfer_restore_v2">
+
+        <action
+            android:id="@+id/action_transfer_or_restore_to_restore"
+            app:destination="@id/choose_local_backup_fragment" />
+    </fragment>
+
+    <fragment
+        android:id="@+id/choose_local_backup_fragment"
+        android:name="org.thoughtcrime.securesms.restore.choosebackup.ChooseBackupV2Fragment"
+        android:label="choose_local_backup"
+        tools:layout="@layout/fragment_choose_backup_v2">
+
+        <action
+            android:id="@+id/action_choose_local_backup_fragment_to_restore_local_backup_fragment"
+            app:destination="@id/restore_local_backup_fragment" />
+    </fragment>
+
+    <fragment
+        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">
+
+    </fragment>
+</navigation>
\ 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 94db9b9080..c67f5d1bae 100644
--- a/app/src/main/res/values-af/strings.xml
+++ b/app/src/main/res/values-af/strings.xml
@@ -1,6 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- smartling.instruction_comments_enabled = on -->
-<resources>
+<?xml version="1.0" encoding="UTF-8"?><!-- 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> -->
@@ -89,6 +87,16 @@
     <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">Allow access to your location</string>
+    <!-- Dialog description that will explain the steps needed to give location permission -->
+    <string name="AttachmentManager_signal_to_send_location">To send your location:</string>
+    <!-- Alert dialog description asking for location permission -->
+    <string name="AttachmentManager_signal_allow_signal_access_location">Allow Molly access to send your location.</string>
+    <!-- Toast text explaining Signal\'s need for location access -->
+    <string name="AttachmentManager_signal_needs_location_access">Molly needs location access to send your location.</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>
     <!-- Alert dialog description to send the recipient a request to activate payments -->
@@ -241,7 +249,7 @@
     <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>
@@ -386,8 +394,16 @@
     <string name="ConversationActivity_your_request_to_join_has_been_sent_to_the_group_admin">Jou aansluitingsversoek is na die groepadmin gestuur. Jy sal laat weet word wanneer hulle aksie geneem het.</string>
     <string name="ConversationActivity_cancel_request">Kanselleer versoek</string>
 
-    <string name="ConversationActivity_to_send_audio_messages_allow_signal_access_to_your_microphone">Om klankboodskappe te stuur, laat Molly toegang tot jou mikrofoon toe.</string>
+    <!-- Dialog title asking users for microphone permission -->
+    <string name="ConversationActivity_allow_access_microphone">Allow access to your microphone</string>
+    <!-- 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>
+    <!-- Toast text explaining Signal\'s need for microphone access -->
+    <string name="ConversationActivity_signal_needs_microphone_access_voice_message">Molly needs microphone access to record a voice message.</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">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>
@@ -411,10 +427,17 @@
     <string name="ConversationActivity_you_will_leave_this_group_and_it_will_be_deleted_from_all_of_your_devices">Jy sal hierdie groep verlaat, en dit sal van al jou toestelle geskrap word.</string>
     <string name="ConversationActivity_delete">Skrap</string>
     <string name="ConversationActivity_delete_and_leave">Skrap en verlaat</string>
-    <string name="ConversationActivity__to_call_s_signal_needs_access_to_your_microphone">Om %1$s te skakel, het Molly toegang tot jou mikrofoon nodig.</string>
+
+    <!-- Dialog description that will explain the steps needed to give microphone permissions for a voice call -->
+    <string name="ConversationActivity__to_start_call">To start a 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">To start a call, allow Molly access to your microphone.</string>
+    <!-- Toast text explaining Signal\'s need for microphone access for a voice call -->
+    <string name="ConversationActivity_signal_needs_microphone_access_voice_call">Molly needs microphone access to start a call.</string>
 
 
     <string name="ConversationActivity_join">Sluit aan</string>
+    <!-- Button text for an active group call but the call is currently full and unjoinable -->
     <string name="ConversationActivity_full">Vol</string>
 
     <string name="ConversationActivity_error_sending_media">Kon nie media stuur nie</string>
@@ -613,6 +636,7 @@
     <string name="ConversationListFragment_unarchive">Ontargiveer</string>
     <string name="ConversationListFragment_delete">Skrap</string>
     <string name="ConversationListFragment_select_all">Kies alles</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 geselekteer</item>
         <item quantity="other">%1$d geselekteer</item>
@@ -864,6 +888,7 @@
         <item quantity="one">Uitnodiging gestuur</item>
         <item quantity="other">%1$d uitnodigings gestuur</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">\"%1$s\" kan nie outomaties deur jou by hierdie groep gevoeg word nie.\n\nHulle is genooi om aan te sluit, maar sal geen groepboodskappe sien voordat hulle aanvaar nie.</string>
     <string name="GroupManagement_invite_multiple_users">Hierdie gebruikers kan nie outomaties deur jou by hierdie groep gevoeg word nie.\n\nHulle is genooi om by die groep aan te sluit, maar sal geen groepboodskappe sien voordat hulle aanvaar nie.</string>
 
@@ -1044,7 +1069,9 @@
 
     <string name="ManageGroupActivity_edit_name_and_picture">Bewerk naam en foto</string>
     <string name="ManageGroupActivity_legacy_group">Legaatgroep</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">Hierdie groep is ’n Legaatgroep. Funksies soos groepadmins is slegs vir Nuwe Groepe beskikbaar.</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">Hierdie groep is ’n Legaatgroep. Vir toegang tot nuwe funksies soos @vermeldings en admins,</string>
     <string name="ManageGroupActivity_legacy_group_too_large">Hierdie Legaatgroep kan nie na ’n Nuwe Groep opgradeer word nie omdat dit te groot is. Die maksimum groepgrootte is %1$d</string>
     <string name="ManageGroupActivity_upgrade_this_group">gradeer hierdie groep op.</string>
@@ -1271,6 +1298,7 @@
         <item quantity="other">Skrap</item>
     </plurals>
 
+    <!-- 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 het (%2$s) geselekteer</item>
         <item quantity="other">%1$d het (%2$s) geselekteer</item>
@@ -1335,17 +1363,13 @@
     <string name="MessageRecord_left_group">Jy het die groep verlaat.</string>
     <string name="MessageRecord_you_updated_group">Jy het die groep bygewerk.</string>
     <string name="MessageRecord_the_group_was_updated">Die groep is bygewerk.</string>
-    <!-- Update message shown when placing an outgoing 1:1 voice/audio call and it\'s answered by the other party -->
+    <!-- Update message shown when placing an outgoing 1:1 voice/audio call -->
     <string name="MessageRecord_outgoing_voice_call">Uitgaande stemoproep</string>
-    <!-- Update message shown when placing an outgoing 1:1 video call and it\'s answered by the other party -->
+    <!-- Update message shown when placing an outgoing 1:1 video call -->
     <string name="MessageRecord_outgoing_video_call">Uitgaande video-oproep</string>
-    <!-- Update message shown when placing an outgoing 1:1 voice/audio call and it\'s not answered by the other party -->
-    <string name="MessageRecord_unanswered_voice_call">Onbeantwoorde stemoproep</string>
-    <!-- Update message shown when placing an outgoing 1:1 video call and it\'s not answered by the other party -->
-    <string name="MessageRecord_unanswered_video_call">Onbeantwoorde video-oproep</string>
-    <!-- Update message shown when receiving an incoming 1:1 voice/audio call and it\'s answered -->
+    <!-- Update message shown when receiving an incoming 1:1 voice/audio call and it\'s answered or ringing -->
     <string name="MessageRecord_incoming_voice_call">Inkomende stemoproep</string>
-    <!-- Update message shown when receiving an incoming 1:1 video call and answered -->
+    <!-- Update message shown when receiving an incoming 1:1 video call and answered or ringing -->
     <string name="MessageRecord_incoming_video_call">Inkomende video-oproep</string>
     <!-- Update message shown when receiving an incoming 1:1 voice/audio call and not answered -->
     <string name="MessageRecord_missed_voice_call">Gemiste stemoproep</string>
@@ -1355,10 +1379,6 @@
     <string name="MessageRecord_missed_voice_call_notification_profile">Gemiste stemoproep terwyl kennisgewingprofiel aan was</string>
     <!-- Update message shown when receiving an incoming video call and declined due to notification profile -->
     <string name="MessageRecord_missed_video_call_notification_profile">Gemiste video-oproep terwyl kennisgewingprofiel aan is</string>
-    <!-- Update message shown when receiving an incoming 1:1 voice/audio call and explicitly declined -->
-    <string name="MessageRecord_you_declined_a_voice_call">Jy het ’n stemoproep geweier</string>
-    <!-- Update message shown when receiving an incoming 1:1 video call and explicitly declined -->
-    <string name="MessageRecord_you_declined_a_video_call">Jy het ’n video-oproep geweier</string>
     <!-- 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 het die groep bygewerk.</string>
@@ -1567,28 +1587,53 @@
     <string name="MessageRecord_can_accept_payments">%1$s kan nou Betalings aanvaar</string>
 
     <!-- Group Calling update messages -->
-    <string name="MessageRecord_s_started_a_group_call_s">%1$s het ’n groepoproep begin · %2$s</string>
-    <string name="MessageRecord_you_started_a_group_call_s">Jy het om %1$s ’n groepoproep begin</string>
-    <string name="MessageRecord_s_is_in_the_group_call_s">%1$s is in die groepoproep · %2$s</string>
-    <string name="MessageRecord_you_are_in_the_group_call_s1">Jy is in die groepoproep · %1$s</string>
-    <string name="MessageRecord_s_and_s_are_in_the_group_call_s1">%1$s en %2$s is in die groepoproep · %3$s</string>
-    <string name="MessageRecord_group_call_s">Groepoproep · %1$s</string>
-
-    <string name="MessageRecord_s_started_a_group_call">%1$s het ’n groepoproep begin</string>
-    <string name="MessageRecord_you_started_a_group_call">Jy het ’n groepoproep begin</string>
-    <string name="MessageRecord_s_is_in_the_group_call">%1$s is in die groepoproep</string>
-    <string name="MessageRecord_you_are_in_the_group_call">Jy is in die groepoproep</string>
-    <string name="MessageRecord_s_and_s_are_in_the_group_call">%1$s en %2$s is in die groepoproep</string>
-    <string name="MessageRecord_group_call">Groepoproep</string>
+    <!-- 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 is in die oproep · %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">Jy is in die oproep · %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 en %2$s is in die oproep · %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 is in die oproep</string>
+    <!-- Chat log text for an ongoing group call only the local user has joined -->
+    <string name="MessageRecord_you_are_in_the_call">Jy is in die oproep</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 en %2$s is in die oproep</string>
+    <!-- Chat log text for a group call that ended within the last 5 minutes -->
+    <string name="MessageRecord__the_video_call_has_ended">Die video-oproep is beëindig</string>
+    <!-- Chat log text for a group call that ended within the last 5 minutes with a placeholder for formatted time -->
+    <string name="MessageRecord__the_video_call_has_ended_s">Die video-oproep is beëindig · %1$s</string>
+    <!-- Chat log text for a group call that ended more than 5 minutes ago and was missed -->
+    <string name="MessageRecord__missed_video_call">Gemiste video-oproep</string>
+    <!-- Chat log text for a group call that ended more than 5 minutes ago and was missed with a placeholder for formatted time -->
+    <string name="MessageRecord__missed_video_call_s">Gemiste video-oproep %1$s</string>
+    <!-- Chat log text for a group call that ended that the local user did not start -->
+    <string name="MessageRecord__incoming_video_call">Inkomende video-oproep</string>
+    <!-- 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">Inkomende video-oproep · %1$s</string>
+    <!-- Chat log text for a group call that ended that the local user started -->
+    <string name="MessageRecord__outgoing_video_call">Uitgaande video-oproep</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">Uitgaande video-oproep · %1$s</string>
+    <!-- Chat log text for an ongoing group call that the local user started -->
+    <string name="MessageRecord__you_started_a_video_call">Jy het \'n video-oproep begin</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">Jy het \'n video-oproep begin · %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 het \'n video-oproep begin</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 het \'n video-oproep begin · %2$s</string>
 
     <string name="MessageRecord_you">Jy</string>
 
-    <plurals name="MessageRecord_s_s_and_d_others_are_in_the_group_call_s">
+    <!-- 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 en %3$d ander is in die groepoproep · %4$s</item>
         <item quantity="other">%1$s, %2$s en %3$d ander is in die groepoproep · %4$s</item>
     </plurals>
 
-    <plurals name="MessageRecord_s_s_and_d_others_are_in_the_group_call">
+    <!-- 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 en %3$d ander is in die groepoproep</item>
         <item quantity="other">%1$s, %2$s en %3$d ander is in die groepoproep</item>
     </plurals>
@@ -2063,6 +2108,7 @@
     <!-- 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 nie \'n verifiëringskode aanvra nie. Gaan asseblief netwerkverbinding na en probeer weer.</string>
     <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">Molly Android - Telefoonnommerformaat</string>
     <!--    Small "toast" notification to the user confirming that they have requested a new code via voice call.-->
@@ -2207,7 +2253,7 @@
     <string name="SubmitDebugLogActivity_this_log_will_be_posted_publicly_online_for_contributors">Hierdie log sal publiek aanlyn gepos word vir bydraers om te sien. Jy kan dit ondersoek voordat jy dit oplaai.</string>
 
     <!-- SupportEmailUtil -->
-  <!-- Removed by excludeNonTranslatables <string name="SupportEmailUtil_support_email" translatable="false">support@molly.im</string> -->
+  <!-- Removed by excludeNonTranslatables <string name="SupportEmailUtil_support_email" translatable="false">support@signal.org</string> -->
     <string name="SupportEmailUtil_filter">Filter:</string>
     <string name="SupportEmailUtil_device_info">Toestelinligting:</string>
     <string name="SupportEmailUtil_android_version">Android-weergawe:</string>
@@ -2709,6 +2755,8 @@
     <string name="ConversationUpdateItem_loading">Laai tans</string>
     <string name="ConversationUpdateItem_learn_more">Vind meer uit</string>
     <string name="ConversationUpdateItem_join_call">Sluit aan by oproep</string>
+    <!-- Action button label for starting a new call in the current conversation -->
+    <string name="ConversationUpdateItem_call_back">Bel terug</string>
     <string name="ConversationUpdateItem_return_to_call">Keer terug na oproep</string>
     <string name="ConversationUpdateItem_call_is_full">Oproep is vol</string>
     <string name="ConversationUpdateItem_invite_friends">Nooi vriende uit</string>
@@ -2773,6 +2821,7 @@
     <string name="safety_number_change_dialog__leave_call">Verlaat oproep</string>
     <string name="safety_number_change_dialog__the_following_people_may_have_reinstalled_or_changed_devices">Die volgende mense het dalk van toestelle verander of ’n herinstallasie gedoen. Verifieer jou veiligheidsnomemr met hulle om privaatheid te verseker.</string>
     <string name="safety_number_change_dialog__view">Bekyk</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">Vorige geverifieer</string>
 
     <!-- EnableCallNotificationSettingsDialog__call_notifications_checklist -->
@@ -3086,6 +3135,7 @@
 
     <string name="arrays__default">Verstek</string>
     <string name="arrays__high">Hoog</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">Maksimum</string>
 
     <!-- plurals.xml -->
@@ -3357,7 +3407,7 @@
     <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 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>
@@ -3406,6 +3456,14 @@
     <!-- Storage permission row description -->
     <string name="GrantPermissionsFragment__send_photos_videos_and_files">Stuur foto\'s, video\'s en lêers van jou toestel af.</string>
 
+    <!-- PermissionDeniedBottomSheet -->
+    <!-- Sheet describing step 1 on how to give permissions by opening settings -->
+    <string name="PermissionDeniedBottomSheet__1_tap_settings_below">1. Tap “Settings” below</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 Allow the permission</string>
+    <!-- Label for button at the bottom of the sheet which opens the system permission settings -->
+    <string name="PermissionDeniedBottomSheet__settings">Settings</string>
+
     <!-- PaymentsSecuritySetupFragment -->
     <!-- Toolbar title -->
     <string name="PaymentsSecuritySetupFragment__security_setup">Sekuriteitsopstelling</string>
@@ -3446,6 +3504,7 @@
     <string name="PaymentsDetailsFragment__sent_to_s">Gestuur aan %1$s</string>
     <string name="PaymentsDetailsFragment__you_on_s_at_s">Jou op %1$s om %2$s</string>
     <string name="PaymentsDetailsFragment__s_on_s_at_s">%1$s op %2$s om %3$s</string>
+    <!-- Prefix to a name to indicate who a payment was sent to -->
     <string name="PaymentsDetailsFragment__to">Aan</string>
     <string name="PaymentsDetailsFragment__from">Van</string>
     <string name="PaymentsDetailsFragment__information">Transaksiebesonderhede, wat die betalingsbedrag en transaksietyd insluit, is deel van die MobileCoin-grootboek.</string>
@@ -3508,6 +3567,7 @@
     <string name="ConfirmPayment__confirm_payment">Bevestig betaling</string>
     <string name="ConfirmPayment__network_fee">Netwerkgelde</string>
     <string name="ConfirmPayment__estimated_s">Geraamde %1$s</string>
+    <!-- Prefix to a name to indicate who a payment will be sent to -->
     <string name="ConfirmPayment__to">Aan</string>
     <string name="ConfirmPayment__total_amount">Totale bedrag</string>
     <string name="ConfirmPayment__balance_s">Saldo: %1$s</string>
@@ -3658,6 +3718,14 @@
     <string name="conversation_group_options__conversation">Klets</string>
     <string name="conversation_group_options__broadcast">Uitsending</string>
 
+    <!-- DoubleTapEditEducationSheet -->
+    <!-- Displayed as the title of the education bottom sheet -->
+    <string name="DoubleTapEditEducationSheet__double_tap_edit_title">Double tap to edit</string>
+    <!-- Text on the sheet explaining how double tapping on a message will let them edit it -->
+    <string name="DoubleTapEditEducationSheet__quickly_tap_twice">Quickly tap twice on your messages to edit them. You can edit your messages up to 24hrs after they’ve been sent.</string>
+    <!-- Button label to dismiss sheet -->
+    <string name="DoubleTapEditEducationSheet__got_it">Got it</string>
+
     <!-- text_secure_normal -->
     <string name="text_secure_normal__menu_new_group">Nuwe groep</string>
     <string name="text_secure_normal__menu_settings">Instellings</string>
@@ -4112,6 +4180,7 @@
     <string name="RecipientBottomSheet_copied_to_clipboard">Na knipbord gekopieer</string>
 
     <string name="GroupRecipientListItem_admin">Admin</string>
+    <!-- Button text to approve a user that has requested to join a group -->
     <string name="GroupRecipientListItem_approve_description">Keur goed</string>
     <string name="GroupRecipientListItem_deny_description">Weier</string>
 
@@ -4139,6 +4208,7 @@
 
     <!-- VoiceNoteMediaDescriptionCompatFactory -->
     <string name="VoiceNoteMediaItemFactory__voice_message">Stemboodskap · %1$s</string>
+    <!-- This is a title in a banner describing the conversation sender to receiver placeholders of the currently playing voice memo. -->
     <string name="VoiceNoteMediaItemFactory__s_to_s">%1$s na %2$s</string>
 
     <!-- StorageUtil -->
@@ -4152,8 +4222,16 @@
     <string name="ReviewCardDialogFragment__review_members">Hersien lede</string>
     <!-- Title of a screen where the user will be prompted to review a message request matching the name of someone they already know -->
     <string name="ReviewCardDialogFragment__review_request">Hersien versoek</string>
-    <string name="ReviewCardDialogFragment__d_group_members_have_the_same_name">%1$d groeplede het dieselfde naam, hersien die lede hier onder en kies ’n aksie om te neem.</string>
-    <string name="ReviewCardDialogFragment__if_youre_not_sure">Indien jy onseker is oor die sender van die versoek, kan jy die kontakte hier onder nagaan en aksie neem.</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="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 -->
+    <plurals name="ReviewCardDialogFragment__if_youre_not_sure">
+        <item quantity="one">If you\'re not sure who the request is from, review the contact below and take action.</item>
+        <item quantity="other">If you\'re not sure who the request is from, review the contacts below and take action.</item>
+    </plurals>
     <string name="ReviewCardDialogFragment__no_other_groups_in_common">Geen ander groepe in gemeen.</string>
     <string name="ReviewCardDialogFragment__no_groups_in_common">Geen groepe in gemeen nie.</string>
     <plurals name="ReviewCardDialogFragment__d_other_groups_in_common">
@@ -4184,11 +4262,20 @@
     <string name="CallParticipantsListUpdatePopupWindow__s_joined">%1$s het aangesluit</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_and_s_joined">%1$s en %2$s het aangesluit</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_s_and_s_joined">%1$s, %2$s en %3$s het aangesluit</string>
-    <string name="CallParticipantsListUpdatePopupWindow__s_s_and_d_others_joined">%1$s, %2$s en nog %3$d het aangesluit</string>
+    <!-- Toast message shown in group call when 3 or more people join -->
+    <plurals name="CallParticipantsListUpdatePopupWindow__s_s_and_d_others_joined">
+        <item quantity="one">%1$s, %2$s and %3$d other joined</item>
+        <item quantity="other">%1$s, %2$s and %3$d others joined</item>
+    </plurals>
+    <!-- Toast/popup text shown when someone leaves a group call -->
     <string name="CallParticipantsListUpdatePopupWindow__s_left">%1$s het verlaat</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_and_s_left">%1$s en %2$s het verlaat</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_s_and_s_left">%1$s, %2$s en %3$s het verlaat</string>
-    <string name="CallParticipantsListUpdatePopupWindow__s_s_and_d_others_left">%1$s, %2$s en nog %3$d het verlaat</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 and %3$d other left</item>
+        <item quantity="other">%1$s, %2$s and %3$d others left</item>
+    </plurals>
 
     <string name="CallParticipant__you">Jy</string>
     <string name="CallParticipant__you_on_another_device">Jy (op ’n ander toestel)</string>
@@ -4558,10 +4645,15 @@
 
     <!-- PrivacySettingsFragment -->
     <string name="PrivacySettingsFragment__blocked">Versper</string>
-    <string name="PrivacySettingsFragment__d_contacts">%1$d kontakte</string>
+    <!-- Settings label that shows the number blocked contacts -->
+    <plurals name="PrivacySettingsFragment__d_contacts">
+        <item quantity="one">%1$d contact</item>
+        <item quantity="other">%1$d contacts</item>
+    </plurals>
     <string name="PrivacySettingsFragment__messaging">Boodskappe</string>
     <string name="PrivacySettingsFragment__disappearing_messages">Verdwynboodskappe</string>
     <string name="PrivacySettingsFragment__app_security">Toepassingveiligheid</string>
+    <!-- This refers to the multi-tasking overview (recent apps) from the Android operating system.-->
     <string name="PrivacySettingsFragment__block_screenshots_in_the_recents_list_and_inside_the_app">Versper skermgrepe in die onlangs-lys en binne-in die toepassing</string>
     <string name="PrivacySettingsFragment__signal_message_and_calls">Signal-boodskappe en oproepe, herlei oproepe altyd, en verseëlde afsender</string>
     <string name="PrivacySettingsFragment__default_timer_for_new_changes">Verstek-tydhouer vir nuwe kletse</string>
@@ -4618,11 +4710,14 @@
     <string name="DataAndStorageSettingsFragment__media_quality">Mediakwaliteit</string>
     <string name="DataAndStorageSettingsFragment__sent_media_quality">Gestuurde mediakwaliteit</string>
     <string name="DataAndStorageSettingsFragment__sending_high_quality_media_will_use_more_data">Stuur van hoëkwaliteitmedia sal meer data gebruik.</string>
+    <!-- Setting option that can be selected to default media to be sent as high quality by default -->
     <string name="DataAndStorageSettingsFragment__high">Hoog</string>
+    <!-- Setting option that can be selected to default media to be sent as standard quality by default -->
     <string name="DataAndStorageSettingsFragment__standard">Standaard</string>
     <string name="DataAndStorageSettingsFragment__calls">Oproepe</string>
 
     <!-- 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">Outo</string>
     <string name="ChatColorSelectionFragment__use_custom_colors">Gebruik pasgemaakte kleure</string>
     <string name="ChatColorSelectionFragment__chat_color">Kletskleur</string>
@@ -4834,6 +4929,7 @@
     <string name="AvatarPickerFragment__take_a_picture">Neem ’n foto</string>
     <string name="AvatarPickerFragment__choose_a_photo">Kies ’n foto</string>
     <string name="AvatarPickerFragment__photo">Foto</string>
+    <!-- Button label during avatar selection/creation that when tapped lets you generate an avatar from typed in text. -->
     <string name="AvatarPickerFragment__text">Teks</string>
     <string name="AvatarPickerFragment__save">Stoor</string>
     <string name="AvatarPickerFragment__clear_avatar">Vee avatar uit</string>
@@ -4894,7 +4990,7 @@
     <string name="MediaReviewFragment__add_a_message">Voeg ’n boodskap toe</string>
     <string name="MediaReviewFragment__add_a_reply">Voeg ’n antwoord toe</string>
     <string name="MediaReviewFragment__send_to">Stuur na</string>
-    <string name="MediaReviewFragment__view_once_message">Eenkeerkyk-boodskap</string>
+    <string name="MediaReviewFragment__view_once_message">Eenkeerkyk-media</string>
     <string name="MediaReviewFragment__one_or_more_items_were_too_large">Een of meer items was te groot</string>
     <string name="MediaReviewFragment__one_or_more_items_were_invalid">Een of meer items was ongeldig</string>
     <string name="MediaReviewFragment__too_many_items_selected">Te veel items gekies</string>
@@ -5487,7 +5583,7 @@
     <string name="StoryViewerFragment__s_s">%1$s %2$s</string>
     <!-- Displayed when viewing a post you sent -->
     <string name="StoryViewerPageFragment__you">Jy</string>
-    <!-- Displayed when viewing a post displayed to a group -->
+    <!-- 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 tot %2$s</string>
     <!-- Displayed when viewing a post from another user with no replies -->
     <string name="StoryViewerPageFragment__reply">Antwoord</string>
@@ -6704,5 +6800,26 @@
     <!-- Content description for opening the note editor -->
     <string name="ViewNoteSheet__edit_note">Wysig nota</string>
 
+    <!-- BackupProgressService -->
+    <!-- Notification title shown while backup restore job is running -->
+    <string name="BackupProgressService_title">Herstel tans rugsteun…</string>
+    <!-- Notification title shown while downloading backup restore data -->
+    <string name="BackupProgressService_title_downloading">Laai tans rugsteundata af…</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>
+    <!-- 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 -->
+    <string name="BackupsTypeSettingsFragment__google_pay">Google Pay</string>
+    <!-- Displayed as the user\'s payment method as a label in a preference row -->
+    <string name="BackupsTypeSettingsFragment__bank_transfer">Bank transfer</string>
+    <!-- Displayed as the user\'s payment method as a label in a preference row -->
+    <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>
+
+
     <!-- 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 46c3ae10c9..c27fd88259 100644
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@@ -1,6 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- smartling.instruction_comments_enabled = on -->
-<resources>
+<?xml version="1.0" encoding="UTF-8"?><!-- 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> -->
@@ -89,6 +87,16 @@
     <string name="AttachmentManager_signal_requires_the_external_storage_permission_in_order_to_attach_photos_videos_or_audio">يحتاج سيجنال إلى إذن الوصول إلى التخزين من أجل إرفاق الصور والفيديوهات والملفّات الصوتيّة، ولكن الإذن لم يُمنح بشكل دائم. الّرجاء زيارة قائمة إعدادات التطبيق، واختيار \"الأذونات\"، ومن ثمّ تفعيل \"سعة التخزين\".</string>
     <string name="AttachmentManager_signal_requires_contacts_permission_in_order_to_attach_contact_information">يحتاج سيجنال إلى إذن الوصول لِ جهات الاتصال من أجل إرفاق بيانات جهة اتصال، لكن الإذن لم يُمنح بشكل دائم. الّرجاء زيارة قائمة إعدادات التطبيق، واختيار \"الأذونات\"، ومن ثم تفعيل \"جهات الاتصال\".</string>
     <string name="AttachmentManager_signal_requires_location_information_in_order_to_attach_a_location">يحتاج سيجنال إلى إذن الوصول إلى الموقع من أجل إرفاق الموقع ولكن تم إيقاف الإذن على نحو دائم. يرجى زيارة قائمة إعدادات التطبيق ثم اختيار \"الأذونات\" وتفعيل \"الموقع\".</string>
+
+    <!-- Dialog title asking users for location permission -->
+    <string name="AttachmentManager_signal_allow_access_location">Allow access to your location</string>
+    <!-- Dialog description that will explain the steps needed to give location permission -->
+    <string name="AttachmentManager_signal_to_send_location">To send your location:</string>
+    <!-- Alert dialog description asking for location permission -->
+    <string name="AttachmentManager_signal_allow_signal_access_location">Allow Molly access to send your location.</string>
+    <!-- Toast text explaining Signal\'s need for location access -->
+    <string name="AttachmentManager_signal_needs_location_access">Molly needs location access to send your location.</string>
+
     <!-- Alert dialog title to show the recipient has not activated payments -->
     <string name="AttachmentManager__not_activated_payments">لم يُفعّل %1$s عمليات الدفع </string>
     <!-- Alert dialog description to send the recipient a request to activate payments -->
@@ -398,8 +406,16 @@
     <string name="ConversationActivity_your_request_to_join_has_been_sent_to_the_group_admin">تم إرسال طلبك للانضمام إلى المشرفين على المجموعة. سيتم تنبيهك عند اتخاذهم الإجراء المناسب لهم.</string>
     <string name="ConversationActivity_cancel_request">إلغاء الطلب</string>
 
-    <string name="ConversationActivity_to_send_audio_messages_allow_signal_access_to_your_microphone">لإرسال الرسائل الصوتية، يرجى السماح لسيجنال بالوصول إلى الميكروفون.</string>
+    <!-- Dialog title asking users for microphone permission -->
+    <string name="ConversationActivity_allow_access_microphone">Allow access to your microphone</string>
+    <!-- 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>
+    <!-- Toast text explaining Signal\'s need for microphone access -->
+    <string name="ConversationActivity_signal_needs_microphone_access_voice_message">Molly needs microphone access to record a voice message.</string>
     <string name="ConversationActivity_signal_requires_the_microphone_permission_in_order_to_send_audio_messages">يحتاج سيجنال إلى إذن الوصول إلى الميكروفون لإرسال الرسائل الصوتية، ولكن تم إيقاف الإذن على نحو دائم. الرّجاء الاطلاع على إعدادات التطبيق ثم اختيار \"الأذونات\" وتفعيل \"الميكروفون\".</string>
+
     <string name="ConversationActivity_signal_needs_the_microphone_and_camera_permissions_in_order_to_call_s">يحتاج سيجنال إلى إذنَي الوصول إلى الميكروفون والكاميرا من أجل الاتصال بـ%1$s ولكن تم إيقافهما على نحو دائم. الرجاء الاطلاع على إعدادات التطبيق ثم اختيار \"الأذونات\" وتفعيل \"الميكروفون\" و\"الكاميرا\".</string>
     <string name="ConversationActivity_to_capture_photos_and_video_allow_signal_access_to_the_camera">لالتقاط الصور والفيديوهات، الرجاء السماح لسيجنال بالوصول إلي الكاميرا.</string>
     <string name="ConversationActivity_signal_needs_the_camera_permission_to_take_photos_or_video">يحتاج سيجنال إلى إذن الوصول إلى الكاميرا من أجل التقاط صور وفيديو، ولكن تم إيقاف الإذن على نحو دائم. الرجاء الاطلاع على إعدادات التطبيق ثم اختيار \"الأذونات\"، ثم تفعيل \"الكاميرا\".</string>
@@ -423,10 +439,17 @@
     <string name="ConversationActivity_you_will_leave_this_group_and_it_will_be_deleted_from_all_of_your_devices">سَتغادر هذه المجموعة، ثم ستُحذَف من كل أجهزتك.</string>
     <string name="ConversationActivity_delete">حذف</string>
     <string name="ConversationActivity_delete_and_leave">حذف ثم المغادرة</string>
-    <string name="ConversationActivity__to_call_s_signal_needs_access_to_your_microphone">للاتصال بـ %1$s، يحتاج سيجنال الوصول إلى ميكروفونك</string>
+
+    <!-- Dialog description that will explain the steps needed to give microphone permissions for a voice call -->
+    <string name="ConversationActivity__to_start_call">To start a 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">To start a call, allow Molly access to your microphone.</string>
+    <!-- Toast text explaining Signal\'s need for microphone access for a voice call -->
+    <string name="ConversationActivity_signal_needs_microphone_access_voice_call">Molly needs microphone access to start a call.</string>
 
 
     <string name="ConversationActivity_join">انضم</string>
+    <!-- Button text for an active group call but the call is currently full and unjoinable -->
     <string name="ConversationActivity_full">ممتليء</string>
 
     <string name="ConversationActivity_error_sending_media">خطأُ في إرسال الوسائط</string>
@@ -677,6 +700,7 @@
     <string name="ConversationListFragment_unarchive">إلغاء الأرشفة</string>
     <string name="ConversationListFragment_delete">حذف</string>
     <string name="ConversationListFragment_select_all">تحديد الكل</string>
+    <!-- Screen title shown when selecting multiple items from a list like conversation threads or call logs. -->
     <plurals name="ConversationListFragment_s_selected">
         <item quantity="zero">تم تحديد %1$d</item>
         <item quantity="one">تم تحديد %1$d</item>
@@ -940,6 +964,7 @@
         <item quantity="many">تم إرسال %1$d دعوة</item>
         <item quantity="other">تم إرسال %1$d دعوة</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">لا يمكنك إضافة \"%1$s\" تلقائياً إلى هذه المجموعة. \n\n لقد تمت دعوة ذلك الشخص للانضمام، ولن يرى أيّة رسالة من رسائل المجموعة حتى يقبلها.</string>
     <string name="GroupManagement_invite_multiple_users">لا يمكنك إضافة هؤلاء المستخدمين تلقائياً إلى هذه المجموعة . \n\n لقد تمت دعوتهم للانضمام، ولن يروا أيّة رسالة من رسائل المجموعة حتى يقبلون.</string>
 
@@ -1184,7 +1209,9 @@
 
     <string name="ManageGroupActivity_edit_name_and_picture">عدّل الاسم والصورة</string>
     <string name="ManageGroupActivity_legacy_group">مجموعة من الطراز القديم</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">هذه مجموعة من الطراز القديم. إن الميزات مثل خاصية المشرفين على المجموعة، متاحة فقط في المجموعات الجديدة.</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">هذه مجموعة من الطراز القديم. للوصول إلى ميزات مثل ‎@mentions‏ والمشرفين،</string>
     <string name="ManageGroupActivity_legacy_group_too_large">لا يمكن ترقية هذه المجموعة القديمة الطراز إلى مجموعة جديدة لأنها كبيرة جدا. الحد الأقصى للمجموعة هو %1$d.</string>
     <string name="ManageGroupActivity_upgrade_this_group">يُرجى ترقية هذه المجموعة.</string>
@@ -1447,6 +1474,7 @@
         <item quantity="other">حذف</item>
     </plurals>
 
+    <!-- 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="zero">تم تحديد %1$d (%2$s)</item>
         <item quantity="one">تم تحديد %1$d (%2$s)</item>
@@ -1515,17 +1543,13 @@
     <string name="MessageRecord_left_group">لقد تركت المجموعة.</string>
     <string name="MessageRecord_you_updated_group">قمت بتحديث المجموعة.</string>
     <string name="MessageRecord_the_group_was_updated">تم تحديث المجموعة بنجاح.</string>
-    <!-- Update message shown when placing an outgoing 1:1 voice/audio call and it\'s answered by the other party -->
+    <!-- Update message shown when placing an outgoing 1:1 voice/audio call -->
     <string name="MessageRecord_outgoing_voice_call">مكالمة صوتية صادرة</string>
-    <!-- Update message shown when placing an outgoing 1:1 video call and it\'s answered by the other party -->
+    <!-- Update message shown when placing an outgoing 1:1 video call -->
     <string name="MessageRecord_outgoing_video_call">مكالمة فيديو صادرة</string>
-    <!-- Update message shown when placing an outgoing 1:1 voice/audio call and it\'s not answered by the other party -->
-    <string name="MessageRecord_unanswered_voice_call">مكالمة صوتية لم يتم الرد عليها</string>
-    <!-- Update message shown when placing an outgoing 1:1 video call and it\'s not answered by the other party -->
-    <string name="MessageRecord_unanswered_video_call">مكالمة فيديو لم يتم الرد عليها</string>
-    <!-- Update message shown when receiving an incoming 1:1 voice/audio call and it\'s answered -->
+    <!-- Update message shown when receiving an incoming 1:1 voice/audio call and it\'s answered or ringing -->
     <string name="MessageRecord_incoming_voice_call">مكالمة صوتية واردة</string>
-    <!-- Update message shown when receiving an incoming 1:1 video call and answered -->
+    <!-- Update message shown when receiving an incoming 1:1 video call and answered or ringing -->
     <string name="MessageRecord_incoming_video_call">مكالمة فيديو واردة</string>
     <!-- Update message shown when receiving an incoming 1:1 voice/audio call and not answered -->
     <string name="MessageRecord_missed_voice_call">مكالمة صوتية فائتة</string>
@@ -1535,10 +1559,6 @@
     <string name="MessageRecord_missed_voice_call_notification_profile">مكالمة صوتية فائتة أثناء تشغيل الحساب الشخصي للإشعارات</string>
     <!-- Update message shown when receiving an incoming video call and declined due to notification profile -->
     <string name="MessageRecord_missed_video_call_notification_profile">اتصال فيديو فائت أثناء تشغيل الحساب الشخصي للإشعار</string>
-    <!-- Update message shown when receiving an incoming 1:1 voice/audio call and explicitly declined -->
-    <string name="MessageRecord_you_declined_a_voice_call">لقد رفضت مكالمة صوتية</string>
-    <!-- Update message shown when receiving an incoming 1:1 video call and explicitly declined -->
-    <string name="MessageRecord_you_declined_a_video_call">لقد رفضت مكالمة فيديو</string>
     <!-- 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>
@@ -1779,23 +1799,47 @@
     <string name="MessageRecord_can_accept_payments">يُمكن لـ %1$s قبول عمليات الدفع الآن</string>
 
     <!-- Group Calling update messages -->
-    <string name="MessageRecord_s_started_a_group_call_s">قام العضو %1$s ببدء مكالمة جماعية · %2$s</string>
-    <string name="MessageRecord_you_started_a_group_call_s">لقد بدأتَ مكالمة جماعية · %1$s</string>
-    <string name="MessageRecord_s_is_in_the_group_call_s">العضو %1$s موجود في المكالمة الجماعية · %2$s</string>
-    <string name="MessageRecord_you_are_in_the_group_call_s1">إنك في مكالمة جماعية · %1$s</string>
-    <string name="MessageRecord_s_and_s_are_in_the_group_call_s1">العضوان %1$s و %2$s موجودان في مكالمة جماعية · %3$s</string>
-    <string name="MessageRecord_group_call_s">مكالمة جماعية · %1$s</string>
-
-    <string name="MessageRecord_s_started_a_group_call">قام العضو %1$s ببدء مكالمة جماعية</string>
-    <string name="MessageRecord_you_started_a_group_call">لقد قمت ببدء مكالمة جماعية</string>
-    <string name="MessageRecord_s_is_in_the_group_call">العضو %1$s موجود في مكالمة جماعية</string>
-    <string name="MessageRecord_you_are_in_the_group_call">إنك في مكالمة جماعية</string>
-    <string name="MessageRecord_s_and_s_are_in_the_group_call">العضوان %1$s و %2$s موجودان في مكالمة جماعية</string>
-    <string name="MessageRecord_group_call">المكالمة الجماعية</string>
+    <!-- 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 موجود في المكالمة · %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">أنت موجود في المكالمة · %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 و%2$s موجودان في المكالمة · %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 موجود في المكالمة</string>
+    <!-- Chat log text for an ongoing group call only the local user has joined -->
+    <string name="MessageRecord_you_are_in_the_call">أنت موجود في المكالمة</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 و%2$s موجودان في المكالمة</string>
+    <!-- Chat log text for a group call that ended within the last 5 minutes -->
+    <string name="MessageRecord__the_video_call_has_ended">انتهت مكالمة الفيديو</string>
+    <!-- Chat log text for a group call that ended within the last 5 minutes with a placeholder for formatted time -->
+    <string name="MessageRecord__the_video_call_has_ended_s">انتهت مكالمة الفيديو · %1$s</string>
+    <!-- Chat log text for a group call that ended more than 5 minutes ago and was missed -->
+    <string name="MessageRecord__missed_video_call">مكالمة فيديو فائتة</string>
+    <!-- Chat log text for a group call that ended more than 5 minutes ago and was missed with a placeholder for formatted time -->
+    <string name="MessageRecord__missed_video_call_s">مكالمة بالصورة فائتة · %1$s</string>
+    <!-- Chat log text for a group call that ended that the local user did not start -->
+    <string name="MessageRecord__incoming_video_call">مكالمة فيديو واردة</string>
+    <!-- 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">مكالمة فيديو واردة · %1$s</string>
+    <!-- Chat log text for a group call that ended that the local user started -->
+    <string name="MessageRecord__outgoing_video_call">مكالمة فيديو صادرة</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">مكالمة فيديو صادرة · %1$s</string>
+    <!-- Chat log text for an ongoing group call that the local user started -->
+    <string name="MessageRecord__you_started_a_video_call">بدأت مكالمة فيديو</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">بدأت مكالمة فيديو · %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 بدأ مكالمة فيديو</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 بدأ مكالمة فيديو · %2$s</string>
 
     <string name="MessageRecord_you">أنت</string>
 
-    <plurals name="MessageRecord_s_s_and_d_others_are_in_the_group_call_s">
+    <!-- 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="zero">الأعضاء %1$s و %2$s و%3$d آخر موجودون في المكالمة الجماعية · %4$s</item>
         <item quantity="one">الأعضاء %1$s و %2$s و%3$d آخر موجودون في المكالمة الجماعية · %4$s</item>
         <item quantity="two">الأعضاء %1$s و %2$s و%3$d آخرون موجودون في المكالمة الجماعية · %4$s</item>
@@ -1804,7 +1848,8 @@
         <item quantity="other">الأعضاء %1$s و %2$s و%3$d آخرون موجودون في المكالمة الجماعية · %4$s</item>
     </plurals>
 
-    <plurals name="MessageRecord_s_s_and_d_others_are_in_the_group_call">
+    <!-- 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="zero">الأعضاء %1$s و %2$s و%3$d آخر موجودون في المكالمة الجماعية</item>
         <item quantity="one">الأعضاء %1$s و %2$s و%3$d آخر موجود في المكالمة الجماعية</item>
         <item quantity="two">الأعضاء %1$s و %2$s و%3$d آخرون موجودون في المكالمة الجماعية</item>
@@ -2379,6 +2424,7 @@
     <!-- Generic error when the app is unable to request an SMS code for an unknown reason. -->
     <string name="RegistrationActivity_unable_to_request_verification_code">تعذّر طلب رمز تحقق. يُرجى التحقّق من اتصالك بالانترنت ثم حاول مرة أُخرى.</string>
     <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">سيجنال Android - نسق رقم الهاتف</string>
     <!--    Small "toast" notification to the user confirming that they have requested a new code via voice call.-->
@@ -2527,7 +2573,7 @@
     <string name="SubmitDebugLogActivity_this_log_will_be_posted_publicly_online_for_contributors">سيتم نشر هذا السّجل علناً حتى يتمكن المساهمون في التطبيق من الاطلاع عليه. يمكنك فحصه أو تعديله قبل رفعه.</string>
 
     <!-- SupportEmailUtil -->
-  <!-- Removed by excludeNonTranslatables <string name="SupportEmailUtil_support_email" translatable="false">support@molly.im</string> -->
+  <!-- Removed by excludeNonTranslatables <string name="SupportEmailUtil_support_email" translatable="false">support@signal.org</string> -->
     <string name="SupportEmailUtil_filter">المُرشِّح :</string>
     <string name="SupportEmailUtil_device_info">معلومات الجهاز :</string>
     <string name="SupportEmailUtil_android_version">إصدار اﻷندرويد</string>
@@ -3057,6 +3103,8 @@
     <string name="ConversationUpdateItem_loading">قيد التحميل</string>
     <string name="ConversationUpdateItem_learn_more">لمعرفة المزيد</string>
     <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_call_is_full">المكالمة ممتلئة</string>
     <string name="ConversationUpdateItem_invite_friends">دعوة الأصدقاء</string>
@@ -3121,6 +3169,7 @@
     <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>
 
     <!-- EnableCallNotificationSettingsDialog__call_notifications_checklist -->
@@ -3462,6 +3511,7 @@
 
     <string name="arrays__default">افتراضي</string>
     <string name="arrays__high">بالغ الأهميّة</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">قصوى</string>
 
     <!-- plurals.xml -->
@@ -3794,6 +3844,14 @@
     <!-- Storage permission row description -->
     <string name="GrantPermissionsFragment__send_photos_videos_and_files">أرسل صورًا وفيديوهات وملفات من جهازك.</string>
 
+    <!-- PermissionDeniedBottomSheet -->
+    <!-- Sheet describing step 1 on how to give permissions by opening settings -->
+    <string name="PermissionDeniedBottomSheet__1_tap_settings_below">1. Tap “Settings” below</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 Allow the permission</string>
+    <!-- Label for button at the bottom of the sheet which opens the system permission settings -->
+    <string name="PermissionDeniedBottomSheet__settings">Settings</string>
+
     <!-- PaymentsSecuritySetupFragment -->
     <!-- Toolbar title -->
     <string name="PaymentsSecuritySetupFragment__security_setup">إعداد الأمان</string>
@@ -3834,6 +3892,7 @@
     <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__information">ستجد تفاصيل المعاملات بما في ذلك مبالغ الدفوعات وتاريخ المعاملة متضمنة في دفتر حسابات MobileCoin.</string>
@@ -3896,6 +3955,7 @@
     <string name="ConfirmPayment__confirm_payment">تأكيد الدفع</string>
     <string name="ConfirmPayment__network_fee">رسوم الشبكة</string>
     <string name="ConfirmPayment__estimated_s">مُقدَّرة بـ %1$s</string>
+    <!-- Prefix to a name to indicate who a payment will be sent to -->
     <string name="ConfirmPayment__to">إلى</string>
     <string name="ConfirmPayment__total_amount">المبلغ الإجمالي</string>
     <string name="ConfirmPayment__balance_s">الرصيد : %1$s</string>
@@ -4054,6 +4114,14 @@
     <string name="conversation_group_options__conversation">دردشة</string>
     <string name="conversation_group_options__broadcast">بث</string>
 
+    <!-- DoubleTapEditEducationSheet -->
+    <!-- Displayed as the title of the education bottom sheet -->
+    <string name="DoubleTapEditEducationSheet__double_tap_edit_title">Double tap to edit</string>
+    <!-- Text on the sheet explaining how double tapping on a message will let them edit it -->
+    <string name="DoubleTapEditEducationSheet__quickly_tap_twice">Quickly tap twice on your messages to edit them. You can edit your messages up to 24hrs after they’ve been sent.</string>
+    <!-- Button label to dismiss sheet -->
+    <string name="DoubleTapEditEducationSheet__got_it">Got it</string>
+
     <!-- text_secure_normal -->
     <string name="text_secure_normal__menu_new_group">مجموعة جديدة</string>
     <string name="text_secure_normal__menu_settings">الإعدادات</string>
@@ -4536,6 +4604,7 @@
     <string name="RecipientBottomSheet_copied_to_clipboard">تمّ النسخ إلى الحافظة</string>
 
     <string name="GroupRecipientListItem_admin">مشرف</string>
+    <!-- Button text to approve a user that has requested to join a group -->
     <string name="GroupRecipientListItem_approve_description">الموافقة</string>
     <string name="GroupRecipientListItem_deny_description">رفض</string>
 
@@ -4563,6 +4632,7 @@
 
     <!-- VoiceNoteMediaDescriptionCompatFactory -->
     <string name="VoiceNoteMediaItemFactory__voice_message">رسالة صوتية · %1$s</string>
+    <!-- This is a title in a banner describing the conversation sender to receiver placeholders of the currently playing voice memo. -->
     <string name="VoiceNoteMediaItemFactory__s_to_s">%1$s إلى %2$s</string>
 
     <!-- StorageUtil -->
@@ -4576,8 +4646,24 @@
     <string name="ReviewCardDialogFragment__review_members">مراجعة الأعضاء</string>
     <!-- Title of a screen where the user will be prompted to review a message request matching the name of someone they already know -->
     <string name="ReviewCardDialogFragment__review_request">مُراجعة الطلب</string>
-    <string name="ReviewCardDialogFragment__d_group_members_have_the_same_name">%1$d من أعضاء المجموعة يحملون نفس الاسم، يُرجى مراجعة اﻷعضاء أسفله ثم القيام باﻹجراء المناسب.</string>
-    <string name="ReviewCardDialogFragment__if_youre_not_sure">إذا التبس عليك مصدر الطلب، يُرجى مراجعة جهات الاتصال أدناه والقيام بالإجراء المناسب.</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="zero">%1$d group members have the same name, review the members below and choose to take action.</item>
+        <item quantity="one">%1$d group member have the same name, review the member below and choose to take action.</item>
+        <item quantity="two">%1$d group members have the same name, review the members below and choose to take action.</item>
+        <item quantity="few">%1$d group members have the same name, review the members below and choose to take action.</item>
+        <item quantity="many">%1$d group members have the same name, review the members 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 -->
+    <plurals name="ReviewCardDialogFragment__if_youre_not_sure">
+        <item quantity="zero">If you\'re not sure who the request is from, review the contacts below and take action.</item>
+        <item quantity="one">If you\'re not sure who the request is from, review the contact below and take action.</item>
+        <item quantity="two">If you\'re not sure who the request is from, review the contacts below and take action.</item>
+        <item quantity="few">If you\'re not sure who the request is from, review the contacts below and take action.</item>
+        <item quantity="many">If you\'re not sure who the request is from, review the contacts below and take action.</item>
+        <item quantity="other">If you\'re not sure who the request is from, review the contacts below and take action.</item>
+    </plurals>
     <string name="ReviewCardDialogFragment__no_other_groups_in_common">لا وجود لمجموعات أخرى مشتركة.</string>
     <string name="ReviewCardDialogFragment__no_groups_in_common">لا وجود لمجموعات مشتركة.</string>
     <plurals name="ReviewCardDialogFragment__d_other_groups_in_common">
@@ -4616,11 +4702,28 @@
     <string name="CallParticipantsListUpdatePopupWindow__s_joined">انضم %1$s</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_and_s_joined">انضم %1$s و %2$s</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_s_and_s_joined">انضم %1$s، %2$s و%3$s</string>
-    <string name="CallParticipantsListUpdatePopupWindow__s_s_and_d_others_joined">انضم %1$s، %2$s و%3$d آخرون</string>
+    <!-- Toast message shown in group call when 3 or more people join -->
+    <plurals name="CallParticipantsListUpdatePopupWindow__s_s_and_d_others_joined">
+        <item quantity="zero">%1$s, %2$s and %3$d others joined</item>
+        <item quantity="one">%1$s, %2$s and %3$d other joined</item>
+        <item quantity="two">%1$s, %2$s and %3$d others joined</item>
+        <item quantity="few">%1$s, %2$s and %3$d others joined</item>
+        <item quantity="many">%1$s, %2$s and %3$d others joined</item>
+        <item quantity="other">%1$s, %2$s and %3$d others joined</item>
+    </plurals>
+    <!-- Toast/popup text shown when someone leaves a group call -->
     <string name="CallParticipantsListUpdatePopupWindow__s_left">غادر العضو %1$s</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_and_s_left">غادر %1$s و %2$s</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_s_and_s_left">غادر %1$s، %2$s و%3$s</string>
-    <string name="CallParticipantsListUpdatePopupWindow__s_s_and_d_others_left">غادر %1$s، %2$s و%3$d آخرون</string>
+    <!-- Toast message shown in group call when 3 or more people leave -->
+    <plurals name="CallParticipantsListUpdatePopupWindow__s_s_and_d_others_left">
+        <item quantity="zero">%1$s, %2$s and %3$d others left</item>
+        <item quantity="one">%1$s, %2$s and %3$d other left</item>
+        <item quantity="two">%1$s, %2$s and %3$d others left</item>
+        <item quantity="few">%1$s, %2$s and %3$d others left</item>
+        <item quantity="many">%1$s, %2$s and %3$d others left</item>
+        <item quantity="other">%1$s, %2$s and %3$d others left</item>
+    </plurals>
 
     <string name="CallParticipant__you">أنت</string>
     <string name="CallParticipant__you_on_another_device">أنت (في جهاز آخر)</string>
@@ -4998,10 +5101,19 @@
 
     <!-- PrivacySettingsFragment -->
     <string name="PrivacySettingsFragment__blocked">محظورة</string>
-    <string name="PrivacySettingsFragment__d_contacts">%1$d جهة اتصال</string>
+    <!-- Settings label that shows the number blocked contacts -->
+    <plurals name="PrivacySettingsFragment__d_contacts">
+        <item quantity="zero">%1$d contacts</item>
+        <item quantity="one">%1$d contact</item>
+        <item quantity="two">%1$d contacts</item>
+        <item quantity="few">%1$d contacts</item>
+        <item quantity="many">%1$d contacts</item>
+        <item quantity="other">%1$d contacts</item>
+    </plurals>
     <string name="PrivacySettingsFragment__messaging">التراسُل</string>
     <string name="PrivacySettingsFragment__disappearing_messages">الرسائل المختفية</string>
     <string name="PrivacySettingsFragment__app_security">أمان التطبيق</string>
+    <!-- This refers to the multi-tasking overview (recent apps) from the Android operating system.-->
     <string name="PrivacySettingsFragment__block_screenshots_in_the_recents_list_and_inside_the_app">منع لقطات الشاشة داخل التطبيق وفي قائمة الأحدَث</string>
     <string name="PrivacySettingsFragment__signal_message_and_calls">محادثات ومكالمات سيجنال، مناوبة الاتصالات دوما، والمُرسِل المختوم</string>
     <string name="PrivacySettingsFragment__default_timer_for_new_changes">المُهلة الافتراضية للدردشات الجديدة</string>
@@ -5058,11 +5170,14 @@
     <string name="DataAndStorageSettingsFragment__media_quality">جودة الوسائط</string>
     <string name="DataAndStorageSettingsFragment__sent_media_quality">جودة الوسائط المرسلة</string>
     <string name="DataAndStorageSettingsFragment__sending_high_quality_media_will_use_more_data">إن إرسال وسائط بجودة عالية سوف يستخدم كما أكبر من البيانات.</string>
+    <!-- Setting option that can be selected to default media to be sent as high quality by default -->
     <string name="DataAndStorageSettingsFragment__high">بالغ الأهميّة</string>
+    <!-- Setting option that can be selected to default media to be sent as standard quality by default -->
     <string name="DataAndStorageSettingsFragment__standard">قياسي</string>
     <string name="DataAndStorageSettingsFragment__calls">المكالمات</string>
 
     <!-- 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__use_custom_colors">استخدام ألوان مخصصة</string>
     <string name="ChatColorSelectionFragment__chat_color">لون الدردشة</string>
@@ -5286,6 +5401,7 @@
     <string name="AvatarPickerFragment__take_a_picture">التقط صورة</string>
     <string name="AvatarPickerFragment__choose_a_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>
     <string name="AvatarPickerFragment__clear_avatar">محو صورة الحساب</string>
@@ -5362,7 +5478,7 @@
     <string name="MediaReviewFragment__add_a_message">إضافة نص</string>
     <string name="MediaReviewFragment__add_a_reply">إضافة رد</string>
     <string name="MediaReviewFragment__send_to">إرسال إلى</string>
-    <string name="MediaReviewFragment__view_once_message">وسيط للعرض مرة واحدة</string>
+    <string name="MediaReviewFragment__view_once_message">وسائط للمُشاهدة مرة واحدة</string>
     <string name="MediaReviewFragment__one_or_more_items_were_too_large">عنصر واحد أو أكثر كان كبيرًا جدًا</string>
     <string name="MediaReviewFragment__one_or_more_items_were_invalid">عنصر واحد أو أكثر غير صالح</string>
     <string name="MediaReviewFragment__too_many_items_selected">تم تحديد عدد كبير جدًا من العناصر</string>
@@ -5975,7 +6091,7 @@
     <string name="StoryViewerFragment__s_s">‏%1$s‏%2$s‏</string>
     <!-- Displayed when viewing a post you sent -->
     <string name="StoryViewerPageFragment__you">أنت</string>
-    <!-- Displayed when viewing a post displayed to a group -->
+    <!-- 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 -->
     <string name="StoryViewerPageFragment__reply">الرَّدّ</string>
@@ -7288,5 +7404,26 @@
     <!-- Content description for opening the note editor -->
     <string name="ViewNoteSheet__edit_note">تعديل الملاحظة</string>
 
+    <!-- BackupProgressService -->
+    <!-- Notification title shown while backup restore job is running -->
+    <string name="BackupProgressService_title">تجري استعادة النسخة الاحتياطية…</string>
+    <!-- Notification title shown while downloading backup restore data -->
+    <string name="BackupProgressService_title_downloading">يَجري تنزيل البيانات الاحتياطية…</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>
+    <!-- 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 -->
+    <string name="BackupsTypeSettingsFragment__google_pay">Google Pay</string>
+    <!-- Displayed as the user\'s payment method as a label in a preference row -->
+    <string name="BackupsTypeSettingsFragment__bank_transfer">Bank transfer</string>
+    <!-- Displayed as the user\'s payment method as a label in a preference row -->
+    <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>
+
+
     <!-- 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 95d778533b..80b2602288 100644
--- a/app/src/main/res/values-az/strings.xml
+++ b/app/src/main/res/values-az/strings.xml
@@ -1,6 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- smartling.instruction_comments_enabled = on -->
-<resources>
+<?xml version="1.0" encoding="UTF-8"?><!-- 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> -->
@@ -89,6 +87,16 @@
     <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">Allow access to your location</string>
+    <!-- Dialog description that will explain the steps needed to give location permission -->
+    <string name="AttachmentManager_signal_to_send_location">To send your location:</string>
+    <!-- Alert dialog description asking for location permission -->
+    <string name="AttachmentManager_signal_allow_signal_access_location">Allow Molly access to send your location.</string>
+    <!-- Toast text explaining Signal\'s need for location access -->
+    <string name="AttachmentManager_signal_needs_location_access">Molly needs location access to send your location.</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>
     <!-- Alert dialog description to send the recipient a request to activate payments -->
@@ -241,7 +249,7 @@
     <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>
@@ -386,8 +394,16 @@
     <string name="ConversationActivity_your_request_to_join_has_been_sent_to_the_group_admin">Qoşulma tələbiniz qrup admininə göndərildi. Tələbiniz cavablandırılanda bildiriş alacaqsınız.</string>
     <string name="ConversationActivity_cancel_request">Tələbdən imtina</string>
 
-    <string name="ConversationActivity_to_send_audio_messages_allow_signal_access_to_your_microphone">Səsli mesaj göndərmək üçün, Molly-ın mikrofonunuza müraciətinə icazə verin.</string>
+    <!-- Dialog title asking users for microphone permission -->
+    <string name="ConversationActivity_allow_access_microphone">Allow access to your microphone</string>
+    <!-- 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>
+    <!-- Toast text explaining Signal\'s need for microphone access -->
+    <string name="ConversationActivity_signal_needs_microphone_access_voice_message">Molly needs microphone access to record a voice message.</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">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>
@@ -411,10 +427,17 @@
     <string name="ConversationActivity_you_will_leave_this_group_and_it_will_be_deleted_from_all_of_your_devices">Bu qrupu tərk edəcəksiniz və bütün cihazlarınızdan silinəcək.</string>
     <string name="ConversationActivity_delete">Sil</string>
     <string name="ConversationActivity_delete_and_leave">Sil və tərk et</string>
-    <string name="ConversationActivity__to_call_s_signal_needs_access_to_your_microphone">%1$s əlaqəsinə zəng etmək üçün, Molly-ın mikrofonunuza müraciətinə ehtiyac var</string>
+
+    <!-- Dialog description that will explain the steps needed to give microphone permissions for a voice call -->
+    <string name="ConversationActivity__to_start_call">To start a 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">To start a call, allow Molly access to your microphone.</string>
+    <!-- Toast text explaining Signal\'s need for microphone access for a voice call -->
+    <string name="ConversationActivity_signal_needs_microphone_access_voice_call">Molly needs microphone access to start a call.</string>
 
 
     <string name="ConversationActivity_join">Qoşul</string>
+    <!-- Button text for an active group call but the call is currently full and unjoinable -->
     <string name="ConversationActivity_full">Dolub</string>
 
     <string name="ConversationActivity_error_sending_media">Mesaj göndərmə xətası</string>
@@ -613,6 +636,7 @@
     <string name="ConversationListFragment_unarchive">Arxivdən çıxar</string>
     <string name="ConversationListFragment_delete">Sil</string>
     <string name="ConversationListFragment_select_all">Hamısını seç</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 seçildi</item>
         <item quantity="other">%1$d seçildi</item>
@@ -864,6 +888,7 @@
         <item quantity="one">Dəvət göndərildi</item>
         <item quantity="other">%1$d dəvət göndərildi</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">\"%1$s\", sizin tərəfinizdən bu qrupa avtomatik olaraq əlavə edilə bilməz. Qoşulması üçün dəvət göndərildi və qəbul edənə qədər qrup mesajını görməyəcəklər.</string>
     <string name="GroupManagement_invite_multiple_users">Bu istifadəçiləri bu qrupa avtomatik olaraq əlavə edə bilməzsiniz.\n\nQoşulmaq üçün dəvət göndərildi və qəbul edənə qədər qrup mesajlarını görməyəcəklər.</string>
 
@@ -1044,7 +1069,9 @@
 
     <string name="ManageGroupActivity_edit_name_and_picture">Ada və şəklə düzəliş et</string>
     <string name="ManageGroupActivity_legacy_group">Köhnə Qrup</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">Bu bir Köhnə Qrupdur. Qrup adminləri kimi özəlliklər, yalnız Yeni Qruplar üçün əlçatandır.</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">Bu bir Köhnə Qrupdur. @adçəkmələr və adminlər kimi yeni özəllikərə müraciət etmək üçün,</string>
     <string name="ManageGroupActivity_legacy_group_too_large">Bu Köhnə Qrup çox böyük olduğu üçün yüksəldilə bilmir. Maksimum qrup ölçüsü %1$d.</string>
     <string name="ManageGroupActivity_upgrade_this_group">bu qrupu yüksəldin.</string>
@@ -1271,6 +1298,7 @@
         <item quantity="other">Sil</item>
     </plurals>
 
+    <!-- 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 seçildi (%2$s)</item>
         <item quantity="other">%1$d seçildi (%2$s)</item>
@@ -1335,17 +1363,13 @@
     <string name="MessageRecord_left_group">Qrupu tərk etdiniz.</string>
     <string name="MessageRecord_you_updated_group">Qrupu yenilədiniz.</string>
     <string name="MessageRecord_the_group_was_updated">Qrup yeniləndi.</string>
-    <!-- Update message shown when placing an outgoing 1:1 voice/audio call and it\'s answered by the other party -->
+    <!-- Update message shown when placing an outgoing 1:1 voice/audio call -->
     <string name="MessageRecord_outgoing_voice_call">Gedən audio zəng</string>
-    <!-- Update message shown when placing an outgoing 1:1 video call and it\'s answered by the other party -->
+    <!-- Update message shown when placing an outgoing 1:1 video call -->
     <string name="MessageRecord_outgoing_video_call">Gedən video zəng</string>
-    <!-- Update message shown when placing an outgoing 1:1 voice/audio call and it\'s not answered by the other party -->
-    <string name="MessageRecord_unanswered_voice_call">Cavablanmamış audio zəng</string>
-    <!-- Update message shown when placing an outgoing 1:1 video call and it\'s not answered by the other party -->
-    <string name="MessageRecord_unanswered_video_call">Cavablanmamış video zəng</string>
-    <!-- Update message shown when receiving an incoming 1:1 voice/audio call and it\'s answered -->
+    <!-- Update message shown when receiving an incoming 1:1 voice/audio call and it\'s answered or ringing -->
     <string name="MessageRecord_incoming_voice_call">Gələn audio zəng</string>
-    <!-- Update message shown when receiving an incoming 1:1 video call and answered -->
+    <!-- Update message shown when receiving an incoming 1:1 video call and answered or ringing -->
     <string name="MessageRecord_incoming_video_call">Gələn video zəng</string>
     <!-- Update message shown when receiving an incoming 1:1 voice/audio call and not answered -->
     <string name="MessageRecord_missed_voice_call">Buraxılmış audio zəng</string>
@@ -1355,10 +1379,6 @@
     <string name="MessageRecord_missed_voice_call_notification_profile">Profil statusu aktiv ikən buraxılmış səsli zəng</string>
     <!-- Update message shown when receiving an incoming video call and declined due to notification profile -->
     <string name="MessageRecord_missed_video_call_notification_profile">Profil statusu aktiv ikən buraxılmış video zəng</string>
-    <!-- Update message shown when receiving an incoming 1:1 voice/audio call and explicitly declined -->
-    <string name="MessageRecord_you_declined_a_voice_call">Bir audio zəngi rədd etdiniz</string>
-    <!-- Update message shown when receiving an incoming 1:1 video call and explicitly declined -->
-    <string name="MessageRecord_you_declined_a_video_call">Bir video zəngi rədd etdiniz</string>
     <!-- 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 qrupu yenilədi.</string>
@@ -1567,28 +1587,53 @@
     <string name="MessageRecord_can_accept_payments">%1$s artıq Ödənişləri qəbul edə bilər</string>
 
     <!-- Group Calling update messages -->
-    <string name="MessageRecord_s_started_a_group_call_s">%1$s bir qrup zəngi başlatdı · %2$s</string>
-    <string name="MessageRecord_you_started_a_group_call_s">Qrup zənginə başlama vaxtınız · %1$s</string>
-    <string name="MessageRecord_s_is_in_the_group_call_s">%1$s qrup zəngindədir · %2$s</string>
-    <string name="MessageRecord_you_are_in_the_group_call_s1">Qrup zəngindəsiniz · %1$s</string>
-    <string name="MessageRecord_s_and_s_are_in_the_group_call_s1">%1$s və %2$s qrup zəngindədir · %3$s</string>
-    <string name="MessageRecord_group_call_s">Qrup zəngi · %1$s</string>
-
-    <string name="MessageRecord_s_started_a_group_call">%1$s bir qrup zəngi başlatdı</string>
-    <string name="MessageRecord_you_started_a_group_call">Bir qrup zəngi başlatdınız</string>
-    <string name="MessageRecord_s_is_in_the_group_call">%1$s qrup zəngindədir</string>
-    <string name="MessageRecord_you_are_in_the_group_call">Qrup zəngindəsiniz</string>
-    <string name="MessageRecord_s_and_s_are_in_the_group_call">%1$s və %2$s qrup zəngindədir</string>
-    <string name="MessageRecord_group_call">Qrup zəngi</string>
+    <!-- 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 zəngə qoşulub · %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">Zəngə qoşuldunuz · %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 və %2$s zəngə qoşuldular · %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 zəngə qoşuldu</string>
+    <!-- Chat log text for an ongoing group call only the local user has joined -->
+    <string name="MessageRecord_you_are_in_the_call">Siz zəngə qoşuldunuz</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 və %2$s zəngə qoşuldular</string>
+    <!-- Chat log text for a group call that ended within the last 5 minutes -->
+    <string name="MessageRecord__the_video_call_has_ended">Video zəng başa çatdı</string>
+    <!-- Chat log text for a group call that ended within the last 5 minutes with a placeholder for formatted time -->
+    <string name="MessageRecord__the_video_call_has_ended_s">Video zəng · %1$s başa çatdı</string>
+    <!-- Chat log text for a group call that ended more than 5 minutes ago and was missed -->
+    <string name="MessageRecord__missed_video_call">Buraxılmış video zəng</string>
+    <!-- Chat log text for a group call that ended more than 5 minutes ago and was missed with a placeholder for formatted time -->
+    <string name="MessageRecord__missed_video_call_s">Cavabsız görüntülü zəng · %1$s</string>
+    <!-- Chat log text for a group call that ended that the local user did not start -->
+    <string name="MessageRecord__incoming_video_call">Gələn video zəng</string>
+    <!-- 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">Gələn video zəng · %1$s</string>
+    <!-- Chat log text for a group call that ended that the local user started -->
+    <string name="MessageRecord__outgoing_video_call">Gedən video zəng</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">Gedən video zəng · %1$s</string>
+    <!-- Chat log text for an ongoing group call that the local user started -->
+    <string name="MessageRecord__you_started_a_video_call">Video zəngə başladınız</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">Video zəngə başladınız · %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 video zəngə başladı</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 video zəngə başladı · %2$s</string>
 
     <string name="MessageRecord_you">Siz</string>
 
-    <plurals name="MessageRecord_s_s_and_d_others_are_in_the_group_call_s">
+    <!-- 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 və digər %3$d nəfər qrup zəngindədir · %4$s</item>
         <item quantity="other">%1$s, %2$s və digər %3$d nəfər qrup zəngindədir · %4$s</item>
     </plurals>
 
-    <plurals name="MessageRecord_s_s_and_d_others_are_in_the_group_call">
+    <!-- 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 və digər %3$d nəfər qrup zəngindədir</item>
         <item quantity="other">%1$s, %2$s və digər %3$d nəfər qrup zəngindədir</item>
     </plurals>
@@ -2063,6 +2108,7 @@
     <!-- Generic error when the app is unable to request an SMS code for an unknown reason. -->
     <string name="RegistrationActivity_unable_to_request_verification_code">Təsdiq kodunu tələb etmək mümkün deyil. Şəbəkə bağlantınızı yoxlayıb yenidən cəhd edin.</string>
     <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">Molly Android - Telefon nömrə formatı</string>
     <!--    Small "toast" notification to the user confirming that they have requested a new code via voice call.-->
@@ -2207,7 +2253,7 @@
     <string name="SubmitDebugLogActivity_this_log_will_be_posted_publicly_online_for_contributors">Bu jurnal, töhfə verənlərin görməsi üçün ictimai olaraq paylaşılacaq. Yükləməzdən əvvəl yoxlaya bilərsiniz.</string>
 
     <!-- SupportEmailUtil -->
-  <!-- Removed by excludeNonTranslatables <string name="SupportEmailUtil_support_email" translatable="false">support@molly.im</string> -->
+  <!-- Removed by excludeNonTranslatables <string name="SupportEmailUtil_support_email" translatable="false">support@signal.org</string> -->
     <string name="SupportEmailUtil_filter">Filtr:</string>
     <string name="SupportEmailUtil_device_info">Cihaz məlumatı:</string>
     <string name="SupportEmailUtil_android_version">Android versiyası:</string>
@@ -2709,6 +2755,8 @@
     <string name="ConversationUpdateItem_loading">Yüklənir</string>
     <string name="ConversationUpdateItem_learn_more">Daha ətraflı</string>
     <string name="ConversationUpdateItem_join_call">Zəngə qoşul</string>
+    <!-- Action button label for starting a new call in the current conversation -->
+    <string name="ConversationUpdateItem_call_back">Geri zəng</string>
     <string name="ConversationUpdateItem_return_to_call">Zəngə qayıt</string>
     <string name="ConversationUpdateItem_call_is_full">Zəng dolub</string>
     <string name="ConversationUpdateItem_invite_friends">Dostlarını dəvət et</string>
@@ -2773,6 +2821,7 @@
     <string name="safety_number_change_dialog__leave_call">Zəngi tərk et</string>
     <string name="safety_number_change_dialog__the_following_people_may_have_reinstalled_or_changed_devices">Aşağıdakı şəxslər yenidən quraşdırmış və ya cihazlarını dəyişdirmiş ola bilər. Gizliliyin təmin olunduğuna əmin olmaq üçün güvənlik nömrənizi təsdiqləyin.</string>
     <string name="safety_number_change_dialog__view">Bax</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">Daha əvvəl təsdiqlənib</string>
 
     <!-- EnableCallNotificationSettingsDialog__call_notifications_checklist -->
@@ -3086,6 +3135,7 @@
 
     <string name="arrays__default">İlkin</string>
     <string name="arrays__high">Yüksək</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">Maksimum</string>
 
     <!-- plurals.xml -->
@@ -3357,7 +3407,7 @@
     <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, 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>
@@ -3406,6 +3456,14 @@
     <!-- Storage permission row description -->
     <string name="GrantPermissionsFragment__send_photos_videos_and_files">Cihazınızdan şəkillər, videolar və fayllar göndərin.</string>
 
+    <!-- PermissionDeniedBottomSheet -->
+    <!-- Sheet describing step 1 on how to give permissions by opening settings -->
+    <string name="PermissionDeniedBottomSheet__1_tap_settings_below">1. Tap “Settings” below</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 Allow the permission</string>
+    <!-- Label for button at the bottom of the sheet which opens the system permission settings -->
+    <string name="PermissionDeniedBottomSheet__settings">Settings</string>
+
     <!-- PaymentsSecuritySetupFragment -->
     <!-- Toolbar title -->
     <string name="PaymentsSecuritySetupFragment__security_setup">Təhlükəsizlik quraşdırması</string>
@@ -3446,6 +3504,7 @@
     <string name="PaymentsDetailsFragment__sent_to_s">Göndərildi: %1$s</string>
     <string name="PaymentsDetailsFragment__you_on_s_at_s">%1$s, %2$s</string>
     <string name="PaymentsDetailsFragment__s_on_s_at_s">%2$s , %3$s %1$s</string>
+    <!-- Prefix to a name to indicate who a payment was sent to -->
     <string name="PaymentsDetailsFragment__to">Alıcı</string>
     <string name="PaymentsDetailsFragment__from">Göndərən</string>
     <string name="PaymentsDetailsFragment__information">Ödəniş miqdarı və əməliyyat vaxtını əhatə edən əməliyyat təfərrüatları MobileCoin Ledger-in bir hissəsidir.</string>
@@ -3508,6 +3567,7 @@
     <string name="ConfirmPayment__confirm_payment">Ödənişi təsdiqləyin</string>
     <string name="ConfirmPayment__network_fee">Şəbəkə haqqı</string>
     <string name="ConfirmPayment__estimated_s">Təxminən %1$s</string>
+    <!-- Prefix to a name to indicate who a payment will be sent to -->
     <string name="ConfirmPayment__to">Bura</string>
     <string name="ConfirmPayment__total_amount">Cəmi məbləğ</string>
     <string name="ConfirmPayment__balance_s">Balans: %1$s</string>
@@ -3658,6 +3718,14 @@
     <string name="conversation_group_options__conversation">Çat</string>
     <string name="conversation_group_options__broadcast">Yayım</string>
 
+    <!-- DoubleTapEditEducationSheet -->
+    <!-- Displayed as the title of the education bottom sheet -->
+    <string name="DoubleTapEditEducationSheet__double_tap_edit_title">Double tap to edit</string>
+    <!-- Text on the sheet explaining how double tapping on a message will let them edit it -->
+    <string name="DoubleTapEditEducationSheet__quickly_tap_twice">Quickly tap twice on your messages to edit them. You can edit your messages up to 24hrs after they’ve been sent.</string>
+    <!-- Button label to dismiss sheet -->
+    <string name="DoubleTapEditEducationSheet__got_it">Got it</string>
+
     <!-- text_secure_normal -->
     <string name="text_secure_normal__menu_new_group">Yeni qrup</string>
     <string name="text_secure_normal__menu_settings">Tənzimləmələr</string>
@@ -4112,6 +4180,7 @@
     <string name="RecipientBottomSheet_copied_to_clipboard">Lövhəyə kopyalandı</string>
 
     <string name="GroupRecipientListItem_admin">Admin</string>
+    <!-- Button text to approve a user that has requested to join a group -->
     <string name="GroupRecipientListItem_approve_description">Təsdiqlə</string>
     <string name="GroupRecipientListItem_deny_description">Rədd et</string>
 
@@ -4139,6 +4208,7 @@
 
     <!-- VoiceNoteMediaDescriptionCompatFactory -->
     <string name="VoiceNoteMediaItemFactory__voice_message">Səsli mesaj · %1$s</string>
+    <!-- This is a title in a banner describing the conversation sender to receiver placeholders of the currently playing voice memo. -->
     <string name="VoiceNoteMediaItemFactory__s_to_s">%1$s - %2$s</string>
 
     <!-- StorageUtil -->
@@ -4152,8 +4222,16 @@
     <string name="ReviewCardDialogFragment__review_members">Üzvləri nəzərdən keçir</string>
     <!-- Title of a screen where the user will be prompted to review a message request matching the name of someone they already know -->
     <string name="ReviewCardDialogFragment__review_request">Tələbi nəzərdən keçir</string>
-    <string name="ReviewCardDialogFragment__d_group_members_have_the_same_name">%1$d qrup üzvü eyni ada sahibdir, aşağıda nəzərdən keçirərək seçim edə bilərsiniz.</string>
-    <string name="ReviewCardDialogFragment__if_youre_not_sure">Tələbin kimdən gəldiyinə əmin deyilsinizsə, aşağıdakı əlaqələri nəzərdən keçirib seçim edin.</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="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 -->
+    <plurals name="ReviewCardDialogFragment__if_youre_not_sure">
+        <item quantity="one">If you\'re not sure who the request is from, review the contact below and take action.</item>
+        <item quantity="other">If you\'re not sure who the request is from, review the contacts below and take action.</item>
+    </plurals>
     <string name="ReviewCardDialogFragment__no_other_groups_in_common">Başqa ortaq qrup yoxdur.</string>
     <string name="ReviewCardDialogFragment__no_groups_in_common">Heç bir ortaq qrup yoxdur.</string>
     <plurals name="ReviewCardDialogFragment__d_other_groups_in_common">
@@ -4184,11 +4262,20 @@
     <string name="CallParticipantsListUpdatePopupWindow__s_joined">%1$s qoşuldu</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_and_s_joined">%1$s və %2$s qoşuldu</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_s_and_s_joined">%1$s, %2$s və %3$s qoşuldu</string>
-    <string name="CallParticipantsListUpdatePopupWindow__s_s_and_d_others_joined">%1$s, %2$s və digər %3$d nəfər qoşuldu</string>
+    <!-- Toast message shown in group call when 3 or more people join -->
+    <plurals name="CallParticipantsListUpdatePopupWindow__s_s_and_d_others_joined">
+        <item quantity="one">%1$s, %2$s and %3$d other joined</item>
+        <item quantity="other">%1$s, %2$s and %3$d others joined</item>
+    </plurals>
+    <!-- Toast/popup text shown when someone leaves a group call -->
     <string name="CallParticipantsListUpdatePopupWindow__s_left">%1$s nəfər qaldı</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_and_s_left">%1$s və %2$s nəfər qaldı</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_s_and_s_left">%1$s, %2$s və %3$s nəfər qaldı</string>
-    <string name="CallParticipantsListUpdatePopupWindow__s_s_and_d_others_left">%1$s, %2$s və digər %3$d nəfər qaldı</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 and %3$d other left</item>
+        <item quantity="other">%1$s, %2$s and %3$d others left</item>
+    </plurals>
 
     <string name="CallParticipant__you">Siz</string>
     <string name="CallParticipant__you_on_another_device">Siz (başqa cihazda)</string>
@@ -4558,10 +4645,15 @@
 
     <!-- PrivacySettingsFragment -->
     <string name="PrivacySettingsFragment__blocked">Bloklandı</string>
-    <string name="PrivacySettingsFragment__d_contacts">%1$d əlaqə</string>
+    <!-- Settings label that shows the number blocked contacts -->
+    <plurals name="PrivacySettingsFragment__d_contacts">
+        <item quantity="one">%1$d contact</item>
+        <item quantity="other">%1$d contacts</item>
+    </plurals>
     <string name="PrivacySettingsFragment__messaging">Mesajlaşma</string>
     <string name="PrivacySettingsFragment__disappearing_messages">Yox olan mesajlar</string>
     <string name="PrivacySettingsFragment__app_security">Tətbiq təhlükəsizliyi</string>
+    <!-- This refers to the multi-tasking overview (recent apps) from the Android operating system.-->
     <string name="PrivacySettingsFragment__block_screenshots_in_the_recents_list_and_inside_the_app">Sonuncular siyahısında və tətbiq daxilində ekran şəkillərini blokla</string>
     <string name="PrivacySettingsFragment__signal_message_and_calls">Signal mesajları və zəngləri, zəng köçürmə və gizli göndərən</string>
     <string name="PrivacySettingsFragment__default_timer_for_new_changes">Yeni çatlar üçün standart taymer</string>
@@ -4618,11 +4710,14 @@
     <string name="DataAndStorageSettingsFragment__media_quality">Media keyfiyyəti</string>
     <string name="DataAndStorageSettingsFragment__sent_media_quality">Göndərilən media keyfiyyəti</string>
     <string name="DataAndStorageSettingsFragment__sending_high_quality_media_will_use_more_data">Yüksək keyfiyyətli media göndərərkən, daha çox verilənlər istifadə ediləcək.</string>
+    <!-- Setting option that can be selected to default media to be sent as high quality by default -->
     <string name="DataAndStorageSettingsFragment__high">Yüksək</string>
+    <!-- Setting option that can be selected to default media to be sent as standard quality by default -->
     <string name="DataAndStorageSettingsFragment__standard">Standard</string>
     <string name="DataAndStorageSettingsFragment__calls">Zənglər</string>
 
     <!-- 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">Avto</string>
     <string name="ChatColorSelectionFragment__use_custom_colors">Özəl rənglər istifadə et</string>
     <string name="ChatColorSelectionFragment__chat_color">Çat ekranının rəngi</string>
@@ -4834,6 +4929,7 @@
     <string name="AvatarPickerFragment__take_a_picture">Bir şəkil çəkin</string>
     <string name="AvatarPickerFragment__choose_a_photo">Bir foto seçin</string>
     <string name="AvatarPickerFragment__photo">Foto</string>
+    <!-- Button label during avatar selection/creation that when tapped lets you generate an avatar from typed in text. -->
     <string name="AvatarPickerFragment__text">Mətn</string>
     <string name="AvatarPickerFragment__save">Saxla</string>
     <string name="AvatarPickerFragment__clear_avatar">Avatarı təmizlə</string>
@@ -4894,7 +4990,7 @@
     <string name="MediaReviewFragment__add_a_message">Bir mesaj əlavə et</string>
     <string name="MediaReviewFragment__add_a_reply">Bir cavab əlavə et</string>
     <string name="MediaReviewFragment__send_to">Göndər</string>
-    <string name="MediaReviewFragment__view_once_message">Bir dəfə baxıla bilən mesaj</string>
+    <string name="MediaReviewFragment__view_once_message">Bir dəfə göstərilən media faylı</string>
     <string name="MediaReviewFragment__one_or_more_items_were_too_large">Bir və ya daha çox element çox böyük idi</string>
     <string name="MediaReviewFragment__one_or_more_items_were_invalid">Bir və ya daha çox element etibarsız idi</string>
     <string name="MediaReviewFragment__too_many_items_selected">Həddindən çox element seçildi</string>
@@ -5487,7 +5583,7 @@
     <string name="StoryViewerFragment__s_s">%1$s %2$s</string>
     <!-- Displayed when viewing a post you sent -->
     <string name="StoryViewerPageFragment__you">Siz</string>
-    <!-- Displayed when viewing a post displayed to a group -->
+    <!-- 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 -->
     <string name="StoryViewerPageFragment__reply">Cavabla</string>
@@ -6704,5 +6800,26 @@
     <!-- Content description for opening the note editor -->
     <string name="ViewNoteSheet__edit_note">Qeydi redaktə et</string>
 
+    <!-- BackupProgressService -->
+    <!-- Notification title shown while backup restore job is running -->
+    <string name="BackupProgressService_title">Ehtiyat nüsxə bərpa olunur…</string>
+    <!-- Notification title shown while downloading backup restore data -->
+    <string name="BackupProgressService_title_downloading">Ehtiyat nüsxə verilənləri endirilir…</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>
+    <!-- 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 -->
+    <string name="BackupsTypeSettingsFragment__google_pay">Google Pay</string>
+    <!-- Displayed as the user\'s payment method as a label in a preference row -->
+    <string name="BackupsTypeSettingsFragment__bank_transfer">Bank transfer</string>
+    <!-- Displayed as the user\'s payment method as a label in a preference row -->
+    <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>
+
+
     <!-- 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 6870a19a61..6960314288 100644
--- a/app/src/main/res/values-bg/strings.xml
+++ b/app/src/main/res/values-bg/strings.xml
@@ -1,6 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- smartling.instruction_comments_enabled = on -->
-<resources>
+<?xml version="1.0" encoding="UTF-8"?><!-- 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> -->
@@ -89,6 +87,16 @@
     <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">Allow access to your location</string>
+    <!-- Dialog description that will explain the steps needed to give location permission -->
+    <string name="AttachmentManager_signal_to_send_location">To send your location:</string>
+    <!-- Alert dialog description asking for location permission -->
+    <string name="AttachmentManager_signal_allow_signal_access_location">Allow Molly access to send your location.</string>
+    <!-- Toast text explaining Signal\'s need for location access -->
+    <string name="AttachmentManager_signal_needs_location_access">Molly needs location access to send your location.</string>
+
     <!-- Alert dialog title to show the recipient has not activated payments -->
     <string name="AttachmentManager__not_activated_payments">%1$s няма активирани Плащания </string>
     <!-- Alert dialog description to send the recipient a request to activate payments -->
@@ -241,7 +249,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>
@@ -386,8 +394,16 @@
     <string name="ConversationActivity_your_request_to_join_has_been_sent_to_the_group_admin">Заявката ви за присъединяване към групата е изпратена до администратора ѝ. Ще бъдете уведомени, когата те вземат решение.</string>
     <string name="ConversationActivity_cancel_request">Отказване на заявката</string>
 
-    <string name="ConversationActivity_to_send_audio_messages_allow_signal_access_to_your_microphone">За да изпратите аудио съобщение, разрешете достъпа на Molly до микрофона.</string>
+    <!-- Dialog title asking users for microphone permission -->
+    <string name="ConversationActivity_allow_access_microphone">Allow access to your microphone</string>
+    <!-- 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>
+    <!-- Toast text explaining Signal\'s need for microphone access -->
+    <string name="ConversationActivity_signal_needs_microphone_access_voice_message">Molly needs microphone access to record a voice message.</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">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>
@@ -411,10 +427,17 @@
     <string name="ConversationActivity_you_will_leave_this_group_and_it_will_be_deleted_from_all_of_your_devices">Ще напуснете тази група и тя ще бъде изтрита от всичките ви устройства.</string>
     <string name="ConversationActivity_delete">Изтриване</string>
     <string name="ConversationActivity_delete_and_leave">Изтриване и напускане</string>
-    <string name="ConversationActivity__to_call_s_signal_needs_access_to_your_microphone">За да се обадите на %1$s, Molly се нуждае от достъп до микрофона ви</string>
+
+    <!-- Dialog description that will explain the steps needed to give microphone permissions for a voice call -->
+    <string name="ConversationActivity__to_start_call">To start a 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">To start a call, allow Molly access to your microphone.</string>
+    <!-- Toast text explaining Signal\'s need for microphone access for a voice call -->
+    <string name="ConversationActivity_signal_needs_microphone_access_voice_call">Molly needs microphone access to start a call.</string>
 
 
     <string name="ConversationActivity_join">Присъедини се</string>
+    <!-- Button text for an active group call but the call is currently full and unjoinable -->
     <string name="ConversationActivity_full">Пълно</string>
 
     <string name="ConversationActivity_error_sending_media">Грешка при изпращане на медиен файл</string>
@@ -613,6 +636,7 @@
     <string name="ConversationListFragment_unarchive">Разархивиране</string>
     <string name="ConversationListFragment_delete">Изтриване</string>
     <string name="ConversationListFragment_select_all">Избери всичко</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 избрано</item>
         <item quantity="other">%1$d избрани</item>
@@ -864,6 +888,7 @@
         <item quantity="one">Поканата е изпратена</item>
         <item quantity="other">Изпратени са %1$d покани</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">Не можете да добавите \"%1$s\" автоматично към тази група. Той/тя е получил/а покана за присъединяване и няма да вижда съобщенията в групата, преди да приеме.</string>
     <string name="GroupManagement_invite_multiple_users">Не можете да добавите тези потребители автоматично към групата. Те са получили покани да се присъединят и няма да виждат съобщенията в групата, преди да приемат.</string>
 
@@ -1044,7 +1069,9 @@
 
     <string name="ManageGroupActivity_edit_name_and_picture">Редактирайте име и снимка</string>
     <string name="ManageGroupActivity_legacy_group">Стар вид група</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">Това е група от стар вид. Функции като администратори на групи са достъпни само за нов вид групи.</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">Това е група от стар вид. За достъп до нови функции като @споменавяния и администратори,</string>
     <string name="ManageGroupActivity_legacy_group_too_large">Тази група не може да бъде обновена до Нова, защото е прекалено голяма. Максиналният размер на група е %1$d.</string>
     <string name="ManageGroupActivity_upgrade_this_group">Обновете тази група</string>
@@ -1271,6 +1298,7 @@
         <item quantity="other">Изтриване</item>
     </plurals>
 
+    <!-- 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 избрано (%2$s)</item>
         <item quantity="other">%1$d избрани (%2$s)</item>
@@ -1335,17 +1363,13 @@
     <string name="MessageRecord_left_group">Напуснахте групата.</string>
     <string name="MessageRecord_you_updated_group">Обновихте групата.</string>
     <string name="MessageRecord_the_group_was_updated">Групата беше актуализирана.</string>
-    <!-- Update message shown when placing an outgoing 1:1 voice/audio call and it\'s answered by the other party -->
+    <!-- Update message shown when placing an outgoing 1:1 voice/audio call -->
     <string name="MessageRecord_outgoing_voice_call">Изходящо гласово повикване</string>
-    <!-- Update message shown when placing an outgoing 1:1 video call and it\'s answered by the other party -->
+    <!-- Update message shown when placing an outgoing 1:1 video call -->
     <string name="MessageRecord_outgoing_video_call">Изходящо видео повикване</string>
-    <!-- Update message shown when placing an outgoing 1:1 voice/audio call and it\'s not answered by the other party -->
-    <string name="MessageRecord_unanswered_voice_call">Гласово повикване без отговор</string>
-    <!-- Update message shown when placing an outgoing 1:1 video call and it\'s not answered by the other party -->
-    <string name="MessageRecord_unanswered_video_call">Видео повикване без отговор</string>
-    <!-- Update message shown when receiving an incoming 1:1 voice/audio call and it\'s answered -->
+    <!-- Update message shown when receiving an incoming 1:1 voice/audio call and it\'s answered or ringing -->
     <string name="MessageRecord_incoming_voice_call">Входящо гласово повикване</string>
-    <!-- Update message shown when receiving an incoming 1:1 video call and answered -->
+    <!-- Update message shown when receiving an incoming 1:1 video call and answered or ringing -->
     <string name="MessageRecord_incoming_video_call">Входящо видео повикване</string>
     <!-- Update message shown when receiving an incoming 1:1 voice/audio call and not answered -->
     <string name="MessageRecord_missed_voice_call">Пропуснато гласово повикване</string>
@@ -1355,10 +1379,6 @@
     <string name="MessageRecord_missed_voice_call_notification_profile">Пропуснато гласово обаждане при включен профил за известия</string>
     <!-- Update message shown when receiving an incoming video call and declined due to notification profile -->
     <string name="MessageRecord_missed_video_call_notification_profile">Пропуснато видео обаждане при включен профил за известия</string>
-    <!-- Update message shown when receiving an incoming 1:1 voice/audio call and explicitly declined -->
-    <string name="MessageRecord_you_declined_a_voice_call">Отказахте гласово повикване</string>
-    <!-- Update message shown when receiving an incoming 1:1 video call and explicitly declined -->
-    <string name="MessageRecord_you_declined_a_video_call">Отказахте видео повикване</string>
     <!-- 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>
@@ -1567,28 +1587,53 @@
     <string name="MessageRecord_can_accept_payments">%1$s вече може да приема Плащания</string>
 
     <!-- Group Calling update messages -->
-    <string name="MessageRecord_s_started_a_group_call_s">%1$s започна групов разговор · %2$s</string>
-    <string name="MessageRecord_you_started_a_group_call_s">Започнахте групово повикване · %1$s</string>
-    <string name="MessageRecord_s_is_in_the_group_call_s">%1$s е в групов разговор · %2$s</string>
-    <string name="MessageRecord_you_are_in_the_group_call_s1">Вие сте в групов разговор · %1$s</string>
-    <string name="MessageRecord_s_and_s_are_in_the_group_call_s1">%1$s и %2$s са в групов разговор · %3$s</string>
-    <string name="MessageRecord_group_call_s">Групов разговор · %1$s</string>
-
-    <string name="MessageRecord_s_started_a_group_call">%1$s започна групов разговор</string>
-    <string name="MessageRecord_you_started_a_group_call">Започнахте групово повикване</string>
-    <string name="MessageRecord_s_is_in_the_group_call">%1$s е в груповия разговор</string>
-    <string name="MessageRecord_you_are_in_the_group_call">Вие сте в груповия разговор</string>
-    <string name="MessageRecord_s_and_s_are_in_the_group_call">%1$s и %2$s са в груповия разговор</string>
-    <string name="MessageRecord_group_call">Групов разговор</string>
+    <!-- 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 е в разговора · %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">Вие сте в разговора · %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 и %2$s са в разговора · %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 е в разговора</string>
+    <!-- Chat log text for an ongoing group call only the local user has joined -->
+    <string name="MessageRecord_you_are_in_the_call">Вие сте в разговора</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 и %2$s са в разговора</string>
+    <!-- Chat log text for a group call that ended within the last 5 minutes -->
+    <string name="MessageRecord__the_video_call_has_ended">Видео обаждането приключи</string>
+    <!-- Chat log text for a group call that ended within the last 5 minutes with a placeholder for formatted time -->
+    <string name="MessageRecord__the_video_call_has_ended_s">Видео обаждането приключи · %1$s</string>
+    <!-- Chat log text for a group call that ended more than 5 minutes ago and was missed -->
+    <string name="MessageRecord__missed_video_call">Пропуснато видео повикване</string>
+    <!-- Chat log text for a group call that ended more than 5 minutes ago and was missed with a placeholder for formatted time -->
+    <string name="MessageRecord__missed_video_call_s">Пропуснато видео обаждане преди · %1$s</string>
+    <!-- Chat log text for a group call that ended that the local user did not start -->
+    <string name="MessageRecord__incoming_video_call">Входящо видео повикване</string>
+    <!-- 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">Входящо видео обаждане · %1$s</string>
+    <!-- Chat log text for a group call that ended that the local user started -->
+    <string name="MessageRecord__outgoing_video_call">Изходящо видео повикване</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">Изходящо видео обаждане · %1$s</string>
+    <!-- Chat log text for an ongoing group call that the local user started -->
+    <string name="MessageRecord__you_started_a_video_call">Започнахте видео обаждане</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">Започнахте видео обаждане · %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 започна видео обаждане</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 започна видео обаждане · %2$s</string>
 
     <string name="MessageRecord_you">Вие</string>
 
-    <plurals name="MessageRecord_s_s_and_d_others_are_in_the_group_call_s">
+    <!-- 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 и %3$d друг са в груповия разговор · %4$s</item>
         <item quantity="other">%1$s, %2$s и %3$d други са в груповия разговор · %4$s</item>
     </plurals>
 
-    <plurals name="MessageRecord_s_s_and_d_others_are_in_the_group_call">
+    <!-- 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 и %3$d друг са в груповия разговор</item>
         <item quantity="other">%1$s, %2$s и %3$d други са в груповия разговор</item>
     </plurals>
@@ -2063,6 +2108,7 @@
     <!-- Generic error when the app is unable to request an SMS code for an unknown reason. -->
     <string name="RegistrationActivity_unable_to_request_verification_code">Неуспешно искане на код за потвърждение. Моля, проверете мрежовата си връзка и опитайте отново.</string>
     <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">Molly Android – Формат на телефонен номер</string>
     <!--    Small "toast" notification to the user confirming that they have requested a new code via voice call.-->
@@ -2207,7 +2253,7 @@
     <string name="SubmitDebugLogActivity_this_log_will_be_posted_publicly_online_for_contributors">Тези записки ще бъдат публикувани онлайн за разглеждане от доброволци. Може да го прегледате, преди да го качите.</string>
 
     <!-- SupportEmailUtil -->
-  <!-- Removed by excludeNonTranslatables <string name="SupportEmailUtil_support_email" translatable="false">support@molly.im</string> -->
+  <!-- Removed by excludeNonTranslatables <string name="SupportEmailUtil_support_email" translatable="false">support@signal.org</string> -->
     <string name="SupportEmailUtil_filter">Филтър:</string>
     <string name="SupportEmailUtil_device_info">Информация за устройството:</string>
     <string name="SupportEmailUtil_android_version">Версия на Android:</string>
@@ -2709,6 +2755,8 @@
     <string name="ConversationUpdateItem_loading">Зареждане</string>
     <string name="ConversationUpdateItem_learn_more">Научете повече</string>
     <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_call_is_full">Обаждането е пълно</string>
     <string name="ConversationUpdateItem_invite_friends">Покани приятели</string>
@@ -2773,6 +2821,7 @@
     <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>
 
     <!-- EnableCallNotificationSettingsDialog__call_notifications_checklist -->
@@ -3086,6 +3135,7 @@
 
     <string name="arrays__default">По подразбиране</string>
     <string name="arrays__high">Високо</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">Максимално</string>
 
     <!-- plurals.xml -->
@@ -3357,7 +3407,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">Можете да използвате 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">Функцията за плащания в Molly вече не е налична. Пак можете да прехвърляте средства към борса, но вече не можете да изпращате и получавате плащания или да добавяте средства.</string>
@@ -3406,6 +3456,14 @@
     <!-- Storage permission row description -->
     <string name="GrantPermissionsFragment__send_photos_videos_and_files">Изпращайте снимки, видеоклипове и файлове от вашето устройство.</string>
 
+    <!-- PermissionDeniedBottomSheet -->
+    <!-- Sheet describing step 1 on how to give permissions by opening settings -->
+    <string name="PermissionDeniedBottomSheet__1_tap_settings_below">1. Tap “Settings” below</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 Allow the permission</string>
+    <!-- Label for button at the bottom of the sheet which opens the system permission settings -->
+    <string name="PermissionDeniedBottomSheet__settings">Settings</string>
+
     <!-- PaymentsSecuritySetupFragment -->
     <!-- Toolbar title -->
     <string name="PaymentsSecuritySetupFragment__security_setup">Настройка на сигурността</string>
@@ -3446,6 +3504,7 @@
     <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__information">Данните за трансакцията, включително сумата на плащането и часът на трансакцията, са част от Счетоводната книга на MobileCoin.</string>
@@ -3508,6 +3567,7 @@
     <string name="ConfirmPayment__confirm_payment">Потвърди плащане</string>
     <string name="ConfirmPayment__network_fee">Мрежова такса</string>
     <string name="ConfirmPayment__estimated_s">Очаквано %1$s</string>
+    <!-- Prefix to a name to indicate who a payment will be sent to -->
     <string name="ConfirmPayment__to">До</string>
     <string name="ConfirmPayment__total_amount">Обща сума</string>
     <string name="ConfirmPayment__balance_s">Баланс: %1$s</string>
@@ -3658,6 +3718,14 @@
     <string name="conversation_group_options__conversation">Чат</string>
     <string name="conversation_group_options__broadcast">Предаване</string>
 
+    <!-- DoubleTapEditEducationSheet -->
+    <!-- Displayed as the title of the education bottom sheet -->
+    <string name="DoubleTapEditEducationSheet__double_tap_edit_title">Double tap to edit</string>
+    <!-- Text on the sheet explaining how double tapping on a message will let them edit it -->
+    <string name="DoubleTapEditEducationSheet__quickly_tap_twice">Quickly tap twice on your messages to edit them. You can edit your messages up to 24hrs after they’ve been sent.</string>
+    <!-- Button label to dismiss sheet -->
+    <string name="DoubleTapEditEducationSheet__got_it">Got it</string>
+
     <!-- text_secure_normal -->
     <string name="text_secure_normal__menu_new_group">Нова група</string>
     <string name="text_secure_normal__menu_settings">Настройки</string>
@@ -4112,6 +4180,7 @@
     <string name="RecipientBottomSheet_copied_to_clipboard">Копирано</string>
 
     <string name="GroupRecipientListItem_admin">Администратор</string>
+    <!-- Button text to approve a user that has requested to join a group -->
     <string name="GroupRecipientListItem_approve_description">Одобряване</string>
     <string name="GroupRecipientListItem_deny_description">Охтвърляне</string>
 
@@ -4139,6 +4208,7 @@
 
     <!-- VoiceNoteMediaDescriptionCompatFactory -->
     <string name="VoiceNoteMediaItemFactory__voice_message">Гласово съобщение · %1$s</string>
+    <!-- This is a title in a banner describing the conversation sender to receiver placeholders of the currently playing voice memo. -->
     <string name="VoiceNoteMediaItemFactory__s_to_s">%1$s до %2$s</string>
 
     <!-- StorageUtil -->
@@ -4152,8 +4222,16 @@
     <string name="ReviewCardDialogFragment__review_members">Преглед на членовете</string>
     <!-- Title of a screen where the user will be prompted to review a message request matching the name of someone they already know -->
     <string name="ReviewCardDialogFragment__review_request">Преглед на заявката</string>
-    <string name="ReviewCardDialogFragment__d_group_members_have_the_same_name">%1$d членовете на групата имат същото име, прегледайте членовете по-долу и изберете действия.</string>
-    <string name="ReviewCardDialogFragment__if_youre_not_sure">Ако не сте сигурни от кого е искането, прегледайте контактите по-долу и предприемете действие.</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="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 -->
+    <plurals name="ReviewCardDialogFragment__if_youre_not_sure">
+        <item quantity="one">If you\'re not sure who the request is from, review the contact below and take action.</item>
+        <item quantity="other">If you\'re not sure who the request is from, review the contacts below and take action.</item>
+    </plurals>
     <string name="ReviewCardDialogFragment__no_other_groups_in_common">Няма други общи групи.</string>
     <string name="ReviewCardDialogFragment__no_groups_in_common">Няма общи групи.</string>
     <plurals name="ReviewCardDialogFragment__d_other_groups_in_common">
@@ -4184,11 +4262,20 @@
     <string name="CallParticipantsListUpdatePopupWindow__s_joined">%1$s се присъедини</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_and_s_joined">%1$s и %2$s се присъединиха</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_s_and_s_joined">%1$s, %2$s и %3$s се присъединиха</string>
-    <string name="CallParticipantsListUpdatePopupWindow__s_s_and_d_others_joined">%1$s, %2$s и %3$d други се присъединиха</string>
+    <!-- Toast message shown in group call when 3 or more people join -->
+    <plurals name="CallParticipantsListUpdatePopupWindow__s_s_and_d_others_joined">
+        <item quantity="one">%1$s, %2$s and %3$d other joined</item>
+        <item quantity="other">%1$s, %2$s and %3$d others joined</item>
+    </plurals>
+    <!-- Toast/popup text shown when someone leaves a group call -->
     <string name="CallParticipantsListUpdatePopupWindow__s_left">%1$s напусна</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_and_s_left">%1$s и %2$s напуснаха</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_s_and_s_left">%1$s, %2$s и %3$s напуснаха</string>
-    <string name="CallParticipantsListUpdatePopupWindow__s_s_and_d_others_left">%1$s, %2$s и %3$d други напуснаха</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 and %3$d other left</item>
+        <item quantity="other">%1$s, %2$s and %3$d others left</item>
+    </plurals>
 
     <string name="CallParticipant__you">Вие</string>
     <string name="CallParticipant__you_on_another_device">Тебе (на друго устройство)</string>
@@ -4558,10 +4645,15 @@
 
     <!-- PrivacySettingsFragment -->
     <string name="PrivacySettingsFragment__blocked">Блокиран</string>
-    <string name="PrivacySettingsFragment__d_contacts">%1$d контакта</string>
+    <!-- Settings label that shows the number blocked contacts -->
+    <plurals name="PrivacySettingsFragment__d_contacts">
+        <item quantity="one">%1$d contact</item>
+        <item quantity="other">%1$d contacts</item>
+    </plurals>
     <string name="PrivacySettingsFragment__messaging">Съобщения</string>
     <string name="PrivacySettingsFragment__disappearing_messages">Изчезващи съобщения</string>
     <string name="PrivacySettingsFragment__app_security">Сигурност</string>
+    <!-- This refers to the multi-tasking overview (recent apps) from the Android operating system.-->
     <string name="PrivacySettingsFragment__block_screenshots_in_the_recents_list_and_inside_the_app">Блокиране на екранни снимки в списъка със скорошни разговори и в приложението</string>
     <string name="PrivacySettingsFragment__signal_message_and_calls">Съобщения и повиквания в Signal, повикванията винаги да се предават и запечатан подател</string>
     <string name="PrivacySettingsFragment__default_timer_for_new_changes">Таймер по подразбиране за нови чатове</string>
@@ -4618,11 +4710,14 @@
     <string name="DataAndStorageSettingsFragment__media_quality">Качество на мултимедията</string>
     <string name="DataAndStorageSettingsFragment__sent_media_quality">Качество на изпратената мултимедия</string>
     <string name="DataAndStorageSettingsFragment__sending_high_quality_media_will_use_more_data">Изпращането на висококачествени мултимедийни файлове ще използва повече данни.</string>
+    <!-- Setting option that can be selected to default media to be sent as high quality by default -->
     <string name="DataAndStorageSettingsFragment__high">Високо</string>
+    <!-- Setting option that can be selected to default media to be sent as standard quality by default -->
     <string name="DataAndStorageSettingsFragment__standard">Стандартно</string>
     <string name="DataAndStorageSettingsFragment__calls">Обаждания</string>
 
     <!-- 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__use_custom_colors">Използвай ръчно зададени цветове</string>
     <string name="ChatColorSelectionFragment__chat_color">Цвят на чата</string>
@@ -4834,6 +4929,7 @@
     <string name="AvatarPickerFragment__take_a_picture">Направи снимка</string>
     <string name="AvatarPickerFragment__choose_a_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>
     <string name="AvatarPickerFragment__clear_avatar">Премахни аватар</string>
@@ -4894,7 +4990,7 @@
     <string name="MediaReviewFragment__add_a_message">Добави съобщение</string>
     <string name="MediaReviewFragment__add_a_reply">Добавяне на отговор</string>
     <string name="MediaReviewFragment__send_to">Изпращане до</string>
-    <string name="MediaReviewFragment__view_once_message">Съобщение за еднократно гледане</string>
+    <string name="MediaReviewFragment__view_once_message">Мултимедия за еднократно гледане</string>
     <string name="MediaReviewFragment__one_or_more_items_were_too_large">Един или повече елементи бяха твърде големи</string>
     <string name="MediaReviewFragment__one_or_more_items_were_invalid">Един или повече елементи бяха невалидни</string>
     <string name="MediaReviewFragment__too_many_items_selected">Избрани са твърде много елементи</string>
@@ -5487,7 +5583,7 @@
     <string name="StoryViewerFragment__s_s">%1$s %2$s</string>
     <!-- Displayed when viewing a post you sent -->
     <string name="StoryViewerPageFragment__you">Вие</string>
-    <!-- Displayed when viewing a post displayed to a group -->
+    <!-- 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 -->
     <string name="StoryViewerPageFragment__reply">Отговори</string>
@@ -6704,5 +6800,26 @@
     <!-- Content description for opening the note editor -->
     <string name="ViewNoteSheet__edit_note">Редактиране на бележка</string>
 
+    <!-- BackupProgressService -->
+    <!-- Notification title shown while backup restore job is running -->
+    <string name="BackupProgressService_title">Възстановяване на резервно копие…</string>
+    <!-- Notification title shown while downloading backup restore data -->
+    <string name="BackupProgressService_title_downloading">Изтегляне на данни от резервно копие…</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>
+    <!-- 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 -->
+    <string name="BackupsTypeSettingsFragment__google_pay">Google Pay</string>
+    <!-- Displayed as the user\'s payment method as a label in a preference row -->
+    <string name="BackupsTypeSettingsFragment__bank_transfer">Bank transfer</string>
+    <!-- Displayed as the user\'s payment method as a label in a preference row -->
+    <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>
+
+
     <!-- 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 7647fef5a8..7fee91813d 100644
--- a/app/src/main/res/values-bn/strings.xml
+++ b/app/src/main/res/values-bn/strings.xml
@@ -1,6 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- smartling.instruction_comments_enabled = on -->
-<resources>
+<?xml version="1.0" encoding="UTF-8"?><!-- 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> -->
@@ -89,6 +87,16 @@
     <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">Allow access to your location</string>
+    <!-- Dialog description that will explain the steps needed to give location permission -->
+    <string name="AttachmentManager_signal_to_send_location">To send your location:</string>
+    <!-- Alert dialog description asking for location permission -->
+    <string name="AttachmentManager_signal_allow_signal_access_location">Allow Molly access to send your location.</string>
+    <!-- Toast text explaining Signal\'s need for location access -->
+    <string name="AttachmentManager_signal_needs_location_access">Molly needs location access to send your location.</string>
+
     <!-- Alert dialog title to show the recipient has not activated payments -->
     <string name="AttachmentManager__not_activated_payments">%1$s পেমেন্ট সক্রিয় করেননি </string>
     <!-- Alert dialog description to send the recipient a request to activate payments -->
@@ -241,7 +249,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>
@@ -386,8 +394,16 @@
     <string name="ConversationActivity_your_request_to_join_has_been_sent_to_the_group_admin">আপনার গ্রুপে ঢোকার অনুরোধ গ্রুপের অ্যাডমিনদের কাছে পাঠানো হয়েছে। তারা কোনো পদক্ষেপ নিলে আপনাকে জানানো হবে।</string>
     <string name="ConversationActivity_cancel_request">অনুরোধ বাতিল করুন</string>
 
-    <string name="ConversationActivity_to_send_audio_messages_allow_signal_access_to_your_microphone">অডিও বার্তা পাঠাতে Molly কে আপনার মাইক্রোফোন ব্যাবহারের অনুমতি দিন।</string>
+    <!-- Dialog title asking users for microphone permission -->
+    <string name="ConversationActivity_allow_access_microphone">Allow access to your microphone</string>
+    <!-- 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>
+    <!-- Toast text explaining Signal\'s need for microphone access -->
+    <string name="ConversationActivity_signal_needs_microphone_access_voice_message">Molly needs microphone access to record a voice message.</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 কে ফোন করতে 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>
@@ -411,10 +427,17 @@
     <string name="ConversationActivity_you_will_leave_this_group_and_it_will_be_deleted_from_all_of_your_devices">আপনি এই গ্রুপ ছেড়ে চলে যাবেন এবং এটি আপনার সকল ডিভাইস থেকে মুছে ফেলা হবে।</string>
     <string name="ConversationActivity_delete">মুছে ফেলুন</string>
     <string name="ConversationActivity_delete_and_leave">মুছুন এবং ছেড়ে যান</string>
-    <string name="ConversationActivity__to_call_s_signal_needs_access_to_your_microphone">%1$s কে ফোন করতে Molly কে আপনার মাইক্রোফোন ব্যাবহার করতে হবে।</string>
+
+    <!-- Dialog description that will explain the steps needed to give microphone permissions for a voice call -->
+    <string name="ConversationActivity__to_start_call">To start a 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">To start a call, allow Molly access to your microphone.</string>
+    <!-- Toast text explaining Signal\'s need for microphone access for a voice call -->
+    <string name="ConversationActivity_signal_needs_microphone_access_voice_call">Molly needs microphone access to start a call.</string>
 
 
     <string name="ConversationActivity_join">যোগদান করুন</string>
+    <!-- Button text for an active group call but the call is currently full and unjoinable -->
     <string name="ConversationActivity_full">ভর্তি</string>
 
     <string name="ConversationActivity_error_sending_media">ছবি/ভিডিও পাঠাতে ত্রুটি</string>
@@ -613,6 +636,7 @@
     <string name="ConversationListFragment_unarchive">আর্কাইভ মুক্ত</string>
     <string name="ConversationListFragment_delete">মুছে ফেলুন</string>
     <string name="ConversationListFragment_select_all">সব নির্বাচন করুন</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 নির্বাচিত</item>
         <item quantity="other">%1$d নির্বাচিত</item>
@@ -864,6 +888,7 @@
         <item quantity="one">আমন্ত্রণ পাঠানো হয়েছে</item>
         <item quantity="other">%1$dটি আমন্ত্রণ পাঠানো হয়েছে</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">আপনার দ্বারা এই গ্রুপে স্বয়ংক্রিয়ভাবে \"%1$s\" কে যুক্ত করা যাবে না।\n\n তাদের যোগদানের জন্য আমন্ত্রণ জানানো হয়েছে এবং তারা সেটি গ্রহণ না করা পর্যন্ত গ্রুপের কোনও বার্তা দেখতে পাবে না।</string>
     <string name="GroupManagement_invite_multiple_users">আপনার দ্বারা এই গ্রুপে স্বয়ংক্রিয়ভাবে এই ব্যবহারকারীদের যুক্ত করা যাবে না।\n\n তাদের যোগদানের জন্য আমন্ত্রণ জানানো হয়েছে এবং তারা সেটি গ্রহণ না করা পর্যন্ত গ্রুপের কোনও বার্তা দেখতে পাবে না।</string>
 
@@ -1044,7 +1069,9 @@
 
     <string name="ManageGroupActivity_edit_name_and_picture">নাম এবং ছবি সম্পাদনা করেন</string>
     <string name="ManageGroupActivity_legacy_group">লিগ্যাসি গ্রুপ</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">এটি একটি লিগ্যাসি গ্রুপ। গ্রুপ এডমিন এর মতো বৈশিষ্ট্যগুলি কেবল নতুন গ্রুপগুলির জন্য উপলভ্য।</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">এটি একটি লিগ্যাসি গ্রুপ। @মেনশন এবং এডমিনের মতো নতুন বৈশিষ্ট্যগুলি অ্যাক্সেস করতে,</string>
     <string name="ManageGroupActivity_legacy_group_too_large">এই লিগ্যাসি গ্রুপটি একটি নতুন গ্রুপে আপগ্রেড করা যাবে না কারণ এটি অনেক বড়। সর্বাধিক গ্রুপের আকার %1$d।</string>
     <string name="ManageGroupActivity_upgrade_this_group">এই গ্রুপটি আপগ্রেড করুন।</string>
@@ -1271,6 +1298,7 @@
         <item quantity="other">মুছে ফেলুন</item>
     </plurals>
 
+    <!-- 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 নির্বাচিত (%2$s)</item>
         <item quantity="other">%1$d নির্বাচিত (%2$s)</item>
@@ -1335,17 +1363,13 @@
     <string name="MessageRecord_left_group">আপনি গ্রুপ ত্যাগ করেছেন।</string>
     <string name="MessageRecord_you_updated_group">আপনি গ্রুপ আপডেট করেছেন।</string>
     <string name="MessageRecord_the_group_was_updated">গ্রুপটি আপডেট করা হয়েছিল।</string>
-    <!-- Update message shown when placing an outgoing 1:1 voice/audio call and it\'s answered by the other party -->
+    <!-- Update message shown when placing an outgoing 1:1 voice/audio call -->
     <string name="MessageRecord_outgoing_voice_call">ভয়েস কল যাচ্ছে</string>
-    <!-- Update message shown when placing an outgoing 1:1 video call and it\'s answered by the other party -->
+    <!-- Update message shown when placing an outgoing 1:1 video call -->
     <string name="MessageRecord_outgoing_video_call">ভিডিও কল যাচ্ছে</string>
-    <!-- Update message shown when placing an outgoing 1:1 voice/audio call and it\'s not answered by the other party -->
-    <string name="MessageRecord_unanswered_voice_call">উত্তর না দেওয়া ভয়েস কল</string>
-    <!-- Update message shown when placing an outgoing 1:1 video call and it\'s not answered by the other party -->
-    <string name="MessageRecord_unanswered_video_call">উত্তর না দেওয়া ভিডিও কল</string>
-    <!-- Update message shown when receiving an incoming 1:1 voice/audio call and it\'s answered -->
+    <!-- Update message shown when receiving an incoming 1:1 voice/audio call and it\'s answered or ringing -->
     <string name="MessageRecord_incoming_voice_call">ভয়েস কল আসছে</string>
-    <!-- Update message shown when receiving an incoming 1:1 video call and answered -->
+    <!-- Update message shown when receiving an incoming 1:1 video call and answered or ringing -->
     <string name="MessageRecord_incoming_video_call">ভিডিও কল আসছে</string>
     <!-- Update message shown when receiving an incoming 1:1 voice/audio call and not answered -->
     <string name="MessageRecord_missed_voice_call">মিসড ভয়েস কল</string>
@@ -1355,10 +1379,6 @@
     <string name="MessageRecord_missed_voice_call_notification_profile">নোটিফিকেশন প্রোফাইল চালু থাকা অবস্থায় মিসড ভয়েস কল</string>
     <!-- Update message shown when receiving an incoming video call and declined due to notification profile -->
     <string name="MessageRecord_missed_video_call_notification_profile">নোটিফিকেশন প্রোফাইল চালু থাকা অবস্থায় মিসড ভিডিও কল</string>
-    <!-- Update message shown when receiving an incoming 1:1 voice/audio call and explicitly declined -->
-    <string name="MessageRecord_you_declined_a_voice_call">আপনি একটি ভয়েস কল প্রত্যাখ্যান করেছেন</string>
-    <!-- Update message shown when receiving an incoming 1:1 video call and explicitly declined -->
-    <string name="MessageRecord_you_declined_a_video_call">আপনি একটি ভিডিও কল প্রত্যাখ্যান করেছেন</string>
     <!-- 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>
@@ -1567,28 +1587,53 @@
     <string name="MessageRecord_can_accept_payments">%1$s এখন পেমেন্ট গ্রহণ করতে পারবেন</string>
 
     <!-- Group Calling update messages -->
-    <string name="MessageRecord_s_started_a_group_call_s">%1$s একটি গ্রুপ কল শুরু করেছে । %2$s</string>
-    <string name="MessageRecord_you_started_a_group_call_s">আপনি একটি গ্ৰুপ কল শুরু করেছেন · %1$s</string>
-    <string name="MessageRecord_s_is_in_the_group_call_s">%1$s গ্রুপ কল এ আছেন। %2$s</string>
-    <string name="MessageRecord_you_are_in_the_group_call_s1">আপনি গ্রুপ কল এ আছেন। %1$s</string>
-    <string name="MessageRecord_s_and_s_are_in_the_group_call_s1">%1$s এবং %2$s গ্রুপ কল এ আছেন। %3$s</string>
-    <string name="MessageRecord_group_call_s">গ্রুপ কল। %1$s</string>
-
-    <string name="MessageRecord_s_started_a_group_call">%1$s একটি গ্রুপ কল শুরু করেছেন</string>
-    <string name="MessageRecord_you_started_a_group_call">আপনি একটি গ্রুপ কল শুরু করেছেন</string>
-    <string name="MessageRecord_s_is_in_the_group_call">%1$s একটি গ্রুপ কল এ আছেন</string>
-    <string name="MessageRecord_you_are_in_the_group_call">আপনি গ্রুপ কল এ আছেন</string>
-    <string name="MessageRecord_s_and_s_are_in_the_group_call">%1$s এবং %2$s গ্রুপ কল এ আছেন</string>
-    <string name="MessageRecord_group_call">গ্রুপ কল</string>
+    <!-- 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 কলে আছেন · %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">আপনি কলে আছেন · %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 এবং %2$s কলে আছেন · %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 কলে আছেন</string>
+    <!-- Chat log text for an ongoing group call only the local user has joined -->
+    <string name="MessageRecord_you_are_in_the_call">আপনি কলে আছেন</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 ও %2$s কলে আছেন</string>
+    <!-- Chat log text for a group call that ended within the last 5 minutes -->
+    <string name="MessageRecord__the_video_call_has_ended">ভিডিও কল শেষ হয়েছে</string>
+    <!-- Chat log text for a group call that ended within the last 5 minutes with a placeholder for formatted time -->
+    <string name="MessageRecord__the_video_call_has_ended_s">ভিডিও কল শেষ হয়েছে · %1$s</string>
+    <!-- Chat log text for a group call that ended more than 5 minutes ago and was missed -->
+    <string name="MessageRecord__missed_video_call">মিসড ভিডিও কল</string>
+    <!-- Chat log text for a group call that ended more than 5 minutes ago and was missed with a placeholder for formatted time -->
+    <string name="MessageRecord__missed_video_call_s">ভিডিও কল মিস করেছেন। %1$s</string>
+    <!-- Chat log text for a group call that ended that the local user did not start -->
+    <string name="MessageRecord__incoming_video_call">ভিডিও কল আসছে</string>
+    <!-- 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">ভিডিও কল এসেছে · %1$s</string>
+    <!-- Chat log text for a group call that ended that the local user started -->
+    <string name="MessageRecord__outgoing_video_call">ভিডিও কল যাচ্ছে</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">ভিডিও কল যাচ্ছে · %1$s</string>
+    <!-- Chat log text for an ongoing group call that the local user started -->
+    <string name="MessageRecord__you_started_a_video_call">আপনি একটি ভিডিও কল শুরু করেছেন</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">আপনি একটি ভিডিও কল শুরু করেছেন · %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 একটি ভিডিও কল শুরু করেছেন</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 একটি ভিডিও কল শুরু করেছেন · %2$s</string>
 
     <string name="MessageRecord_you">আপনি</string>
 
-    <plurals name="MessageRecord_s_s_and_d_others_are_in_the_group_call_s">
+    <!-- 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, এবং %3$d অন্যান্যরা গ্রুপ কল এ আছেন। %4$s</item>
         <item quantity="other">%1$s, %2$s, এবং%3$d অন্যান্যরা গ্রুপ কল এ আছেন। %4$s</item>
     </plurals>
 
-    <plurals name="MessageRecord_s_s_and_d_others_are_in_the_group_call">
+    <!-- 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, ও %3$d জন গ্রুপ কলটিতে আছে</item>
         <item quantity="other">%1$s, %2$s ও আরও %3$d জন গ্রুপ কলটিতে আছেন</item>
     </plurals>
@@ -2063,6 +2108,7 @@
     <!-- Generic error when the app is unable to request an SMS code for an unknown reason. -->
     <string name="RegistrationActivity_unable_to_request_verification_code">যাচাইকরণ কোডের জন্য অনুরোধ করতে সক্ষম নয়। অনুগ্রহ করে আপনার নেটওয়ার্ক সংযোগ ঠিক আছে কি না দেখুন এবং আবার চেষ্টা করুন।</string>
     <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">Molly অ্যান্ড্রয়েড - ফোন নম্বর ফর্ম্যাট</string>
     <!--    Small "toast" notification to the user confirming that they have requested a new code via voice call.-->
@@ -2207,7 +2253,7 @@
     <string name="SubmitDebugLogActivity_this_log_will_be_posted_publicly_online_for_contributors">এই লগটি অবদানকারীদের দেখার জন্য উন্মুক্তভাবে অনলাইনে পোস্ট করা হবে। আপলোড করার পূর্বে আপনি যাচাই করে দেখতে পারেন।</string>
 
     <!-- SupportEmailUtil -->
-  <!-- Removed by excludeNonTranslatables <string name="SupportEmailUtil_support_email" translatable="false">support@molly.im</string> -->
+  <!-- Removed by excludeNonTranslatables <string name="SupportEmailUtil_support_email" translatable="false">support@signal.org</string> -->
     <string name="SupportEmailUtil_filter">ফিল্টার:</string>
     <string name="SupportEmailUtil_device_info">ডিভাইস-এর তথ্য:</string>
     <string name="SupportEmailUtil_android_version">অ্যান্ড্রয়েড সংস্করণ:</string>
@@ -2709,6 +2755,8 @@
     <string name="ConversationUpdateItem_loading">লোড হচ্ছে</string>
     <string name="ConversationUpdateItem_learn_more">আরও জানুন</string>
     <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_call_is_full">কলটিতে জায়গা নেই</string>
     <string name="ConversationUpdateItem_invite_friends">বন্ধুদের আমন্ত্রণ</string>
@@ -2773,6 +2821,7 @@
     <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>
 
     <!-- EnableCallNotificationSettingsDialog__call_notifications_checklist -->
@@ -3086,6 +3135,7 @@
 
     <string name="arrays__default">সচারচর</string>
     <string name="arrays__high">উচ্চ</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">সর্বাধিক</string>
 
     <!-- plurals.xml -->
@@ -3357,7 +3407,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 ওয়ালেট ব্যবহারের শর্তাবলী মেনে সম্পাদিত হয়। আপনি কিছু কিছু সমস্যার সম্মুখীন হতে পারেন এবং আপনার হারানো পেমেন্ট বা ব্যালেন্স পুনরুদ্ধার করা যাবে না। </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">Molly-এ পেমেন্ট আর উপলভ্য নেই। আপনি এখনও কোনও এক্সচেঞ্জে আপনার ফান্ডগুলি ট্রান্সফার করতে পারেন তবে আপনি আর পেমেন্টগুলি প্রেরণ এবং গ্রহণ করতে বা ফান্ড যোগ করতে পারবেন না।</string>
@@ -3406,6 +3456,14 @@
     <!-- Storage permission row description -->
     <string name="GrantPermissionsFragment__send_photos_videos_and_files">আপনার ডিভাইস থেকে ছবি, ভিডিও ও ফাইল পাঠান।</string>
 
+    <!-- PermissionDeniedBottomSheet -->
+    <!-- Sheet describing step 1 on how to give permissions by opening settings -->
+    <string name="PermissionDeniedBottomSheet__1_tap_settings_below">1. Tap “Settings” below</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 Allow the permission</string>
+    <!-- Label for button at the bottom of the sheet which opens the system permission settings -->
+    <string name="PermissionDeniedBottomSheet__settings">Settings</string>
+
     <!-- PaymentsSecuritySetupFragment -->
     <!-- Toolbar title -->
     <string name="PaymentsSecuritySetupFragment__security_setup">নিরাপত্তা সেটআপ</string>
@@ -3446,6 +3504,7 @@
     <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__information">লেনদেনের বিস্তারিত বিবরণের মধ্যে রয়েছে পেমেন্টের পরিমাণ এবং লেনদেনের সময় যা MobileCoin Ledger-এর একটি অংশ।</string>
@@ -3508,6 +3567,7 @@
     <string name="ConfirmPayment__confirm_payment">পেমেন্ট নিশ্চিত করুন</string>
     <string name="ConfirmPayment__network_fee">নেটওয়ার্ক ফিস</string>
     <string name="ConfirmPayment__estimated_s">আনুমানিক %1$s</string>
+    <!-- Prefix to a name to indicate who a payment will be sent to -->
     <string name="ConfirmPayment__to">প্রতি</string>
     <string name="ConfirmPayment__total_amount">সর্বমোট পরিমাণ</string>
     <string name="ConfirmPayment__balance_s">ব্যালেন্স: %1$s</string>
@@ -3658,6 +3718,14 @@
     <string name="conversation_group_options__conversation">চ্যাট</string>
     <string name="conversation_group_options__broadcast">ব্রডকাস্ট</string>
 
+    <!-- DoubleTapEditEducationSheet -->
+    <!-- Displayed as the title of the education bottom sheet -->
+    <string name="DoubleTapEditEducationSheet__double_tap_edit_title">Double tap to edit</string>
+    <!-- Text on the sheet explaining how double tapping on a message will let them edit it -->
+    <string name="DoubleTapEditEducationSheet__quickly_tap_twice">Quickly tap twice on your messages to edit them. You can edit your messages up to 24hrs after they’ve been sent.</string>
+    <!-- Button label to dismiss sheet -->
+    <string name="DoubleTapEditEducationSheet__got_it">Got it</string>
+
     <!-- text_secure_normal -->
     <string name="text_secure_normal__menu_new_group">নতুন গ্রুপ</string>
     <string name="text_secure_normal__menu_settings">সেটিংস</string>
@@ -4112,6 +4180,7 @@
     <string name="RecipientBottomSheet_copied_to_clipboard">ক্লিপবোর্ডে অনুলিপি করা হয়েছে</string>
 
     <string name="GroupRecipientListItem_admin">প্রশাসক</string>
+    <!-- Button text to approve a user that has requested to join a group -->
     <string name="GroupRecipientListItem_approve_description">অনুমোদন</string>
     <string name="GroupRecipientListItem_deny_description">প্রত্যাখ্যান</string>
 
@@ -4139,6 +4208,7 @@
 
     <!-- VoiceNoteMediaDescriptionCompatFactory -->
     <string name="VoiceNoteMediaItemFactory__voice_message">ভয়েস বার্তা। %1$s</string>
+    <!-- This is a title in a banner describing the conversation sender to receiver placeholders of the currently playing voice memo. -->
     <string name="VoiceNoteMediaItemFactory__s_to_s">%1$s থেকে %2$s</string>
 
     <!-- StorageUtil -->
@@ -4152,8 +4222,16 @@
     <string name="ReviewCardDialogFragment__review_members">সদস্যের পর্যালোচনা করুন</string>
     <!-- Title of a screen where the user will be prompted to review a message request matching the name of someone they already know -->
     <string name="ReviewCardDialogFragment__review_request">অনুরোধ পর্যালোচনা করুন</string>
-    <string name="ReviewCardDialogFragment__d_group_members_have_the_same_name">%1$d জন গ্রুপ সদস্যদের একই নাম রয়েছে, নীচের সদস্যদের পর্যালোচনা করুন এবং পদক্ষেপ নিন।</string>
-    <string name="ReviewCardDialogFragment__if_youre_not_sure">আপনি যদি নিশ্চিত না হন কার থেকে অনুরোধ এসেছে, আগে কন্টাক্টটি পরিদর্শন সিদ্ধান্ত নিন</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="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 -->
+    <plurals name="ReviewCardDialogFragment__if_youre_not_sure">
+        <item quantity="one">If you\'re not sure who the request is from, review the contact below and take action.</item>
+        <item quantity="other">If you\'re not sure who the request is from, review the contacts below and take action.</item>
+    </plurals>
     <string name="ReviewCardDialogFragment__no_other_groups_in_common">একই রকমের আর কোন গ্রুপ নেই</string>
     <string name="ReviewCardDialogFragment__no_groups_in_common">একই রকমের কোন গ্রুপ নেই</string>
     <plurals name="ReviewCardDialogFragment__d_other_groups_in_common">
@@ -4184,11 +4262,20 @@
     <string name="CallParticipantsListUpdatePopupWindow__s_joined">%1$s যোগ দিয়েছেন</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_and_s_joined">%1$s এবং %2$s যোগ দিয়েছে</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_s_and_s_joined">%1$s, %2$s এবং %3$s যোগ দিয়েছে</string>
-    <string name="CallParticipantsListUpdatePopupWindow__s_s_and_d_others_joined">%1$s, %2$s, এবং অন্যান্য %3$dজন যোগ দিয়েছে</string>
+    <!-- Toast message shown in group call when 3 or more people join -->
+    <plurals name="CallParticipantsListUpdatePopupWindow__s_s_and_d_others_joined">
+        <item quantity="one">%1$s, %2$s and %3$d other joined</item>
+        <item quantity="other">%1$s, %2$s and %3$d others joined</item>
+    </plurals>
+    <!-- Toast/popup text shown when someone leaves a group call -->
     <string name="CallParticipantsListUpdatePopupWindow__s_left">%1$s চলে গেছে</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_and_s_left">%1$s এবং %2$s চলে গেছে</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_s_and_s_left">%1$s, %2$s এবং%3$s চলে গেছে</string>
-    <string name="CallParticipantsListUpdatePopupWindow__s_s_and_d_others_left">%1$s, %2$s এবং অন্যান্য %3$d জন চলে গেছে</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 and %3$d other left</item>
+        <item quantity="other">%1$s, %2$s and %3$d others left</item>
+    </plurals>
 
     <string name="CallParticipant__you">আপনি</string>
     <string name="CallParticipant__you_on_another_device">আপনি (অন্য ডিভাইসে আছেন)</string>
@@ -4558,10 +4645,15 @@
 
     <!-- PrivacySettingsFragment -->
     <string name="PrivacySettingsFragment__blocked">ব্লক করা হয়েছে</string>
-    <string name="PrivacySettingsFragment__d_contacts">%1$d পরিচিতিসমূহ</string>
+    <!-- Settings label that shows the number blocked contacts -->
+    <plurals name="PrivacySettingsFragment__d_contacts">
+        <item quantity="one">%1$d contact</item>
+        <item quantity="other">%1$d contacts</item>
+    </plurals>
     <string name="PrivacySettingsFragment__messaging">বাদানুবাদ</string>
     <string name="PrivacySettingsFragment__disappearing_messages">অদৃশ্য বার্তা</string>
     <string name="PrivacySettingsFragment__app_security">অ্যাপ এর নিরাপত্তা</string>
+    <!-- This refers to the multi-tasking overview (recent apps) from the Android operating system.-->
     <string name="PrivacySettingsFragment__block_screenshots_in_the_recents_list_and_inside_the_app">রিসেন্ট লিস্ট এবং অ্যাপের মধ্যে স্ক্রীনশট ব্লক করুন</string>
     <string name="PrivacySettingsFragment__signal_message_and_calls">Signal মেসেজ ও কল করে, সবসময় কল রিলে করে এবং প্রেরককে সিল করে রাখে</string>
     <string name="PrivacySettingsFragment__default_timer_for_new_changes">নতুন চ্যাটের জন্য ডিফল্ট টাইমার</string>
@@ -4618,11 +4710,14 @@
     <string name="DataAndStorageSettingsFragment__media_quality">মিডিয়ার মান</string>
     <string name="DataAndStorageSettingsFragment__sent_media_quality">পাঠানো মিডিয়ার মান</string>
     <string name="DataAndStorageSettingsFragment__sending_high_quality_media_will_use_more_data">উচ্চ মানের মিডিয়া প্রেরণে আরও ডেটা ব্যবহার হবে।</string>
+    <!-- Setting option that can be selected to default media to be sent as high quality by default -->
     <string name="DataAndStorageSettingsFragment__high">উচ্চ</string>
+    <!-- Setting option that can be selected to default media to be sent as standard quality by default -->
     <string name="DataAndStorageSettingsFragment__standard">স্ট্যান্ডার্ড</string>
     <string name="DataAndStorageSettingsFragment__calls">কল সমূহ</string>
 
     <!-- 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__use_custom_colors">কাস্টম রঙ ব্যবহার করুন</string>
     <string name="ChatColorSelectionFragment__chat_color">চ্যাটের রং</string>
@@ -4834,6 +4929,7 @@
     <string name="AvatarPickerFragment__take_a_picture">একটি ছবি তুলুন</string>
     <string name="AvatarPickerFragment__choose_a_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>
     <string name="AvatarPickerFragment__clear_avatar">অবতার সাফ করুন</string>
@@ -4894,7 +4990,7 @@
     <string name="MediaReviewFragment__add_a_message">একটি বার্তা যোগ করুন</string>
     <string name="MediaReviewFragment__add_a_reply">একটি জবাব যোগ করুন</string>
     <string name="MediaReviewFragment__send_to">পাঠান</string>
-    <string name="MediaReviewFragment__view_once_message">একবার বার্তা দেখুন</string>
+    <string name="MediaReviewFragment__view_once_message">একবার-দেখার উপযোগী মিডিয়া</string>
     <string name="MediaReviewFragment__one_or_more_items_were_too_large">এক বা একাধিক আইটেম খুব বড় ছিল৷</string>
     <string name="MediaReviewFragment__one_or_more_items_were_invalid">এক বা একাধিক আইটেম বাতিল ছিল</string>
     <string name="MediaReviewFragment__too_many_items_selected">অনেকগুলি আইটেম নির্বাচন করা হয়েছে</string>
@@ -5487,7 +5583,7 @@
     <string name="StoryViewerFragment__s_s">%1$s %2$s</string>
     <!-- Displayed when viewing a post you sent -->
     <string name="StoryViewerPageFragment__you">আপনি</string>
-    <!-- Displayed when viewing a post displayed to a group -->
+    <!-- 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 -->
     <string name="StoryViewerPageFragment__reply">প্রত্যুত্তর</string>
@@ -6704,5 +6800,26 @@
     <!-- Content description for opening the note editor -->
     <string name="ViewNoteSheet__edit_note">নোট এডিট করুন</string>
 
+    <!-- BackupProgressService -->
+    <!-- Notification title shown while backup restore job is running -->
+    <string name="BackupProgressService_title">ব্যাকআপ পুনর্বহাল করা হচ্ছে…</string>
+    <!-- Notification title shown while downloading backup restore data -->
+    <string name="BackupProgressService_title_downloading">ব্যাকআপ ডেটা ডাউনলোড করা হচ্ছে…</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>
+    <!-- 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 -->
+    <string name="BackupsTypeSettingsFragment__google_pay">Google Pay</string>
+    <!-- Displayed as the user\'s payment method as a label in a preference row -->
+    <string name="BackupsTypeSettingsFragment__bank_transfer">Bank transfer</string>
+    <!-- Displayed as the user\'s payment method as a label in a preference row -->
+    <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>
+
+
     <!-- 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 c51d194c4f..86b8341e7e 100644
--- a/app/src/main/res/values-bs/strings.xml
+++ b/app/src/main/res/values-bs/strings.xml
@@ -1,6 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- smartling.instruction_comments_enabled = on -->
-<resources>
+<?xml version="1.0" encoding="UTF-8"?><!-- 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> -->
@@ -89,6 +87,16 @@
     <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">Allow access to your location</string>
+    <!-- Dialog description that will explain the steps needed to give location permission -->
+    <string name="AttachmentManager_signal_to_send_location">To send your location:</string>
+    <!-- Alert dialog description asking for location permission -->
+    <string name="AttachmentManager_signal_allow_signal_access_location">Allow Molly access to send your location.</string>
+    <!-- Toast text explaining Signal\'s need for location access -->
+    <string name="AttachmentManager_signal_needs_location_access">Molly needs location access to send your location.</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>
     <!-- Alert dialog description to send the recipient a request to activate payments -->
@@ -243,7 +251,7 @@
     <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>
@@ -392,8 +400,16 @@
     <string name="ConversationActivity_your_request_to_join_has_been_sent_to_the_group_admin">Vaš zahtjev za pristupanje poslan je administratoru grupe. Bit ćete obaviješteni kad ga on/a razmotri.</string>
     <string name="ConversationActivity_cancel_request">Poništi zahtjev</string>
 
-    <string name="ConversationActivity_to_send_audio_messages_allow_signal_access_to_your_microphone">Da biste mogli slati zvučne poruke, dozvolite Mollyu pristup Vašem mikrofonu.</string>
+    <!-- Dialog title asking users for microphone permission -->
+    <string name="ConversationActivity_allow_access_microphone">Allow access to your microphone</string>
+    <!-- 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>
+    <!-- Toast text explaining Signal\'s need for microphone access -->
+    <string name="ConversationActivity_signal_needs_microphone_access_voice_message">Molly needs microphone access to record a voice message.</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">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>
@@ -417,10 +433,17 @@
     <string name="ConversationActivity_you_will_leave_this_group_and_it_will_be_deleted_from_all_of_your_devices">Napustit ćete ovu grupu i ona će biti izbrisana sa svih Vaših uređaja.</string>
     <string name="ConversationActivity_delete">Izbriši</string>
     <string name="ConversationActivity_delete_and_leave">Izbriši i napusti</string>
-    <string name="ConversationActivity__to_call_s_signal_needs_access_to_your_microphone">Da biste nazvali %1$s, Mollyu je potreban pristup Vašem mikrofonu</string>
+
+    <!-- Dialog description that will explain the steps needed to give microphone permissions for a voice call -->
+    <string name="ConversationActivity__to_start_call">To start a 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">To start a call, allow Molly access to your microphone.</string>
+    <!-- Toast text explaining Signal\'s need for microphone access for a voice call -->
+    <string name="ConversationActivity_signal_needs_microphone_access_voice_call">Molly needs microphone access to start a call.</string>
 
 
     <string name="ConversationActivity_join">Pristupi</string>
+    <!-- Button text for an active group call but the call is currently full and unjoinable -->
     <string name="ConversationActivity_full">Popunjeno</string>
 
     <string name="ConversationActivity_error_sending_media">Greška prilikom slanja priloga</string>
@@ -645,6 +668,7 @@
     <string name="ConversationListFragment_unarchive">Dearhiviraj</string>
     <string name="ConversationListFragment_delete">Izbriši</string>
     <string name="ConversationListFragment_select_all">Odaberi sve</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 stavka je odabrana</item>
         <item quantity="few">%1$d stavke su odabrane</item>
@@ -902,6 +926,7 @@
         <item quantity="many">%1$d pozivnica je poslano</item>
         <item quantity="other">%1$d pozivnice su poslane</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">“%1$s” ne može preko Vas biti automatski uvršten/a u grupu.\n\nPozvan/a je da se pridruži i neće vidjeti grupne poruke sve dok ne prihvati pozivnicu.</string>
     <string name="GroupManagement_invite_multiple_users">Ove osobe ne mogu se preko Vas automatski uvrstiti u grupu.\n\nPozvane su da se pridruže grupi i neće vidjeti grupne poruke sve dok ne prihvate pozivnicu.</string>
 
@@ -1114,7 +1139,9 @@
 
     <string name="ManageGroupActivity_edit_name_and_picture">Unesite naziv i dodajte sliku</string>
     <string name="ManageGroupActivity_legacy_group">Stara grupa</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">Ovo je stara grupa. Opcije poput grupnog administratora dostupne su samo za nove grupe.</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">Ovo je stara grupa. Da biste mogli koristiti opcije poput @spomena i administracije grupe,</string>
     <string name="ManageGroupActivity_legacy_group_too_large">Ova grupa ne može se preinačiti u novu grupu jer je prevelika. Maksimum za grupu iznosi %1$d.</string>
     <string name="ManageGroupActivity_upgrade_this_group">nadogradi ovu grupu.</string>
@@ -1359,6 +1386,7 @@
         <item quantity="other">Izbriši</item>
     </plurals>
 
+    <!-- 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 odabrana stavka (%2$s)</item>
         <item quantity="few">%1$d odabrane stavke (%2$s)</item>
@@ -1425,17 +1453,13 @@
     <string name="MessageRecord_left_group">Napustili ste grupu.</string>
     <string name="MessageRecord_you_updated_group">Ažurirali ste grupu.</string>
     <string name="MessageRecord_the_group_was_updated">Grupa je ažurirana.</string>
-    <!-- Update message shown when placing an outgoing 1:1 voice/audio call and it\'s answered by the other party -->
+    <!-- Update message shown when placing an outgoing 1:1 voice/audio call -->
     <string name="MessageRecord_outgoing_voice_call">Odlazni glasovni poziv</string>
-    <!-- Update message shown when placing an outgoing 1:1 video call and it\'s answered by the other party -->
+    <!-- Update message shown when placing an outgoing 1:1 video call -->
     <string name="MessageRecord_outgoing_video_call">Odlazni video poziv</string>
-    <!-- Update message shown when placing an outgoing 1:1 voice/audio call and it\'s not answered by the other party -->
-    <string name="MessageRecord_unanswered_voice_call">Propušteni glasovni poziv</string>
-    <!-- Update message shown when placing an outgoing 1:1 video call and it\'s not answered by the other party -->
-    <string name="MessageRecord_unanswered_video_call">Propušteni video poziv</string>
-    <!-- Update message shown when receiving an incoming 1:1 voice/audio call and it\'s answered -->
+    <!-- Update message shown when receiving an incoming 1:1 voice/audio call and it\'s answered or ringing -->
     <string name="MessageRecord_incoming_voice_call">Dolazni glasovni poziv</string>
-    <!-- Update message shown when receiving an incoming 1:1 video call and answered -->
+    <!-- Update message shown when receiving an incoming 1:1 video call and answered or ringing -->
     <string name="MessageRecord_incoming_video_call">Dolazni video poziv</string>
     <!-- Update message shown when receiving an incoming 1:1 voice/audio call and not answered -->
     <string name="MessageRecord_missed_voice_call">Propušteni glasovni poziv</string>
@@ -1445,10 +1469,6 @@
     <string name="MessageRecord_missed_voice_call_notification_profile">Propušteni glasovni poziv dok je profil obavijesti uključen</string>
     <!-- Update message shown when receiving an incoming video call and declined due to notification profile -->
     <string name="MessageRecord_missed_video_call_notification_profile">Propušteni glasovni poziv dok je profil obavijesti uključen</string>
-    <!-- Update message shown when receiving an incoming 1:1 voice/audio call and explicitly declined -->
-    <string name="MessageRecord_you_declined_a_voice_call">Odbili ste glasovni poziv</string>
-    <!-- Update message shown when receiving an incoming 1:1 video call and explicitly declined -->
-    <string name="MessageRecord_you_declined_a_video_call">Odbili ste video poziv</string>
     <!-- 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 je ažurirao/la grupu.</string>
@@ -1673,30 +1693,55 @@
     <string name="MessageRecord_can_accept_payments">%1$s sada može prihvatiti Plaćanja</string>
 
     <!-- Group Calling update messages -->
-    <string name="MessageRecord_s_started_a_group_call_s">%1$s je započeo/la grupni poziv · %2$s</string>
-    <string name="MessageRecord_you_started_a_group_call_s">Porenuli ste grupni poziv · %1$s</string>
-    <string name="MessageRecord_s_is_in_the_group_call_s">%1$s učestvuje u grupnom pozivu · %2$s</string>
-    <string name="MessageRecord_you_are_in_the_group_call_s1">Učestvujete u grupnom pozivu · %1$s</string>
-    <string name="MessageRecord_s_and_s_are_in_the_group_call_s1">%1$s i %2$s učestvuju u grupnom pozivu · %3$s</string>
-    <string name="MessageRecord_group_call_s">Grupni poziv · %1$s</string>
-
-    <string name="MessageRecord_s_started_a_group_call">%1$s je započeo/la grupni poziv</string>
-    <string name="MessageRecord_you_started_a_group_call">Pokrenuli ste grupni poziv</string>
-    <string name="MessageRecord_s_is_in_the_group_call">%1$s učestvuje u grupnom pozivu</string>
-    <string name="MessageRecord_you_are_in_the_group_call">Učestvujete u grupnom pozivu</string>
-    <string name="MessageRecord_s_and_s_are_in_the_group_call">%1$s i %2$s učestvuju u grupnom pozivu</string>
-    <string name="MessageRecord_group_call">Grupni poziv</string>
+    <!-- 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 je u pozivu · %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">Vi ste u pozivu · %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 i %2$s su u pozivu · %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 je u pozivu</string>
+    <!-- Chat log text for an ongoing group call only the local user has joined -->
+    <string name="MessageRecord_you_are_in_the_call">Vi ste u pozivu</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 i %2$s učestvuju u ovom pozivu</string>
+    <!-- Chat log text for a group call that ended within the last 5 minutes -->
+    <string name="MessageRecord__the_video_call_has_ended">Video poziv je završen</string>
+    <!-- Chat log text for a group call that ended within the last 5 minutes with a placeholder for formatted time -->
+    <string name="MessageRecord__the_video_call_has_ended_s">Video poziv je završen · %1$s</string>
+    <!-- Chat log text for a group call that ended more than 5 minutes ago and was missed -->
+    <string name="MessageRecord__missed_video_call">Propušteni videopoziv</string>
+    <!-- Chat log text for a group call that ended more than 5 minutes ago and was missed with a placeholder for formatted time -->
+    <string name="MessageRecord__missed_video_call_s">Propušten videopoziv · %1$s</string>
+    <!-- Chat log text for a group call that ended that the local user did not start -->
+    <string name="MessageRecord__incoming_video_call">Dolazni video poziv</string>
+    <!-- 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">Dolazni video poziv · %1$s</string>
+    <!-- Chat log text for a group call that ended that the local user started -->
+    <string name="MessageRecord__outgoing_video_call">Odlazni video poziv</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">Odlazni video poziv · %1$s</string>
+    <!-- Chat log text for an ongoing group call that the local user started -->
+    <string name="MessageRecord__you_started_a_video_call">Pokrenuli ste video poziv</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">Pokrenuli ste video poziv · %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 je započeo/la video poziv</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 je započeo/la video poziv · %2$s</string>
 
     <string name="MessageRecord_you">Vi</string>
 
-    <plurals name="MessageRecord_s_s_and_d_others_are_in_the_group_call_s">
+    <!-- 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 i %3$d druga osoba učestvuje u grupnom pozivu · %4$s</item>
         <item quantity="few">%1$s, %2$s i %3$d druge osobe učestvuju u grupnom pozivu · %4$s</item>
         <item quantity="many">%1$s, %2$s i %3$d drugih osoba učestvuje u grupnom pozivu · %4$s</item>
         <item quantity="other">%1$s, %2$s i %3$d drugih osoba učestvuje u grupnom pozivu · %4$s</item>
     </plurals>
 
-    <plurals name="MessageRecord_s_s_and_d_others_are_in_the_group_call">
+    <!-- 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 i %3$d druga osoba učestvuje u grupnom pozivu</item>
         <item quantity="few">%1$s, %2$s i %3$d druge osobe učestvuju u grupnom pozivu</item>
         <item quantity="many">%1$s, %2$s i %3$d drugih osoba učestvuje u grupnom pozivu</item>
@@ -2221,6 +2266,7 @@
     <!-- Generic error when the app is unable to request an SMS code for an unknown reason. -->
     <string name="RegistrationActivity_unable_to_request_verification_code">Nije moguće zatražiti verifikacioni kȏd. Provjerite internet konekciju i pokušajte ponovo.</string>
     <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">Molly Android – oblik broja telefona</string>
     <!--    Small "toast" notification to the user confirming that they have requested a new code via voice call.-->
@@ -2367,7 +2413,7 @@
     <string name="SubmitDebugLogActivity_this_log_will_be_posted_publicly_online_for_contributors">Ovaj izvještaj bit će objavljen javno kako bi ga drugi mogli pregledati. Prije slanja možete ga pregledati.</string>
 
     <!-- SupportEmailUtil -->
-  <!-- Removed by excludeNonTranslatables <string name="SupportEmailUtil_support_email" translatable="false">support@molly.im</string> -->
+  <!-- Removed by excludeNonTranslatables <string name="SupportEmailUtil_support_email" translatable="false">support@signal.org</string> -->
     <string name="SupportEmailUtil_filter">Filter:</string>
     <string name="SupportEmailUtil_device_info">Podaci o uređaju:</string>
     <string name="SupportEmailUtil_android_version">Verzija Androida:</string>
@@ -2883,6 +2929,8 @@
     <string name="ConversationUpdateItem_loading">Učitavam</string>
     <string name="ConversationUpdateItem_learn_more">Saznajte više</string>
     <string name="ConversationUpdateItem_join_call">Pridruži se pozivu</string>
+    <!-- Action button label for starting a new call in the current conversation -->
+    <string name="ConversationUpdateItem_call_back">Povratni poziv</string>
     <string name="ConversationUpdateItem_return_to_call">Vrati se pozivu</string>
     <string name="ConversationUpdateItem_call_is_full">Poziv je popunjen</string>
     <string name="ConversationUpdateItem_invite_friends">Pozovi prijatelje</string>
@@ -2947,6 +2995,7 @@
     <string name="safety_number_change_dialog__leave_call">Završi poziv</string>
     <string name="safety_number_change_dialog__the_following_people_may_have_reinstalled_or_changed_devices">Ove su osobe možda iznova instalirale Signal ili promijenile uređaj. Potvrdite svoj sigurnosni broj s njima da osigurate privatnost.</string>
     <string name="safety_number_change_dialog__view">Pregled</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">Ranije potvrđeno</string>
 
     <!-- EnableCallNotificationSettingsDialog__call_notifications_checklist -->
@@ -3274,6 +3323,7 @@
 
     <string name="arrays__default">Standardno</string>
     <string name="arrays__high">Visoki</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">Maksimalni</string>
 
     <!-- plurals.xml -->
@@ -3551,7 +3601,7 @@
     <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 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>
@@ -3600,6 +3650,14 @@
     <!-- Storage permission row description -->
     <string name="GrantPermissionsFragment__send_photos_videos_and_files">Šaljite fotografije, video zapise i fajlove sa svog uređaja.</string>
 
+    <!-- PermissionDeniedBottomSheet -->
+    <!-- Sheet describing step 1 on how to give permissions by opening settings -->
+    <string name="PermissionDeniedBottomSheet__1_tap_settings_below">1. Tap “Settings” below</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 Allow the permission</string>
+    <!-- Label for button at the bottom of the sheet which opens the system permission settings -->
+    <string name="PermissionDeniedBottomSheet__settings">Settings</string>
+
     <!-- PaymentsSecuritySetupFragment -->
     <!-- Toolbar title -->
     <string name="PaymentsSecuritySetupFragment__security_setup">Postavljanje sigurnosti</string>
@@ -3640,6 +3698,7 @@
     <string name="PaymentsDetailsFragment__sent_to_s">Isplaćeno %1$s</string>
     <string name="PaymentsDetailsFragment__you_on_s_at_s">Vi, %1$s u %2$s</string>
     <string name="PaymentsDetailsFragment__s_on_s_at_s">%1$s, %2$s u %3$s</string>
+    <!-- Prefix to a name to indicate who a payment was sent to -->
     <string name="PaymentsDetailsFragment__to">Za</string>
     <string name="PaymentsDetailsFragment__from">Od</string>
     <string name="PaymentsDetailsFragment__information">Detalji o transakciji, uključujući iznos i vrijeme transakcije, dio su MobileCoin registra.</string>
@@ -3702,6 +3761,7 @@
     <string name="ConfirmPayment__confirm_payment">Potvrdi plaćanje</string>
     <string name="ConfirmPayment__network_fee">Mrežna naknada</string>
     <string name="ConfirmPayment__estimated_s">Procijenjeno %1$s</string>
+    <!-- Prefix to a name to indicate who a payment will be sent to -->
     <string name="ConfirmPayment__to">Za</string>
     <string name="ConfirmPayment__total_amount">Ukupni iznos</string>
     <string name="ConfirmPayment__balance_s">Stanje: %1$s</string>
@@ -3856,6 +3916,14 @@
     <string name="conversation_group_options__conversation">Chat</string>
     <string name="conversation_group_options__broadcast">Emitovanje</string>
 
+    <!-- DoubleTapEditEducationSheet -->
+    <!-- Displayed as the title of the education bottom sheet -->
+    <string name="DoubleTapEditEducationSheet__double_tap_edit_title">Double tap to edit</string>
+    <!-- Text on the sheet explaining how double tapping on a message will let them edit it -->
+    <string name="DoubleTapEditEducationSheet__quickly_tap_twice">Quickly tap twice on your messages to edit them. You can edit your messages up to 24hrs after they’ve been sent.</string>
+    <!-- Button label to dismiss sheet -->
+    <string name="DoubleTapEditEducationSheet__got_it">Got it</string>
+
     <!-- text_secure_normal -->
     <string name="text_secure_normal__menu_new_group">Nova grupa</string>
     <string name="text_secure_normal__menu_settings">Podešavanja</string>
@@ -4324,6 +4392,7 @@
     <string name="RecipientBottomSheet_copied_to_clipboard">Kopirano u međuspremnik</string>
 
     <string name="GroupRecipientListItem_admin">Administrator</string>
+    <!-- Button text to approve a user that has requested to join a group -->
     <string name="GroupRecipientListItem_approve_description">Odobri</string>
     <string name="GroupRecipientListItem_deny_description">Odbij</string>
 
@@ -4351,6 +4420,7 @@
 
     <!-- VoiceNoteMediaDescriptionCompatFactory -->
     <string name="VoiceNoteMediaItemFactory__voice_message">Glasovna poruka · %1$s</string>
+    <!-- This is a title in a banner describing the conversation sender to receiver placeholders of the currently playing voice memo. -->
     <string name="VoiceNoteMediaItemFactory__s_to_s">%1$s do %2$s</string>
 
     <!-- StorageUtil -->
@@ -4364,8 +4434,20 @@
     <string name="ReviewCardDialogFragment__review_members">Pregledajte članove</string>
     <!-- Title of a screen where the user will be prompted to review a message request matching the name of someone they already know -->
     <string name="ReviewCardDialogFragment__review_request">Pregledajte zahtjev</string>
-    <string name="ReviewCardDialogFragment__d_group_members_have_the_same_name">%1$d člana grupe imaju isto ime. Provjerite članove ispod i odlučite kako s njima postupiti.</string>
-    <string name="ReviewCardDialogFragment__if_youre_not_sure">Ako niste sigurni od koga potječe zahtjev, provjerite kontakte ispod i odlučite kako postupiti.</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="few">%1$d group members have the same name, review the members below and choose to take action.</item>
+        <item quantity="many">%1$d group members have the same name, review the members 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 -->
+    <plurals name="ReviewCardDialogFragment__if_youre_not_sure">
+        <item quantity="one">If you\'re not sure who the request is from, review the contact below and take action.</item>
+        <item quantity="few">If you\'re not sure who the request is from, review the contacts below and take action.</item>
+        <item quantity="many">If you\'re not sure who the request is from, review the contacts below and take action.</item>
+        <item quantity="other">If you\'re not sure who the request is from, review the contacts below and take action.</item>
+    </plurals>
     <string name="ReviewCardDialogFragment__no_other_groups_in_common">Nema drugih zajedničkih grupa.</string>
     <string name="ReviewCardDialogFragment__no_groups_in_common">Nema zajedničkih grupa.</string>
     <plurals name="ReviewCardDialogFragment__d_other_groups_in_common">
@@ -4400,11 +4482,24 @@
     <string name="CallParticipantsListUpdatePopupWindow__s_joined">%1$s se pridružio/la</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_and_s_joined">%1$s i %2$s su se pridružili</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_s_and_s_joined">%1$s, %2$s i %3$s su se pridružili</string>
-    <string name="CallParticipantsListUpdatePopupWindow__s_s_and_d_others_joined">%1$s, %2$s i %3$d drugih su se pridružili</string>
+    <!-- Toast message shown in group call when 3 or more people join -->
+    <plurals name="CallParticipantsListUpdatePopupWindow__s_s_and_d_others_joined">
+        <item quantity="one">%1$s, %2$s and %3$d other joined</item>
+        <item quantity="few">%1$s, %2$s and %3$d others joined</item>
+        <item quantity="many">%1$s, %2$s and %3$d others joined</item>
+        <item quantity="other">%1$s, %2$s and %3$d others joined</item>
+    </plurals>
+    <!-- Toast/popup text shown when someone leaves a group call -->
     <string name="CallParticipantsListUpdatePopupWindow__s_left">%1$s je otišao/la</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_and_s_left">%1$s i %2$s su otišli</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_s_and_s_left">%1$s, %2$s i %3$s su otišli</string>
-    <string name="CallParticipantsListUpdatePopupWindow__s_s_and_d_others_left">%1$s, %2$s i %3$d drugih su otišli</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 and %3$d other left</item>
+        <item quantity="few">%1$s, %2$s and %3$d others left</item>
+        <item quantity="many">%1$s, %2$s and %3$d others left</item>
+        <item quantity="other">%1$s, %2$s and %3$d others left</item>
+    </plurals>
 
     <string name="CallParticipant__you">Vi</string>
     <string name="CallParticipant__you_on_another_device">Vi (na drugom uređaju)</string>
@@ -4778,10 +4873,17 @@
 
     <!-- PrivacySettingsFragment -->
     <string name="PrivacySettingsFragment__blocked">Blokirano</string>
-    <string name="PrivacySettingsFragment__d_contacts">%1$d kontakata</string>
+    <!-- Settings label that shows the number blocked contacts -->
+    <plurals name="PrivacySettingsFragment__d_contacts">
+        <item quantity="one">%1$d contact</item>
+        <item quantity="few">%1$d contacts</item>
+        <item quantity="many">%1$d contacts</item>
+        <item quantity="other">%1$d contacts</item>
+    </plurals>
     <string name="PrivacySettingsFragment__messaging">Poruke</string>
     <string name="PrivacySettingsFragment__disappearing_messages">Nestajuće poruke</string>
     <string name="PrivacySettingsFragment__app_security">Sigurnost aplikacije</string>
+    <!-- This refers to the multi-tasking overview (recent apps) from the Android operating system.-->
     <string name="PrivacySettingsFragment__block_screenshots_in_the_recents_list_and_inside_the_app">Onemogući snimku zaslona u popisu nedavnih razgovora i unutar aplikacije</string>
     <string name="PrivacySettingsFragment__signal_message_and_calls">Signal poruke i pozivi, preusmjeravanje poziva i zapečaćeni pošiljalac</string>
     <string name="PrivacySettingsFragment__default_timer_for_new_changes">Predefinisani rok za nove chatove</string>
@@ -4838,11 +4940,14 @@
     <string name="DataAndStorageSettingsFragment__media_quality">Kvalitet zapisa</string>
     <string name="DataAndStorageSettingsFragment__sent_media_quality">Kvalitet poslatih zapisa</string>
     <string name="DataAndStorageSettingsFragment__sending_high_quality_media_will_use_more_data">Slanje visokokvalitetnih zapisa kreirat će veći protok.</string>
+    <!-- Setting option that can be selected to default media to be sent as high quality by default -->
     <string name="DataAndStorageSettingsFragment__high">Visoki</string>
+    <!-- Setting option that can be selected to default media to be sent as standard quality by default -->
     <string name="DataAndStorageSettingsFragment__standard">Standardni</string>
     <string name="DataAndStorageSettingsFragment__calls">Pozivi</string>
 
     <!-- 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__use_custom_colors">Koristi druge boje</string>
     <string name="ChatColorSelectionFragment__chat_color">Boja chata</string>
@@ -5060,6 +5165,7 @@
     <string name="AvatarPickerFragment__take_a_picture">Uslikaj</string>
     <string name="AvatarPickerFragment__choose_a_photo">Izaberi fotografiju</string>
     <string name="AvatarPickerFragment__photo">Fotografija</string>
+    <!-- Button label during avatar selection/creation that when tapped lets you generate an avatar from typed in text. -->
     <string name="AvatarPickerFragment__text">Tekst</string>
     <string name="AvatarPickerFragment__save">Pohrani</string>
     <string name="AvatarPickerFragment__clear_avatar">Ukloni sličicu profila</string>
@@ -5128,7 +5234,7 @@
     <string name="MediaReviewFragment__add_a_message">Napiši poruku</string>
     <string name="MediaReviewFragment__add_a_reply">Odgovor</string>
     <string name="MediaReviewFragment__send_to">Pošalji za</string>
-    <string name="MediaReviewFragment__view_once_message">Jednokratna poruka</string>
+    <string name="MediaReviewFragment__view_once_message">Mediji koji se mogu pogledati jednom</string>
     <string name="MediaReviewFragment__one_or_more_items_were_too_large">Jedna ili više datoteka su prevelike</string>
     <string name="MediaReviewFragment__one_or_more_items_were_invalid">Jedna ili više datoteka nisu validne</string>
     <string name="MediaReviewFragment__too_many_items_selected">Označeno je previše datoteka</string>
@@ -5731,7 +5837,7 @@
     <string name="StoryViewerFragment__s_s">%1$s %2$s</string>
     <!-- Displayed when viewing a post you sent -->
     <string name="StoryViewerPageFragment__you">Vi</string>
-    <!-- Displayed when viewing a post displayed to a group -->
+    <!-- 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 do %2$s</string>
     <!-- Displayed when viewing a post from another user with no replies -->
     <string name="StoryViewerPageFragment__reply">Odgovori</string>
@@ -6972,7 +7078,7 @@
     <!-- Title displayed at the top of the screen -->
     <string name="NicknameActivity__nickname">Nadimak</string>
     <!-- Subtitle displayed under title -->
-    <string name="NicknameActivity__nicknames_amp_notes">Nicknames &amp; notes are stored with Signal and end-to-end encrypted. They are only visible to you.</string>
+    <string name="NicknameActivity__nicknames_amp_notes">Nadimci i bilješke se pohranjuju u Signalu i sveobuhvatno su šifrirani. Samo ih vi možete vidjeti.</string>
     <!-- Field label for given name -->
     <string name="NicknameActivity__first_name">Ime</string>
     <!-- Content description for first name clear button -->
@@ -6986,9 +7092,9 @@
     <!-- Button label to save -->
     <string name="NicknameActivity__save">Pohrani</string>
     <!-- Dialog title for note and name deletion -->
-    <string name="NicknameActivity__delete_nickname">Delete?</string>
+    <string name="NicknameActivity__delete_nickname">Izbrisati?</string>
     <!-- Dialog message for note and name deletion -->
-    <string name="NicknameActivity__this_will_permanently_delete_this_nickname_and_note">This will permanently delete any nickname and note you’ve set.</string>
+    <string name="NicknameActivity__this_will_permanently_delete_this_nickname_and_note">Ovim će se trajno izbrisati svi nadimci i bilješke koje ste postavili.</string>
 
     <!-- ViewNoteBottomSheetDialogFragment -->
     <!-- Sheet title -->
@@ -6996,5 +7102,26 @@
     <!-- Content description for opening the note editor -->
     <string name="ViewNoteSheet__edit_note">Uredi bilješku</string>
 
+    <!-- BackupProgressService -->
+    <!-- Notification title shown while backup restore job is running -->
+    <string name="BackupProgressService_title">Vraćanje sigurnosne kopije…</string>
+    <!-- Notification title shown while downloading backup restore data -->
+    <string name="BackupProgressService_title_downloading">Preuzimanje sigurnosne kopije podataka…</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>
+    <!-- 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 -->
+    <string name="BackupsTypeSettingsFragment__google_pay">Google Pay</string>
+    <!-- Displayed as the user\'s payment method as a label in a preference row -->
+    <string name="BackupsTypeSettingsFragment__bank_transfer">Bank transfer</string>
+    <!-- Displayed as the user\'s payment method as a label in a preference row -->
+    <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>
+
+
     <!-- 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 e26fb007a3..53f8d9e804 100644
--- a/app/src/main/res/values-ca/strings.xml
+++ b/app/src/main/res/values-ca/strings.xml
@@ -1,6 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- smartling.instruction_comments_enabled = on -->
-<resources>
+<?xml version="1.0" encoding="UTF-8"?><!-- 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> -->
@@ -89,6 +87,16 @@
     <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">Allow access to your location</string>
+    <!-- Dialog description that will explain the steps needed to give location permission -->
+    <string name="AttachmentManager_signal_to_send_location">To send your location:</string>
+    <!-- Alert dialog description asking for location permission -->
+    <string name="AttachmentManager_signal_allow_signal_access_location">Allow Molly access to send your location.</string>
+    <!-- Toast text explaining Signal\'s need for location access -->
+    <string name="AttachmentManager_signal_needs_location_access">Molly needs location access to send your location.</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>
     <!-- Alert dialog description to send the recipient a request to activate payments -->
@@ -241,7 +249,7 @@
     <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>
@@ -386,8 +394,16 @@
     <string name="ConversationActivity_your_request_to_join_has_been_sent_to_the_group_admin">La sol·licitud per afegir-vos-hi s\'ha enviat a l\'administrador/a del grup. Rebreu una notificació quan la resolguin.</string>
     <string name="ConversationActivity_cancel_request">Cancel·la la sol·licitud</string>
 
-    <string name="ConversationActivity_to_send_audio_messages_allow_signal_access_to_your_microphone">Per enviar missatges d\'àudio, permeteu que el Molly tingui accés al micròfon.</string>
+    <!-- Dialog title asking users for microphone permission -->
+    <string name="ConversationActivity_allow_access_microphone">Allow access to your microphone</string>
+    <!-- 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>
+    <!-- Toast text explaining Signal\'s need for microphone access -->
+    <string name="ConversationActivity_signal_needs_microphone_access_voice_message">Molly needs microphone access to record a voice message.</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 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>
@@ -411,10 +427,17 @@
     <string name="ConversationActivity_you_will_leave_this_group_and_it_will_be_deleted_from_all_of_your_devices">Abandonaràs aquest grup i s\'esborrarà de tots els dispositius.</string>
     <string name="ConversationActivity_delete">Esborra</string>
     <string name="ConversationActivity_delete_and_leave">Esborra i surt</string>
-    <string name="ConversationActivity__to_call_s_signal_needs_access_to_your_microphone">Per trucar a %1$s, el Molly necessita accés al micròfon.</string>
+
+    <!-- Dialog description that will explain the steps needed to give microphone permissions for a voice call -->
+    <string name="ConversationActivity__to_start_call">To start a 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">To start a call, allow Molly access to your microphone.</string>
+    <!-- Toast text explaining Signal\'s need for microphone access for a voice call -->
+    <string name="ConversationActivity_signal_needs_microphone_access_voice_call">Molly needs microphone access to start a call.</string>
 
 
     <string name="ConversationActivity_join">Afegeix-m\'hi</string>
+    <!-- Button text for an active group call but the call is currently full and unjoinable -->
     <string name="ConversationActivity_full">Ple</string>
 
     <string name="ConversationActivity_error_sending_media">Error en enviar contingut</string>
@@ -613,6 +636,7 @@
     <string name="ConversationListFragment_unarchive">Restaura</string>
     <string name="ConversationListFragment_delete">Eliminar</string>
     <string name="ConversationListFragment_select_all">Selecciona tot</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 de seleccionat</item>
         <item quantity="other">%1$d de seleccionats</item>
@@ -864,6 +888,7 @@
         <item quantity="one">Invitació enviada</item>
         <item quantity="other">%1$d invitacions enviades</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 podeu afegir automàticament %1$s a aquest grup. \n\nHan estat convidats a afegir-s\'hi i no veuran cap missatge del grup fins que no ho acceptin.</string>
     <string name="GroupManagement_invite_multiple_users">No podeu afegir aquests usuaris automàticament a aquest grup.\n\nHan estat convidats a afegir-s\'hi i no veuran cap missatge del grup fins que ho acceptin.</string>
 
@@ -1044,7 +1069,9 @@
 
     <string name="ManageGroupActivity_edit_name_and_picture">Editeu el nom i la imatge</string>
     <string name="ManageGroupActivity_legacy_group">Grup de llegat</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">Aquest és un grup de llegat. Característiques com ara els administradors de grup només estan disponibles per als grups nous.</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">Aquest és un grup de llegat. Per accedir a funcions noves com ara les @mencions i als administradors,</string>
     <string name="ManageGroupActivity_legacy_group_too_large">Aquest grup de llegat no es pot actualitzar a un grup nou perquè és massa gros. La mida màxima d\'un grup és %1$d.</string>
     <string name="ManageGroupActivity_upgrade_this_group">actualitzeu aquest grup.</string>
@@ -1271,6 +1298,7 @@
         <item quantity="other">Suprimits</item>
     </plurals>
 
+    <!-- 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 de seleccionat (%2$s)</item>
         <item quantity="other">%1$d de seleccionats (%2$s)</item>
@@ -1335,17 +1363,13 @@
     <string name="MessageRecord_left_group">Heu abandonat el grup.</string>
     <string name="MessageRecord_you_updated_group">Heu actualitzat el grup.</string>
     <string name="MessageRecord_the_group_was_updated">S\'ha actualitzat el grup.</string>
-    <!-- Update message shown when placing an outgoing 1:1 voice/audio call and it\'s answered by the other party -->
+    <!-- Update message shown when placing an outgoing 1:1 voice/audio call -->
     <string name="MessageRecord_outgoing_voice_call">Trucada sortint</string>
-    <!-- Update message shown when placing an outgoing 1:1 video call and it\'s answered by the other party -->
+    <!-- Update message shown when placing an outgoing 1:1 video call -->
     <string name="MessageRecord_outgoing_video_call">Videotrucada sortint</string>
-    <!-- Update message shown when placing an outgoing 1:1 voice/audio call and it\'s not answered by the other party -->
-    <string name="MessageRecord_unanswered_voice_call">Trucada sense contestar</string>
-    <!-- Update message shown when placing an outgoing 1:1 video call and it\'s not answered by the other party -->
-    <string name="MessageRecord_unanswered_video_call">Videotrucada sense contestar</string>
-    <!-- Update message shown when receiving an incoming 1:1 voice/audio call and it\'s answered -->
+    <!-- Update message shown when receiving an incoming 1:1 voice/audio call and it\'s answered or ringing -->
     <string name="MessageRecord_incoming_voice_call">Trucada entrant</string>
-    <!-- Update message shown when receiving an incoming 1:1 video call and answered -->
+    <!-- Update message shown when receiving an incoming 1:1 video call and answered or ringing -->
     <string name="MessageRecord_incoming_video_call">Videotrucada entrant</string>
     <!-- Update message shown when receiving an incoming 1:1 voice/audio call and not answered -->
     <string name="MessageRecord_missed_voice_call">Trucada perduda</string>
@@ -1355,10 +1379,6 @@
     <string name="MessageRecord_missed_voice_call_notification_profile">Trucada de veu perduda mentre els ajustos de notificació estaven activats</string>
     <!-- Update message shown when receiving an incoming video call and declined due to notification profile -->
     <string name="MessageRecord_missed_video_call_notification_profile">Videotrucada perduda mentre els ajustos de notificació estaven activats</string>
-    <!-- Update message shown when receiving an incoming 1:1 voice/audio call and explicitly declined -->
-    <string name="MessageRecord_you_declined_a_voice_call">Has rebutjat una trucada</string>
-    <!-- Update message shown when receiving an incoming 1:1 video call and explicitly declined -->
-    <string name="MessageRecord_you_declined_a_video_call">Has rebutjat una videotrucada</string>
     <!-- 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 ha actualitzat el grup.</string>
@@ -1567,28 +1587,53 @@
     <string name="MessageRecord_can_accept_payments">%1$s ja pot acceptar Pagaments</string>
 
     <!-- Group Calling update messages -->
-    <string name="MessageRecord_s_started_a_group_call_s">%1$s ha iniciat una trucada de grup · %2$s</string>
-    <string name="MessageRecord_you_started_a_group_call_s">Has iniciat una trucada de grup · %1$s</string>
-    <string name="MessageRecord_s_is_in_the_group_call_s">%1$s és a la trucada de grup · %2$s</string>
-    <string name="MessageRecord_you_are_in_the_group_call_s1">Sou a la trucada de grup · %1$s</string>
-    <string name="MessageRecord_s_and_s_are_in_the_group_call_s1">%1$s i %2$s són a la trucada de grup · %3$s</string>
-    <string name="MessageRecord_group_call_s">Trucada de grup · %1$s</string>
-
-    <string name="MessageRecord_s_started_a_group_call">%1$s ha iniciat una trucada de grup.</string>
-    <string name="MessageRecord_you_started_a_group_call">Heu iniciat una trucada de grup.</string>
-    <string name="MessageRecord_s_is_in_the_group_call">%1$s és a la trucada de grup.</string>
-    <string name="MessageRecord_you_are_in_the_group_call">Sou a la trucada de grup.</string>
-    <string name="MessageRecord_s_and_s_are_in_the_group_call">%1$s i %2$s són a la trucada de grup.</string>
-    <string name="MessageRecord_group_call">Trucada de grup</string>
+    <!-- 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 és a la trucada · %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">Ets a la trucada · %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 i %2$s són a la trucada · %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 és a la trucada</string>
+    <!-- Chat log text for an ongoing group call only the local user has joined -->
+    <string name="MessageRecord_you_are_in_the_call">Ets a la trucada</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 i %2$s són a la trucada</string>
+    <!-- Chat log text for a group call that ended within the last 5 minutes -->
+    <string name="MessageRecord__the_video_call_has_ended">La videotrucada ha finalitzat</string>
+    <!-- Chat log text for a group call that ended within the last 5 minutes with a placeholder for formatted time -->
+    <string name="MessageRecord__the_video_call_has_ended_s">La videotrucada ha finalitzat · %1$s</string>
+    <!-- Chat log text for a group call that ended more than 5 minutes ago and was missed -->
+    <string name="MessageRecord__missed_video_call">Videotrucada perduda</string>
+    <!-- Chat log text for a group call that ended more than 5 minutes ago and was missed with a placeholder for formatted time -->
+    <string name="MessageRecord__missed_video_call_s">Trucada de vídeo perduda · %1$s</string>
+    <!-- Chat log text for a group call that ended that the local user did not start -->
+    <string name="MessageRecord__incoming_video_call">Videotrucada entrant</string>
+    <!-- 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">Videotrucada entrant · %1$s</string>
+    <!-- Chat log text for a group call that ended that the local user started -->
+    <string name="MessageRecord__outgoing_video_call">Videotrucada sortint</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">Videotrucada realitzada · %1$s</string>
+    <!-- Chat log text for an ongoing group call that the local user started -->
+    <string name="MessageRecord__you_started_a_video_call">Has iniciat una videotrucada</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">Has iniciat una videotrucada · %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 ha iniciat una videotrucada</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 ha iniciat una videotrucada · %2$s</string>
 
     <string name="MessageRecord_you">Vós</string>
 
-    <plurals name="MessageRecord_s_s_and_d_others_are_in_the_group_call_s">
+    <!-- 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 i %3$d més són a la trucada de grup · %4$s</item>
         <item quantity="other">%1$s, %2$s i %3$d més són a la trucada de grup · %4$s</item>
     </plurals>
 
-    <plurals name="MessageRecord_s_s_and_d_others_are_in_the_group_call">
+    <!-- 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 i %3$d més són a la trucada de grup.</item>
         <item quantity="other">%1$s, %2$s i %3$d més són a la trucada de grup.</item>
     </plurals>
@@ -2063,6 +2108,7 @@
     <!-- 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 s\'ha pogut sol·licitar un codi de verificació. Comprova la connexió de xarxa i torna-ho a provar.</string>
     <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">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.-->
@@ -2207,7 +2253,7 @@
     <string name="SubmitDebugLogActivity_this_log_will_be_posted_publicly_online_for_contributors">Aquest registre es penjarà públicament en línia perquè els col·laboradors el vegin. Podeu examinar-lo abans de penjar-lo.</string>
 
     <!-- SupportEmailUtil -->
-  <!-- Removed by excludeNonTranslatables <string name="SupportEmailUtil_support_email" translatable="false">support@molly.im</string> -->
+  <!-- Removed by excludeNonTranslatables <string name="SupportEmailUtil_support_email" translatable="false">support@signal.org</string> -->
     <string name="SupportEmailUtil_filter">Filtre:</string>
     <string name="SupportEmailUtil_device_info">Informació del dispositiu:</string>
     <string name="SupportEmailUtil_android_version">Versió d\'Android:</string>
@@ -2709,6 +2755,8 @@
     <string name="ConversationUpdateItem_loading">Es carrega</string>
     <string name="ConversationUpdateItem_learn_more">Més informació</string>
     <string name="ConversationUpdateItem_join_call">Afegeix-me a la trucada</string>
+    <!-- Action button label for starting a new call in the current conversation -->
+    <string name="ConversationUpdateItem_call_back">Torna la trucada</string>
     <string name="ConversationUpdateItem_return_to_call">Torna a la trucada</string>
     <string name="ConversationUpdateItem_call_is_full">La trucada és plena</string>
     <string name="ConversationUpdateItem_invite_friends">Convideu-hi amistats</string>
@@ -2773,6 +2821,7 @@
     <string name="safety_number_change_dialog__leave_call">Surt de la trucada</string>
     <string name="safety_number_change_dialog__the_following_people_may_have_reinstalled_or_changed_devices">Aquesta gent podria haver reinstallar o dispositius canviats. Comproveu vostre número de seguretat amb ells, per assegurar la privadesa.</string>
     <string name="safety_number_change_dialog__view">Mostra</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">Verificat prèviament</string>
 
     <!-- EnableCallNotificationSettingsDialog__call_notifications_checklist -->
@@ -3086,6 +3135,7 @@
 
     <string name="arrays__default">Per defecte</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 -->
@@ -3357,7 +3407,7 @@
     <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 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>
@@ -3406,6 +3456,14 @@
     <!-- Storage permission row description -->
     <string name="GrantPermissionsFragment__send_photos_videos_and_files">Envia fotos, vídeos i arxius des del teu dispositiu.</string>
 
+    <!-- PermissionDeniedBottomSheet -->
+    <!-- Sheet describing step 1 on how to give permissions by opening settings -->
+    <string name="PermissionDeniedBottomSheet__1_tap_settings_below">1. Tap “Settings” below</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 Allow the permission</string>
+    <!-- Label for button at the bottom of the sheet which opens the system permission settings -->
+    <string name="PermissionDeniedBottomSheet__settings">Settings</string>
+
     <!-- PaymentsSecuritySetupFragment -->
     <!-- Toolbar title -->
     <string name="PaymentsSecuritySetupFragment__security_setup">Configuració de seguretat</string>
@@ -3446,6 +3504,7 @@
     <string name="PaymentsDetailsFragment__sent_to_s">Enviat a %1$s</string>
     <string name="PaymentsDetailsFragment__you_on_s_at_s">Vós a %1$s a %2$s</string>
     <string name="PaymentsDetailsFragment__s_on_s_at_s">%1$s a %2$s a %3$s</string>
+    <!-- Prefix to a name to indicate who a payment was sent to -->
     <string name="PaymentsDetailsFragment__to">A</string>
     <string name="PaymentsDetailsFragment__from">De</string>
     <string name="PaymentsDetailsFragment__information">Les dades de la transacció, inclosos l\'import del pagament i el moment de la transacció, formen part de MobileCoin Ledger.</string>
@@ -3508,6 +3567,7 @@
     <string name="ConfirmPayment__confirm_payment">Confirmeu el pagament</string>
     <string name="ConfirmPayment__network_fee">Comissió de xarxa</string>
     <string name="ConfirmPayment__estimated_s">Estimació: %1$s</string>
+    <!-- Prefix to a name to indicate who a payment will be sent to -->
     <string name="ConfirmPayment__to">A</string>
     <string name="ConfirmPayment__total_amount">Quantitat total</string>
     <string name="ConfirmPayment__balance_s">Saldo: %1$s</string>
@@ -3658,6 +3718,14 @@
     <string name="conversation_group_options__conversation">Xat</string>
     <string name="conversation_group_options__broadcast">Difusió</string>
 
+    <!-- DoubleTapEditEducationSheet -->
+    <!-- Displayed as the title of the education bottom sheet -->
+    <string name="DoubleTapEditEducationSheet__double_tap_edit_title">Double tap to edit</string>
+    <!-- Text on the sheet explaining how double tapping on a message will let them edit it -->
+    <string name="DoubleTapEditEducationSheet__quickly_tap_twice">Quickly tap twice on your messages to edit them. You can edit your messages up to 24hrs after they’ve been sent.</string>
+    <!-- Button label to dismiss sheet -->
+    <string name="DoubleTapEditEducationSheet__got_it">Got it</string>
+
     <!-- text_secure_normal -->
     <string name="text_secure_normal__menu_new_group">Grup nou</string>
     <string name="text_secure_normal__menu_settings">Configuració</string>
@@ -4112,6 +4180,7 @@
     <string name="RecipientBottomSheet_copied_to_clipboard">Copiat al porta-retalls</string>
 
     <string name="GroupRecipientListItem_admin">Administrador</string>
+    <!-- Button text to approve a user that has requested to join a group -->
     <string name="GroupRecipientListItem_approve_description">Aprova-la</string>
     <string name="GroupRecipientListItem_deny_description">Rebutja-la</string>
 
@@ -4139,6 +4208,7 @@
 
     <!-- VoiceNoteMediaDescriptionCompatFactory -->
     <string name="VoiceNoteMediaItemFactory__voice_message">Missatge de veu · %1$s</string>
+    <!-- This is a title in a banner describing the conversation sender to receiver placeholders of the currently playing voice memo. -->
     <string name="VoiceNoteMediaItemFactory__s_to_s">%1$s a %2$s</string>
 
     <!-- StorageUtil -->
@@ -4152,8 +4222,16 @@
     <string name="ReviewCardDialogFragment__review_members">Reviseu els membres</string>
     <!-- Title of a screen where the user will be prompted to review a message request matching the name of someone they already know -->
     <string name="ReviewCardDialogFragment__review_request">Reviseu la sol·licitud</string>
-    <string name="ReviewCardDialogFragment__d_group_members_have_the_same_name">%1$d membres del grup tenen el mateix nom. Reviseu els membres que es mostren a continuació.</string>
-    <string name="ReviewCardDialogFragment__if_youre_not_sure">Si no esteu segur de qui prové la sol·licitud, reviseu els contactes que hi ha a continuació.</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="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 -->
+    <plurals name="ReviewCardDialogFragment__if_youre_not_sure">
+        <item quantity="one">If you\'re not sure who the request is from, review the contact below and take action.</item>
+        <item quantity="other">If you\'re not sure who the request is from, review the contacts below and take action.</item>
+    </plurals>
     <string name="ReviewCardDialogFragment__no_other_groups_in_common">Cap altre grup en comú</string>
     <string name="ReviewCardDialogFragment__no_groups_in_common">Cap grup en comú</string>
     <plurals name="ReviewCardDialogFragment__d_other_groups_in_common">
@@ -4184,11 +4262,20 @@
     <string name="CallParticipantsListUpdatePopupWindow__s_joined">%1$s s\'hi ha afegit.</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_and_s_joined">%1$s i %2$s s\'hi han afegit.</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_s_and_s_joined">%1$s, %2$s i %3$s s\'hi han afegit.</string>
-    <string name="CallParticipantsListUpdatePopupWindow__s_s_and_d_others_joined">%1$s, %2$s i %3$d més s\'hi han afegit.</string>
+    <!-- Toast message shown in group call when 3 or more people join -->
+    <plurals name="CallParticipantsListUpdatePopupWindow__s_s_and_d_others_joined">
+        <item quantity="one">%1$s, %2$s and %3$d other joined</item>
+        <item quantity="other">%1$s, %2$s and %3$d others joined</item>
+    </plurals>
+    <!-- Toast/popup text shown when someone leaves a group call -->
     <string name="CallParticipantsListUpdatePopupWindow__s_left">%1$s n\'ha sortit.</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_and_s_left">%1$s i %2$s n\'han sortit.</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_s_and_s_left">%1$s, %2$s i %3$s n\'han sortit.</string>
-    <string name="CallParticipantsListUpdatePopupWindow__s_s_and_d_others_left">%1$s, %2$s i %3$d més n\'han sortit.</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 and %3$d other left</item>
+        <item quantity="other">%1$s, %2$s and %3$d others left</item>
+    </plurals>
 
     <string name="CallParticipant__you">Vós</string>
     <string name="CallParticipant__you_on_another_device">Vós (en un altre dispositiu)</string>
@@ -4558,10 +4645,15 @@
 
     <!-- PrivacySettingsFragment -->
     <string name="PrivacySettingsFragment__blocked">Bloquejat</string>
-    <string name="PrivacySettingsFragment__d_contacts">%1$d contactes</string>
+    <!-- Settings label that shows the number blocked contacts -->
+    <plurals name="PrivacySettingsFragment__d_contacts">
+        <item quantity="one">%1$d contact</item>
+        <item quantity="other">%1$d contacts</item>
+    </plurals>
     <string name="PrivacySettingsFragment__messaging">Missatges</string>
     <string name="PrivacySettingsFragment__disappearing_messages">Missatges efímers</string>
     <string name="PrivacySettingsFragment__app_security">Seguretat de l\'aplicació</string>
+    <!-- This refers to the multi-tasking overview (recent apps) from the Android operating system.-->
     <string name="PrivacySettingsFragment__block_screenshots_in_the_recents_list_and_inside_the_app">Bloqueja les captures de pantalla a les llistes de recents i dins de l\'aplicació</string>
     <string name="PrivacySettingsFragment__signal_message_and_calls">Missatges i trucades del Signal: sempre retransmissió de trucades i remitent segellat</string>
     <string name="PrivacySettingsFragment__default_timer_for_new_changes">Temporitzador per defecte per als xats nous</string>
@@ -4618,11 +4710,14 @@
     <string name="DataAndStorageSettingsFragment__media_quality">Qualitat dels mitjans</string>
     <string name="DataAndStorageSettingsFragment__sent_media_quality">Qualitat dels mitjans enviats</string>
     <string name="DataAndStorageSettingsFragment__sending_high_quality_media_will_use_more_data">L’enviament de mitjans d’alta qualitat usarà més dades.</string>
+    <!-- Setting option that can be selected to default media to be sent as high quality by default -->
     <string name="DataAndStorageSettingsFragment__high">Alta</string>
+    <!-- Setting option that can be selected to default media to be sent as standard quality by default -->
     <string name="DataAndStorageSettingsFragment__standard">Estàndard</string>
     <string name="DataAndStorageSettingsFragment__calls">Trucades</string>
 
     <!-- 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__use_custom_colors">Usa els colors personalitzats</string>
     <string name="ChatColorSelectionFragment__chat_color">Color del xat</string>
@@ -4834,6 +4929,7 @@
     <string name="AvatarPickerFragment__take_a_picture">Fes una fotografia</string>
     <string name="AvatarPickerFragment__choose_a_photo">Trieu una fotografia</string>
     <string name="AvatarPickerFragment__photo">Foto</string>
+    <!-- Button label during avatar selection/creation that when tapped lets you generate an avatar from typed in text. -->
     <string name="AvatarPickerFragment__text">Text</string>
     <string name="AvatarPickerFragment__save">Desa</string>
     <string name="AvatarPickerFragment__clear_avatar">Neteja l\'avatar</string>
@@ -4894,7 +4990,7 @@
     <string name="MediaReviewFragment__add_a_message">Afegiu-hi un missatge</string>
     <string name="MediaReviewFragment__add_a_reply">Afegiu-hi una resposta</string>
     <string name="MediaReviewFragment__send_to">Enviar a</string>
-    <string name="MediaReviewFragment__view_once_message">Mostra el missatge un cop</string>
+    <string name="MediaReviewFragment__view_once_message">Contingut d\'una sola visualització</string>
     <string name="MediaReviewFragment__one_or_more_items_were_too_large">Un o més elements eren massa grossos.</string>
     <string name="MediaReviewFragment__one_or_more_items_were_invalid">Un o més elements no eren vàlids.</string>
     <string name="MediaReviewFragment__too_many_items_selected">Massa elements seleccionats</string>
@@ -5487,7 +5583,7 @@
     <string name="StoryViewerFragment__s_s">%1$s %2$s</string>
     <!-- Displayed when viewing a post you sent -->
     <string name="StoryViewerPageFragment__you">Vós</string>
-    <!-- Displayed when viewing a post displayed to a group -->
+    <!-- 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 -->
     <string name="StoryViewerPageFragment__reply">Respon</string>
@@ -6680,7 +6776,7 @@
     <!-- Title displayed at the top of the screen -->
     <string name="NicknameActivity__nickname">Sobrenom</string>
     <!-- Subtitle displayed under title -->
-    <string name="NicknameActivity__nicknames_amp_notes">Nicknames &amp; notes are stored with Signal and end-to-end encrypted. They are only visible to you.</string>
+    <string name="NicknameActivity__nicknames_amp_notes">Els sobrenoms i les notes es guarden a Signal i estan xifrats d\'extrem a extrem. Només els podràs veure tu.</string>
     <!-- Field label for given name -->
     <string name="NicknameActivity__first_name">Nom</string>
     <!-- Content description for first name clear button -->
@@ -6694,9 +6790,9 @@
     <!-- Button label to save -->
     <string name="NicknameActivity__save">Desar</string>
     <!-- Dialog title for note and name deletion -->
-    <string name="NicknameActivity__delete_nickname">Delete?</string>
+    <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">This will permanently delete any nickname and note you’ve set.</string>
+    <string name="NicknameActivity__this_will_permanently_delete_this_nickname_and_note">Això eliminarà permanentment qualsevol sobrenom i nota que hagis establert.</string>
 
     <!-- ViewNoteBottomSheetDialogFragment -->
     <!-- Sheet title -->
@@ -6704,5 +6800,26 @@
     <!-- Content description for opening the note editor -->
     <string name="ViewNoteSheet__edit_note">Editar nota</string>
 
+    <!-- BackupProgressService -->
+    <!-- Notification title shown while backup restore job is running -->
+    <string name="BackupProgressService_title">Restaurant la còpia de seguretat…</string>
+    <!-- Notification title shown while downloading backup restore data -->
+    <string name="BackupProgressService_title_downloading">S\'està descarregant la còpia de seguretat…</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>
+    <!-- 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 -->
+    <string name="BackupsTypeSettingsFragment__google_pay">Google Pay</string>
+    <!-- Displayed as the user\'s payment method as a label in a preference row -->
+    <string name="BackupsTypeSettingsFragment__bank_transfer">Bank transfer</string>
+    <!-- Displayed as the user\'s payment method as a label in a preference row -->
+    <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>
+
+
     <!-- 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 e8d021f1e8..c22c5809f8 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -1,6 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- smartling.instruction_comments_enabled = on -->
-<resources>
+<?xml version="1.0" encoding="UTF-8"?><!-- 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> -->
@@ -89,6 +87,16 @@
     <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">Allow access to your location</string>
+    <!-- Dialog description that will explain the steps needed to give location permission -->
+    <string name="AttachmentManager_signal_to_send_location">To send your location:</string>
+    <!-- Alert dialog description asking for location permission -->
+    <string name="AttachmentManager_signal_allow_signal_access_location">Allow Molly access to send your location.</string>
+    <!-- Toast text explaining Signal\'s need for location access -->
+    <string name="AttachmentManager_signal_needs_location_access">Molly needs location access to send your location.</string>
+
     <!-- Alert dialog title to show the recipient has not activated payments -->
     <string name="AttachmentManager__not_activated_payments">%1$s nemá aktivované Platby </string>
     <!-- Alert dialog description to send the recipient a request to activate payments -->
@@ -243,7 +251,7 @@
     <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>
@@ -392,8 +400,16 @@
     <string name="ConversationActivity_your_request_to_join_has_been_sent_to_the_group_admin">Váš požadavek na připojení ke skupině byl zaslán správci. Budete upozorněni, jakmile zareaguje.</string>
     <string name="ConversationActivity_cancel_request">Zrušit požadavek</string>
 
-    <string name="ConversationActivity_to_send_audio_messages_allow_signal_access_to_your_microphone">Pro posílání audio zpráv potřebuje Molly přístup k mikrofonu.</string>
+    <!-- Dialog title asking users for microphone permission -->
+    <string name="ConversationActivity_allow_access_microphone">Allow access to your microphone</string>
+    <!-- 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>
+    <!-- Toast text explaining Signal\'s need for microphone access -->
+    <string name="ConversationActivity_signal_needs_microphone_access_voice_message">Molly needs microphone access to record a voice message.</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">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>
@@ -417,10 +433,17 @@
     <string name="ConversationActivity_you_will_leave_this_group_and_it_will_be_deleted_from_all_of_your_devices">Tuto skupinu opustíte a bude odstraněna ze všech vašich zařízení.</string>
     <string name="ConversationActivity_delete">Odstranit</string>
     <string name="ConversationActivity_delete_and_leave">Odstranit a opustit</string>
-    <string name="ConversationActivity__to_call_s_signal_needs_access_to_your_microphone">Molly potřebuje přístup k vašemu mikrofonu pro volání %1$s</string>
+
+    <!-- Dialog description that will explain the steps needed to give microphone permissions for a voice call -->
+    <string name="ConversationActivity__to_start_call">To start a 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">To start a call, allow Molly access to your microphone.</string>
+    <!-- Toast text explaining Signal\'s need for microphone access for a voice call -->
+    <string name="ConversationActivity_signal_needs_microphone_access_voice_call">Molly needs microphone access to start a call.</string>
 
 
     <string name="ConversationActivity_join">Připojit</string>
+    <!-- Button text for an active group call but the call is currently full and unjoinable -->
     <string name="ConversationActivity_full">Plno</string>
 
     <string name="ConversationActivity_error_sending_media">Chyba při odesílání médií</string>
@@ -645,6 +668,7 @@
     <string name="ConversationListFragment_unarchive">Nearchivovat</string>
     <string name="ConversationListFragment_delete">Smazat</string>
     <string name="ConversationListFragment_select_all">Vybrat vše</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 vybrán</item>
         <item quantity="few">%1$d vybráno</item>
@@ -902,6 +926,7 @@
         <item quantity="many">%1$d pozvánek odesláno</item>
         <item quantity="other">%1$d pozvánek odesláno</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">“%1$s” nemůže být přidán do skupiny automaticky.\n\nByl pozván, ale neuvidí žádné zprávy, dokud pozvání nepřijme.</string>
     <string name="GroupManagement_invite_multiple_users">Tyto uživatele nemůžete přidat do skupiny automaticky.\n\nByli pozváni, ale neuvidí žádné zprávy, dokud pozvání nepřijmou.</string>
 
@@ -1114,7 +1139,9 @@
 
     <string name="ManageGroupActivity_edit_name_and_picture">Upravit název a obrázek</string>
     <string name="ManageGroupActivity_legacy_group">Starší skupina</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">Toto je starší verze skupiny. Funkce jako správci skupin jsou dostupné pouze pro nové skupiny.</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">Toto je starší verze skupiny. Pro přístup k novým funkcím jako @zmínky a správci,</string>
     <string name="ManageGroupActivity_legacy_group_too_large">Tuto starší verzi skupiny nelze aktualizovat na novou skupinu, protože je příliš velká. Maximální velikost skupiny je %1$d.</string>
     <string name="ManageGroupActivity_upgrade_this_group">aktualizovat tuto skupinu.</string>
@@ -1359,6 +1386,7 @@
         <item quantity="other">Odstranit</item>
     </plurals>
 
+    <!-- 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 vybraný (%2$s)</item>
         <item quantity="few">%1$d vybrané (%2$s)</item>
@@ -1425,17 +1453,13 @@
     <string name="MessageRecord_left_group">Opustili jste skupinu</string>
     <string name="MessageRecord_you_updated_group">Upravili jste skupinu.</string>
     <string name="MessageRecord_the_group_was_updated">Skupina byla aktualizována.</string>
-    <!-- Update message shown when placing an outgoing 1:1 voice/audio call and it\'s answered by the other party -->
+    <!-- Update message shown when placing an outgoing 1:1 voice/audio call -->
     <string name="MessageRecord_outgoing_voice_call">Odchozí hlasový hovor</string>
-    <!-- Update message shown when placing an outgoing 1:1 video call and it\'s answered by the other party -->
+    <!-- Update message shown when placing an outgoing 1:1 video call -->
     <string name="MessageRecord_outgoing_video_call">Odchozí videohovor</string>
-    <!-- Update message shown when placing an outgoing 1:1 voice/audio call and it\'s not answered by the other party -->
-    <string name="MessageRecord_unanswered_voice_call">Nepřijatý hlasový hovor</string>
-    <!-- Update message shown when placing an outgoing 1:1 video call and it\'s not answered by the other party -->
-    <string name="MessageRecord_unanswered_video_call">Nepřijatý videohovor</string>
-    <!-- Update message shown when receiving an incoming 1:1 voice/audio call and it\'s answered -->
+    <!-- Update message shown when receiving an incoming 1:1 voice/audio call and it\'s answered or ringing -->
     <string name="MessageRecord_incoming_voice_call">Příchozí hlasový hovor</string>
-    <!-- Update message shown when receiving an incoming 1:1 video call and answered -->
+    <!-- Update message shown when receiving an incoming 1:1 video call and answered or ringing -->
     <string name="MessageRecord_incoming_video_call">Příchozí videohovor</string>
     <!-- Update message shown when receiving an incoming 1:1 voice/audio call and not answered -->
     <string name="MessageRecord_missed_voice_call">Zmeškaný hlasový hovor</string>
@@ -1445,10 +1469,6 @@
     <string name="MessageRecord_missed_voice_call_notification_profile">Zmeškaný hlasový hovor při zapnutém profilu oznámení</string>
     <!-- Update message shown when receiving an incoming video call and declined due to notification profile -->
     <string name="MessageRecord_missed_video_call_notification_profile">Zmeškaný videohovor při zapnutém profilu oznámení</string>
-    <!-- Update message shown when receiving an incoming 1:1 voice/audio call and explicitly declined -->
-    <string name="MessageRecord_you_declined_a_voice_call">Odmítli jste hlasový hovor</string>
-    <!-- Update message shown when receiving an incoming 1:1 video call and explicitly declined -->
-    <string name="MessageRecord_you_declined_a_video_call">Odmítli jste videohovor</string>
     <!-- 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 upravil skupinu.</string>
@@ -1673,30 +1693,55 @@
     <string name="MessageRecord_can_accept_payments">%1$s teď může přijímat Platby</string>
 
     <!-- Group Calling update messages -->
-    <string name="MessageRecord_s_started_a_group_call_s">%1$s zahájil skupinový hovor · %2$s</string>
-    <string name="MessageRecord_you_started_a_group_call_s">Zahájili jste skupinový hovor · %1$s</string>
-    <string name="MessageRecord_s_is_in_the_group_call_s">%1$s se účastní skupinového hovoru · %2$s</string>
-    <string name="MessageRecord_you_are_in_the_group_call_s1">Účastníte se skupinového hovoru · %1$s</string>
-    <string name="MessageRecord_s_and_s_are_in_the_group_call_s1">%1$s a %2$s se účastní skupinového hovoru · %3$s</string>
-    <string name="MessageRecord_group_call_s">Skupinový hovor · %1$s</string>
-
-    <string name="MessageRecord_s_started_a_group_call">%1$s zahájil skupinový hovor</string>
-    <string name="MessageRecord_you_started_a_group_call">Zahájili jste skupinový hovor</string>
-    <string name="MessageRecord_s_is_in_the_group_call">%1$s se účastní skupinového hovoru</string>
-    <string name="MessageRecord_you_are_in_the_group_call">Účastníte se skupinového hovoru</string>
-    <string name="MessageRecord_s_and_s_are_in_the_group_call">%1$s a %2$s se účastní skupinového hovoru</string>
-    <string name="MessageRecord_group_call">Skupinový hovor</string>
+    <!-- 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 se účastní hovoru · %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">Účastníte se hovoru · %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 a %2$s se účastní hovoru · %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 se účastní hovoru</string>
+    <!-- Chat log text for an ongoing group call only the local user has joined -->
+    <string name="MessageRecord_you_are_in_the_call">Účastníte se hovoru</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 a %2$s se účastní hovoru</string>
+    <!-- Chat log text for a group call that ended within the last 5 minutes -->
+    <string name="MessageRecord__the_video_call_has_ended">Videohovor skončil</string>
+    <!-- Chat log text for a group call that ended within the last 5 minutes with a placeholder for formatted time -->
+    <string name="MessageRecord__the_video_call_has_ended_s">Videohovor skončil · %1$s</string>
+    <!-- Chat log text for a group call that ended more than 5 minutes ago and was missed -->
+    <string name="MessageRecord__missed_video_call">Zmeškaný videohovor</string>
+    <!-- Chat log text for a group call that ended more than 5 minutes ago and was missed with a placeholder for formatted time -->
+    <string name="MessageRecord__missed_video_call_s">Zmeškaný videohovor · %1$s</string>
+    <!-- Chat log text for a group call that ended that the local user did not start -->
+    <string name="MessageRecord__incoming_video_call">Příchozí videohovor</string>
+    <!-- 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">Příchozí videohovor · %1$s</string>
+    <!-- Chat log text for a group call that ended that the local user started -->
+    <string name="MessageRecord__outgoing_video_call">Odchozí videohovor</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">Odchozí videohovor · %1$s</string>
+    <!-- Chat log text for an ongoing group call that the local user started -->
+    <string name="MessageRecord__you_started_a_video_call">Zahájili jste videohovor</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">Zahájili jste videohovor · %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">Uživatel %1$s zahájil videohovor</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">Uživatel %1$s zahájil videohovor · %2$s</string>
 
     <string name="MessageRecord_you">Vy</string>
 
-    <plurals name="MessageRecord_s_s_and_d_others_are_in_the_group_call_s">
+    <!-- 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 a %3$d další se účastní skupinového hovoru · %4$s</item>
         <item quantity="few">%1$s, %2$s a %3$d další se účastní skupinového hovoru · %4$s</item>
         <item quantity="many">%1$s, %2$s a %3$d dalších se účastní skupinového hovoru · %4$s</item>
         <item quantity="other">%1$s, %2$s a %3$d dalších se účastní skupinového hovoru · %4$s</item>
     </plurals>
 
-    <plurals name="MessageRecord_s_s_and_d_others_are_in_the_group_call">
+    <!-- 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 a %3$d další se účastní skupinového hovoru</item>
         <item quantity="few">%1$s, %2$s a %3$d dalších se účastní skupinového hovoru</item>
         <item quantity="many">%1$s, %2$s a %3$d dalších se účastní skupinového hovoru</item>
@@ -2221,6 +2266,7 @@
     <!-- Generic error when the app is unable to request an SMS code for an unknown reason. -->
     <string name="RegistrationActivity_unable_to_request_verification_code">Ověřovací kód nelze vyžádat. Zkontrolujte připojení k internetu a zkuste to znovu.</string>
     <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">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.-->
@@ -2367,7 +2413,7 @@
     <string name="SubmitDebugLogActivity_this_log_will_be_posted_publicly_online_for_contributors">Tento protokol bude zveřejněn online, aby si jej mohli prohlédnout přispěvatelé. Před odesláním si jej můžete prohlédnout.</string>
 
     <!-- SupportEmailUtil -->
-  <!-- Removed by excludeNonTranslatables <string name="SupportEmailUtil_support_email" translatable="false">support@molly.im</string> -->
+  <!-- Removed by excludeNonTranslatables <string name="SupportEmailUtil_support_email" translatable="false">support@signal.org</string> -->
     <string name="SupportEmailUtil_filter">Filtr:</string>
     <string name="SupportEmailUtil_device_info">Informace o zařízení:</string>
     <string name="SupportEmailUtil_android_version">Verze Androidu:</string>
@@ -2883,6 +2929,8 @@
     <string name="ConversationUpdateItem_loading">Načítám</string>
     <string name="ConversationUpdateItem_learn_more">Zjistit více</string>
     <string name="ConversationUpdateItem_join_call">Připojit se k hovoru</string>
+    <!-- Action button label for starting a new call in the current conversation -->
+    <string name="ConversationUpdateItem_call_back">Zavolat zpět</string>
     <string name="ConversationUpdateItem_return_to_call">Vrátit se k hovoru</string>
     <string name="ConversationUpdateItem_call_is_full">Hovor je plný</string>
     <string name="ConversationUpdateItem_invite_friends">Pozvat přátele</string>
@@ -2947,6 +2995,7 @@
     <string name="safety_number_change_dialog__leave_call">Opustit hovor</string>
     <string name="safety_number_change_dialog__the_following_people_may_have_reinstalled_or_changed_devices">Následující lidé možná přeinstalovali nebo změnili zařízení. Ověřte s nimi svoje bezpečnostní číslo pro zajištění soukromí.</string>
     <string name="safety_number_change_dialog__view">Zobrazit</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">Předchozí ověřeno</string>
 
     <!-- EnableCallNotificationSettingsDialog__call_notifications_checklist -->
@@ -3274,6 +3323,7 @@
 
     <string name="arrays__default">Výchozí</string>
     <string name="arrays__high">Vysoká</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">Max</string>
 
     <!-- plurals.xml -->
@@ -3551,7 +3601,7 @@
     <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 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>
@@ -3600,6 +3650,14 @@
     <!-- Storage permission row description -->
     <string name="GrantPermissionsFragment__send_photos_videos_and_files">Posílejte fotky, videa a soubory přímo ze svého zařízení.</string>
 
+    <!-- PermissionDeniedBottomSheet -->
+    <!-- Sheet describing step 1 on how to give permissions by opening settings -->
+    <string name="PermissionDeniedBottomSheet__1_tap_settings_below">1. Tap “Settings” below</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 Allow the permission</string>
+    <!-- Label for button at the bottom of the sheet which opens the system permission settings -->
+    <string name="PermissionDeniedBottomSheet__settings">Settings</string>
+
     <!-- PaymentsSecuritySetupFragment -->
     <!-- Toolbar title -->
     <string name="PaymentsSecuritySetupFragment__security_setup">Nastavení zabezpečení</string>
@@ -3640,6 +3698,7 @@
     <string name="PaymentsDetailsFragment__sent_to_s">Odesláno pro %1$s</string>
     <string name="PaymentsDetailsFragment__you_on_s_at_s">Vy na %1$s v %2$s</string>
     <string name="PaymentsDetailsFragment__s_on_s_at_s">%1$s na %2$s v %3$s</string>
+    <!-- Prefix to a name to indicate who a payment was sent to -->
     <string name="PaymentsDetailsFragment__to">Komu</string>
     <string name="PaymentsDetailsFragment__from">Od</string>
     <string name="PaymentsDetailsFragment__information">Podrobnosti transakce, včetně částky platby a času transakce, jsou součástí knihy MobileCoin.</string>
@@ -3702,6 +3761,7 @@
     <string name="ConfirmPayment__confirm_payment">Potvrdit platbu</string>
     <string name="ConfirmPayment__network_fee">Poplatek sítě</string>
     <string name="ConfirmPayment__estimated_s">Odhadováno %1$s</string>
+    <!-- Prefix to a name to indicate who a payment will be sent to -->
     <string name="ConfirmPayment__to">Komu</string>
     <string name="ConfirmPayment__total_amount">Celková částka</string>
     <string name="ConfirmPayment__balance_s">Zůstatek: %1$s</string>
@@ -3856,6 +3916,14 @@
     <string name="conversation_group_options__conversation">Chatovat</string>
     <string name="conversation_group_options__broadcast">Rozeslat</string>
 
+    <!-- DoubleTapEditEducationSheet -->
+    <!-- Displayed as the title of the education bottom sheet -->
+    <string name="DoubleTapEditEducationSheet__double_tap_edit_title">Double tap to edit</string>
+    <!-- Text on the sheet explaining how double tapping on a message will let them edit it -->
+    <string name="DoubleTapEditEducationSheet__quickly_tap_twice">Quickly tap twice on your messages to edit them. You can edit your messages up to 24hrs after they’ve been sent.</string>
+    <!-- Button label to dismiss sheet -->
+    <string name="DoubleTapEditEducationSheet__got_it">Got it</string>
+
     <!-- text_secure_normal -->
     <string name="text_secure_normal__menu_new_group">Nová skupina</string>
     <string name="text_secure_normal__menu_settings">Nastavení</string>
@@ -4324,6 +4392,7 @@
     <string name="RecipientBottomSheet_copied_to_clipboard">Zkopírováno do schránky</string>
 
     <string name="GroupRecipientListItem_admin">Správce</string>
+    <!-- Button text to approve a user that has requested to join a group -->
     <string name="GroupRecipientListItem_approve_description">Schválit</string>
     <string name="GroupRecipientListItem_deny_description">Odmítnout</string>
 
@@ -4351,6 +4420,7 @@
 
     <!-- VoiceNoteMediaDescriptionCompatFactory -->
     <string name="VoiceNoteMediaItemFactory__voice_message">Hlasová zpráva · %1$s</string>
+    <!-- This is a title in a banner describing the conversation sender to receiver placeholders of the currently playing voice memo. -->
     <string name="VoiceNoteMediaItemFactory__s_to_s">%1$s pro %2$s</string>
 
     <!-- StorageUtil -->
@@ -4364,8 +4434,20 @@
     <string name="ReviewCardDialogFragment__review_members">Zkontrolovat členy</string>
     <!-- Title of a screen where the user will be prompted to review a message request matching the name of someone they already know -->
     <string name="ReviewCardDialogFragment__review_request">Zkontrolovat žádost</string>
-    <string name="ReviewCardDialogFragment__d_group_members_have_the_same_name">%1$d členů skupiny má stejné jméno, prověřte níže uvedené členy a zvolte akci.</string>
-    <string name="ReviewCardDialogFragment__if_youre_not_sure">Pokud si nejste jistí, od koho je požadavek, tak prověřte kontakty a proveďte akci.</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="few">%1$d group members have the same name, review the members below and choose to take action.</item>
+        <item quantity="many">%1$d group members have the same name, review the members 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 -->
+    <plurals name="ReviewCardDialogFragment__if_youre_not_sure">
+        <item quantity="one">If you\'re not sure who the request is from, review the contact below and take action.</item>
+        <item quantity="few">If you\'re not sure who the request is from, review the contacts below and take action.</item>
+        <item quantity="many">If you\'re not sure who the request is from, review the contacts below and take action.</item>
+        <item quantity="other">If you\'re not sure who the request is from, review the contacts below and take action.</item>
+    </plurals>
     <string name="ReviewCardDialogFragment__no_other_groups_in_common">Žádné další společné skupiny.</string>
     <string name="ReviewCardDialogFragment__no_groups_in_common">Žádné společné skupiny.</string>
     <plurals name="ReviewCardDialogFragment__d_other_groups_in_common">
@@ -4400,11 +4482,24 @@
     <string name="CallParticipantsListUpdatePopupWindow__s_joined">%1$s se připojil</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_and_s_joined">%1$s a %2$s se připojili</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_s_and_s_joined">%1$s, %2$s a %3$s se připojili.</string>
-    <string name="CallParticipantsListUpdatePopupWindow__s_s_and_d_others_joined">%1$s, %2$s, %3$d a další se připojili</string>
+    <!-- Toast message shown in group call when 3 or more people join -->
+    <plurals name="CallParticipantsListUpdatePopupWindow__s_s_and_d_others_joined">
+        <item quantity="one">%1$s, %2$s and %3$d other joined</item>
+        <item quantity="few">%1$s, %2$s and %3$d others joined</item>
+        <item quantity="many">%1$s, %2$s and %3$d others joined</item>
+        <item quantity="other">%1$s, %2$s and %3$d others joined</item>
+    </plurals>
+    <!-- Toast/popup text shown when someone leaves a group call -->
     <string name="CallParticipantsListUpdatePopupWindow__s_left">%1$s odešel</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_and_s_left">%1$s a %2$s odešli</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_s_and_s_left">%1$s, %2$s a %3$s odešli</string>
-    <string name="CallParticipantsListUpdatePopupWindow__s_s_and_d_others_left">%1$s, %2$s ,%3$d a další odešli</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 and %3$d other left</item>
+        <item quantity="few">%1$s, %2$s and %3$d others left</item>
+        <item quantity="many">%1$s, %2$s and %3$d others left</item>
+        <item quantity="other">%1$s, %2$s and %3$d others left</item>
+    </plurals>
 
     <string name="CallParticipant__you">Vy</string>
     <string name="CallParticipant__you_on_another_device">Vy (na jiném zařízení)</string>
@@ -4778,10 +4873,17 @@
 
     <!-- PrivacySettingsFragment -->
     <string name="PrivacySettingsFragment__blocked">Zablokováno</string>
-    <string name="PrivacySettingsFragment__d_contacts">%1$d kontakty</string>
+    <!-- Settings label that shows the number blocked contacts -->
+    <plurals name="PrivacySettingsFragment__d_contacts">
+        <item quantity="one">%1$d contact</item>
+        <item quantity="few">%1$d contacts</item>
+        <item quantity="many">%1$d contacts</item>
+        <item quantity="other">%1$d contacts</item>
+    </plurals>
     <string name="PrivacySettingsFragment__messaging">Odesílání zpráv</string>
     <string name="PrivacySettingsFragment__disappearing_messages">Mizející zprávy</string>
     <string name="PrivacySettingsFragment__app_security">Zabezpečení aplikace</string>
+    <!-- This refers to the multi-tasking overview (recent apps) from the Android operating system.-->
     <string name="PrivacySettingsFragment__block_screenshots_in_the_recents_list_and_inside_the_app">Blokovat snímky obrazovky v seznamu posledních položek a uvnitř aplikace</string>
     <string name="PrivacySettingsFragment__signal_message_and_calls">Signal zprávy a hovory, vždy předávat hovory, a utajený odesílatel.</string>
     <string name="PrivacySettingsFragment__default_timer_for_new_changes">Výchozí časovač pro nové chaty</string>
@@ -4838,11 +4940,14 @@
     <string name="DataAndStorageSettingsFragment__media_quality">Kvalita médií</string>
     <string name="DataAndStorageSettingsFragment__sent_media_quality">Kvalita odeslaných médií</string>
     <string name="DataAndStorageSettingsFragment__sending_high_quality_media_will_use_more_data">Odesílání médií ve vysoké kvalitě spotřebovává více dat.</string>
+    <!-- Setting option that can be selected to default media to be sent as high quality by default -->
     <string name="DataAndStorageSettingsFragment__high">Vysoká</string>
+    <!-- Setting option that can be selected to default media to be sent as standard quality by default -->
     <string name="DataAndStorageSettingsFragment__standard">Standard</string>
     <string name="DataAndStorageSettingsFragment__calls">Volání</string>
 
     <!-- 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__use_custom_colors">Použít vlastní barvy</string>
     <string name="ChatColorSelectionFragment__chat_color">Barva chatu</string>
@@ -5060,6 +5165,7 @@
     <string name="AvatarPickerFragment__take_a_picture">Vyfotit</string>
     <string name="AvatarPickerFragment__choose_a_photo">Vybrat fotku</string>
     <string name="AvatarPickerFragment__photo">Fotografie</string>
+    <!-- Button label during avatar selection/creation that when tapped lets you generate an avatar from typed in text. -->
     <string name="AvatarPickerFragment__text">Text</string>
     <string name="AvatarPickerFragment__save">Uložit</string>
     <string name="AvatarPickerFragment__clear_avatar">Smazat avatar</string>
@@ -5128,7 +5234,7 @@
     <string name="MediaReviewFragment__add_a_message">Přidat zprávu</string>
     <string name="MediaReviewFragment__add_a_reply">Přidat odpověď</string>
     <string name="MediaReviewFragment__send_to">Odeslat uživateli</string>
-    <string name="MediaReviewFragment__view_once_message">Zpráva pro jednorázové zobrazení</string>
+    <string name="MediaReviewFragment__view_once_message">Média, která lze zobrazit jen jednou</string>
     <string name="MediaReviewFragment__one_or_more_items_were_too_large">Jeden nebo více souborů je moc velkých</string>
     <string name="MediaReviewFragment__one_or_more_items_were_invalid">Jeden nebo více souborů je neplatných</string>
     <string name="MediaReviewFragment__too_many_items_selected">Příliš mnoho vybraných položek</string>
@@ -5731,7 +5837,7 @@
     <string name="StoryViewerFragment__s_s">%1$s %2$s</string>
     <!-- Displayed when viewing a post you sent -->
     <string name="StoryViewerPageFragment__you">Vy</string>
-    <!-- Displayed when viewing a post displayed to a group -->
+    <!-- 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 pro %2$s</string>
     <!-- Displayed when viewing a post from another user with no replies -->
     <string name="StoryViewerPageFragment__reply">Odpověď</string>
@@ -6996,5 +7102,26 @@
     <!-- Content description for opening the note editor -->
     <string name="ViewNoteSheet__edit_note">Upravit poznámku</string>
 
+    <!-- BackupProgressService -->
+    <!-- Notification title shown while backup restore job is running -->
+    <string name="BackupProgressService_title">Obnovování zálohy…</string>
+    <!-- Notification title shown while downloading backup restore data -->
+    <string name="BackupProgressService_title_downloading">Stahování záložních dat…</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>
+    <!-- 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 -->
+    <string name="BackupsTypeSettingsFragment__google_pay">Google Pay</string>
+    <!-- Displayed as the user\'s payment method as a label in a preference row -->
+    <string name="BackupsTypeSettingsFragment__bank_transfer">Bank transfer</string>
+    <!-- Displayed as the user\'s payment method as a label in a preference row -->
+    <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>
+
+
     <!-- 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 8af5ba23c7..c7fe9d680c 100644
--- a/app/src/main/res/values-da/strings.xml
+++ b/app/src/main/res/values-da/strings.xml
@@ -1,6 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- smartling.instruction_comments_enabled = on -->
-<resources>
+<?xml version="1.0" encoding="UTF-8"?><!-- 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> -->
@@ -89,6 +87,16 @@
     <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">Allow access to your location</string>
+    <!-- Dialog description that will explain the steps needed to give location permission -->
+    <string name="AttachmentManager_signal_to_send_location">To send your location:</string>
+    <!-- Alert dialog description asking for location permission -->
+    <string name="AttachmentManager_signal_allow_signal_access_location">Allow Molly access to send your location.</string>
+    <!-- Toast text explaining Signal\'s need for location access -->
+    <string name="AttachmentManager_signal_needs_location_access">Molly needs location access to send your location.</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>
     <!-- Alert dialog description to send the recipient a request to activate payments -->
@@ -241,7 +249,7 @@
     <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>
@@ -386,8 +394,16 @@
     <string name="ConversationActivity_your_request_to_join_has_been_sent_to_the_group_admin">Din anmodning om at blive medlem er sendt til gruppeadministratoren. Du får besked, når den er behandlet.</string>
     <string name="ConversationActivity_cancel_request">Annullér anmodning</string>
 
-    <string name="ConversationActivity_to_send_audio_messages_allow_signal_access_to_your_microphone">For at sende talebeskeder skal du give Molly tilladelse til at tilgå mikrofonen.</string>
+    <!-- Dialog title asking users for microphone permission -->
+    <string name="ConversationActivity_allow_access_microphone">Allow access to your microphone</string>
+    <!-- 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>
+    <!-- Toast text explaining Signal\'s need for microphone access -->
+    <string name="ConversationActivity_signal_needs_microphone_access_voice_message">Molly needs microphone access to record a voice message.</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">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>
@@ -411,10 +427,17 @@
     <string name="ConversationActivity_you_will_leave_this_group_and_it_will_be_deleted_from_all_of_your_devices">Du forlader gruppen, og den vil blive slettet fra alle dine enheder.</string>
     <string name="ConversationActivity_delete">Slet</string>
     <string name="ConversationActivity_delete_and_leave">Slet og forlad</string>
-    <string name="ConversationActivity__to_call_s_signal_needs_access_to_your_microphone">For at ringe til %1$s kræver Molly tilladelse til at tilgå din mikrofon</string>
+
+    <!-- Dialog description that will explain the steps needed to give microphone permissions for a voice call -->
+    <string name="ConversationActivity__to_start_call">To start a 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">To start a call, allow Molly access to your microphone.</string>
+    <!-- Toast text explaining Signal\'s need for microphone access for a voice call -->
+    <string name="ConversationActivity_signal_needs_microphone_access_voice_call">Molly needs microphone access to start a call.</string>
 
 
     <string name="ConversationActivity_join">Deltag</string>
+    <!-- Button text for an active group call but the call is currently full and unjoinable -->
     <string name="ConversationActivity_full">Fuld</string>
 
     <string name="ConversationActivity_error_sending_media">Fejl ved afsendelse af mediefil</string>
@@ -613,6 +636,7 @@
     <string name="ConversationListFragment_unarchive">Flyt fra arkiv</string>
     <string name="ConversationListFragment_delete">Slet</string>
     <string name="ConversationListFragment_select_all">Vælg alle</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 valgt</item>
         <item quantity="other">%1$d valgte</item>
@@ -864,6 +888,7 @@
         <item quantity="one">Invitation sendt</item>
         <item quantity="other">%1$d invitationer sendt</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">%1$s kan ikke automatisk tilføjes til gruppen af dig. \n\nDe er blevet inviteret til at deltage, og kan ikke se nogen gruppebeskeder, før de accepterer.</string>
     <string name="GroupManagement_invite_multiple_users">Disse brugere kan ikke automatisk tilføjes til gruppen af dig. De er blevet inviteret til at deltage, og kan ikke se gruppebeskeder før de accepterer.</string>
 
@@ -1044,7 +1069,9 @@
 
     <string name="ManageGroupActivity_edit_name_and_picture">Redigér navn og billede</string>
     <string name="ManageGroupActivity_legacy_group">Forældet gruppe</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">Dette er en forældret gruppe. Funktioner som gruppeadministratorer, er kun tilgængelige for nye grupper</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">Dette er en forældet gruppe. For adgang til nye funktioner som @omtaler og administrator,</string>
     <string name="ManageGroupActivity_legacy_group_too_large">Denne forældede gruppe er for stor til at kunne opgraderes til en Ny gruppe. Den maksimale størrelse på grupper er %1$d</string>
     <string name="ManageGroupActivity_upgrade_this_group">opgrader denne gruppe.</string>
@@ -1271,6 +1298,7 @@
         <item quantity="other">Slet</item>
     </plurals>
 
+    <!-- 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 valgt (%2$s)</item>
         <item quantity="other">%1$d valgte (%2$s)</item>
@@ -1335,17 +1363,13 @@
     <string name="MessageRecord_left_group">Du har forladt gruppen.</string>
     <string name="MessageRecord_you_updated_group">Du opdaterede gruppen.</string>
     <string name="MessageRecord_the_group_was_updated">Gruppen blev opdateret.</string>
-    <!-- Update message shown when placing an outgoing 1:1 voice/audio call and it\'s answered by the other party -->
+    <!-- Update message shown when placing an outgoing 1:1 voice/audio call -->
     <string name="MessageRecord_outgoing_voice_call">Udgående stemmeopkald</string>
-    <!-- Update message shown when placing an outgoing 1:1 video call and it\'s answered by the other party -->
+    <!-- Update message shown when placing an outgoing 1:1 video call -->
     <string name="MessageRecord_outgoing_video_call">Udgående videoopkald</string>
-    <!-- Update message shown when placing an outgoing 1:1 voice/audio call and it\'s not answered by the other party -->
-    <string name="MessageRecord_unanswered_voice_call">Ubesvaret stemmeopkald</string>
-    <!-- Update message shown when placing an outgoing 1:1 video call and it\'s not answered by the other party -->
-    <string name="MessageRecord_unanswered_video_call">Ubesvaret videoopkald</string>
-    <!-- Update message shown when receiving an incoming 1:1 voice/audio call and it\'s answered -->
+    <!-- Update message shown when receiving an incoming 1:1 voice/audio call and it\'s answered or ringing -->
     <string name="MessageRecord_incoming_voice_call">Indgående stemmeopkald</string>
-    <!-- Update message shown when receiving an incoming 1:1 video call and answered -->
+    <!-- Update message shown when receiving an incoming 1:1 video call and answered or ringing -->
     <string name="MessageRecord_incoming_video_call">Indgående videoopkald</string>
     <!-- Update message shown when receiving an incoming 1:1 voice/audio call and not answered -->
     <string name="MessageRecord_missed_voice_call">Ubesvaret stemmeopkald</string>
@@ -1355,10 +1379,6 @@
     <string name="MessageRecord_missed_voice_call_notification_profile">Ubesvaret taleopkald, mens notifikationsprofilen var aktiveret</string>
     <!-- Update message shown when receiving an incoming video call and declined due to notification profile -->
     <string name="MessageRecord_missed_video_call_notification_profile">Ubesvaret videoopkald, mens notifikationsprofilen var aktiveret</string>
-    <!-- Update message shown when receiving an incoming 1:1 voice/audio call and explicitly declined -->
-    <string name="MessageRecord_you_declined_a_voice_call">Du afviste et stemmeopkald</string>
-    <!-- Update message shown when receiving an incoming 1:1 video call and explicitly declined -->
-    <string name="MessageRecord_you_declined_a_video_call">Du afviste et videoopkald</string>
     <!-- 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 opdaterede gruppen.</string>
@@ -1567,28 +1587,53 @@
     <string name="MessageRecord_can_accept_payments">%1$s kan nu acceptere betalinger</string>
 
     <!-- Group Calling update messages -->
-    <string name="MessageRecord_s_started_a_group_call_s">%1$s startede et gruppeopkald · %2$s</string>
-    <string name="MessageRecord_you_started_a_group_call_s">Du startede et gruppeopkald · %1$s</string>
-    <string name="MessageRecord_s_is_in_the_group_call_s">%1$s er med i gruppeopkaldet · %2$s</string>
-    <string name="MessageRecord_you_are_in_the_group_call_s1">Du er med i gruppeopkaldet · %1$s</string>
-    <string name="MessageRecord_s_and_s_are_in_the_group_call_s1">%1$s og %2$s er med i gruppeopkaldet · %3$s</string>
-    <string name="MessageRecord_group_call_s">Gruppeopkald · %1$s</string>
-
-    <string name="MessageRecord_s_started_a_group_call">%1$s startede et gruppeopkald</string>
-    <string name="MessageRecord_you_started_a_group_call">Du startede et gruppeopkald</string>
-    <string name="MessageRecord_s_is_in_the_group_call">%1$s er med i gruppeopkaldet</string>
-    <string name="MessageRecord_you_are_in_the_group_call">Du er med i gruppeopkaldet</string>
-    <string name="MessageRecord_s_and_s_are_in_the_group_call">%1$s og %2$s er med i gruppeopkaldet</string>
-    <string name="MessageRecord_group_call">Gruppeopkald</string>
+    <!-- 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 er med i opkaldet · %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">Du er med i opkaldet · %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 og %2$s er med i opkaldet · %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 er med i opkaldet</string>
+    <!-- Chat log text for an ongoing group call only the local user has joined -->
+    <string name="MessageRecord_you_are_in_the_call">Du er med i opkaldet</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 og %2$s er med i opkaldet</string>
+    <!-- Chat log text for a group call that ended within the last 5 minutes -->
+    <string name="MessageRecord__the_video_call_has_ended">Videoopkaldet er afsluttet</string>
+    <!-- Chat log text for a group call that ended within the last 5 minutes with a placeholder for formatted time -->
+    <string name="MessageRecord__the_video_call_has_ended_s">Videoopkaldet er afsluttet · %1$s</string>
+    <!-- Chat log text for a group call that ended more than 5 minutes ago and was missed -->
+    <string name="MessageRecord__missed_video_call">Ubesvaret videoopkald</string>
+    <!-- Chat log text for a group call that ended more than 5 minutes ago and was missed with a placeholder for formatted time -->
+    <string name="MessageRecord__missed_video_call_s">Ubesvaret videoopkald · %1$s</string>
+    <!-- Chat log text for a group call that ended that the local user did not start -->
+    <string name="MessageRecord__incoming_video_call">Indgående videoopkald</string>
+    <!-- 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">Indgående videoopkald · %1$s</string>
+    <!-- Chat log text for a group call that ended that the local user started -->
+    <string name="MessageRecord__outgoing_video_call">Udgående videoopkald</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">Udgående videoopkald · %1$s</string>
+    <!-- Chat log text for an ongoing group call that the local user started -->
+    <string name="MessageRecord__you_started_a_video_call">Du startede et videoopkald</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">Du startede et videoopkald · %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 startede et videoopkald</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 startede et videoopkald · %2$s</string>
 
     <string name="MessageRecord_you">Dig</string>
 
-    <plurals name="MessageRecord_s_s_and_d_others_are_in_the_group_call_s">
+    <!-- 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, og %3$d andre deltager i gruppesamtalen · %4$s</item>
         <item quantity="other">%1$s, %2$s, og %3$d andre er med i gruppeopkaldet · %4$s</item>
     </plurals>
 
-    <plurals name="MessageRecord_s_s_and_d_others_are_in_the_group_call">
+    <!-- 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, og %3$d andre deltager i gruppesamtalen</item>
         <item quantity="other">%1$s, %2$s, og %3$d andre er med i gruppeopkaldet</item>
     </plurals>
@@ -2063,6 +2108,7 @@
     <!-- Generic error when the app is unable to request an SMS code for an unknown reason. -->
     <string name="RegistrationActivity_unable_to_request_verification_code">Kunne ikke anmode om verificeringskoden. Tjek din netværksforbindelse, og prøv igen.</string>
     <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">Molly Android - Telefonnummerformat</string>
     <!--    Small "toast" notification to the user confirming that they have requested a new code via voice call.-->
@@ -2207,7 +2253,7 @@
     <string name="SubmitDebugLogActivity_this_log_will_be_posted_publicly_online_for_contributors">Denne log vil blive offentliggjort online, så bidragyderne kan se den. Du kan undersøge den, inden den uploades.</string>
 
     <!-- SupportEmailUtil -->
-  <!-- Removed by excludeNonTranslatables <string name="SupportEmailUtil_support_email" translatable="false">support@molly.im</string> -->
+  <!-- Removed by excludeNonTranslatables <string name="SupportEmailUtil_support_email" translatable="false">support@signal.org</string> -->
     <string name="SupportEmailUtil_filter">Filter:</string>
     <string name="SupportEmailUtil_device_info">Enheds info:</string>
     <string name="SupportEmailUtil_android_version">Android version:</string>
@@ -2709,6 +2755,8 @@
     <string name="ConversationUpdateItem_loading">Henter</string>
     <string name="ConversationUpdateItem_learn_more">Læs mere</string>
     <string name="ConversationUpdateItem_join_call">Deltag i opkald</string>
+    <!-- Action button label for starting a new call in the current conversation -->
+    <string name="ConversationUpdateItem_call_back">Ring tilbage</string>
     <string name="ConversationUpdateItem_return_to_call">Tilbage til opkald</string>
     <string name="ConversationUpdateItem_call_is_full">Opkald er fuld</string>
     <string name="ConversationUpdateItem_invite_friends">Inviter venner</string>
@@ -2773,6 +2821,7 @@
     <string name="safety_number_change_dialog__leave_call">Forlad opkaldet</string>
     <string name="safety_number_change_dialog__the_following_people_may_have_reinstalled_or_changed_devices">Følgende personer kan have geninstalleret eller skiftet enheder. Bekræft dit sikkerhedsnummer med dem for at sikre privatlivets fred.</string>
     <string name="safety_number_change_dialog__view">Vis</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">Tidligere bekræftet</string>
 
     <!-- EnableCallNotificationSettingsDialog__call_notifications_checklist -->
@@ -3086,6 +3135,7 @@
 
     <string name="arrays__default">Standard</string>
     <string name="arrays__high">Høj</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">Max.</string>
 
     <!-- plurals.xml -->
@@ -3357,7 +3407,7 @@
     <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 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>
@@ -3406,6 +3456,14 @@
     <!-- Storage permission row description -->
     <string name="GrantPermissionsFragment__send_photos_videos_and_files">Send billeder, videoer og filer fra din enhed.</string>
 
+    <!-- PermissionDeniedBottomSheet -->
+    <!-- Sheet describing step 1 on how to give permissions by opening settings -->
+    <string name="PermissionDeniedBottomSheet__1_tap_settings_below">1. Tap “Settings” below</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 Allow the permission</string>
+    <!-- Label for button at the bottom of the sheet which opens the system permission settings -->
+    <string name="PermissionDeniedBottomSheet__settings">Settings</string>
+
     <!-- PaymentsSecuritySetupFragment -->
     <!-- Toolbar title -->
     <string name="PaymentsSecuritySetupFragment__security_setup">Sikkerhedsindstillinger</string>
@@ -3446,6 +3504,7 @@
     <string name="PaymentsDetailsFragment__sent_to_s">Sendt til %1$s</string>
     <string name="PaymentsDetailsFragment__you_on_s_at_s">Dig på %1$s ved %2$s</string>
     <string name="PaymentsDetailsFragment__s_on_s_at_s">%1$s på %2$s kl. %3$s</string>
+    <!-- Prefix to a name to indicate who a payment was sent to -->
     <string name="PaymentsDetailsFragment__to">Til</string>
     <string name="PaymentsDetailsFragment__from">Fra</string>
     <string name="PaymentsDetailsFragment__information">Transaktionsoplysninger, herunder betalingsbeløb og tidspunkt for transaktionen, er en del af MobileCoin-registret.</string>
@@ -3508,6 +3567,7 @@
     <string name="ConfirmPayment__confirm_payment">Bekræft betaling</string>
     <string name="ConfirmPayment__network_fee">Netværksgebyr</string>
     <string name="ConfirmPayment__estimated_s">Anslået %1$s</string>
+    <!-- Prefix to a name to indicate who a payment will be sent to -->
     <string name="ConfirmPayment__to">Til</string>
     <string name="ConfirmPayment__total_amount">Samlet beløb</string>
     <string name="ConfirmPayment__balance_s">Saldo: %1$s</string>
@@ -3658,6 +3718,14 @@
     <string name="conversation_group_options__conversation">Chat</string>
     <string name="conversation_group_options__broadcast">Transmission</string>
 
+    <!-- DoubleTapEditEducationSheet -->
+    <!-- Displayed as the title of the education bottom sheet -->
+    <string name="DoubleTapEditEducationSheet__double_tap_edit_title">Double tap to edit</string>
+    <!-- Text on the sheet explaining how double tapping on a message will let them edit it -->
+    <string name="DoubleTapEditEducationSheet__quickly_tap_twice">Quickly tap twice on your messages to edit them. You can edit your messages up to 24hrs after they’ve been sent.</string>
+    <!-- Button label to dismiss sheet -->
+    <string name="DoubleTapEditEducationSheet__got_it">Got it</string>
+
     <!-- text_secure_normal -->
     <string name="text_secure_normal__menu_new_group">Ny gruppe</string>
     <string name="text_secure_normal__menu_settings">Indstillinger</string>
@@ -4112,6 +4180,7 @@
     <string name="RecipientBottomSheet_copied_to_clipboard">Kopieret til udklipsholder</string>
 
     <string name="GroupRecipientListItem_admin">Administrator</string>
+    <!-- Button text to approve a user that has requested to join a group -->
     <string name="GroupRecipientListItem_approve_description">Godkend</string>
     <string name="GroupRecipientListItem_deny_description">Afvis</string>
 
@@ -4139,6 +4208,7 @@
 
     <!-- VoiceNoteMediaDescriptionCompatFactory -->
     <string name="VoiceNoteMediaItemFactory__voice_message">Talebesked · %1$s</string>
+    <!-- This is a title in a banner describing the conversation sender to receiver placeholders of the currently playing voice memo. -->
     <string name="VoiceNoteMediaItemFactory__s_to_s">%1$s til %2$s</string>
 
     <!-- StorageUtil -->
@@ -4152,8 +4222,16 @@
     <string name="ReviewCardDialogFragment__review_members">Gennemgå medlemmer</string>
     <!-- Title of a screen where the user will be prompted to review a message request matching the name of someone they already know -->
     <string name="ReviewCardDialogFragment__review_request">Gennemgå anmodning</string>
-    <string name="ReviewCardDialogFragment__d_group_members_have_the_same_name">%1$d medlemmer af gruppen har det samme navn, gennemgå medlemmer herunder og vælg en handling.</string>
-    <string name="ReviewCardDialogFragment__if_youre_not_sure">Hvis du ikke er sikker på hvem forespørgslen er fra, gennemgå kontakterne herunder og vælg en handling.</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="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 -->
+    <plurals name="ReviewCardDialogFragment__if_youre_not_sure">
+        <item quantity="one">If you\'re not sure who the request is from, review the contact below and take action.</item>
+        <item quantity="other">If you\'re not sure who the request is from, review the contacts below and take action.</item>
+    </plurals>
     <string name="ReviewCardDialogFragment__no_other_groups_in_common">Ingen andre grupper til fælles</string>
     <string name="ReviewCardDialogFragment__no_groups_in_common">Ingen grupper til fælles</string>
     <plurals name="ReviewCardDialogFragment__d_other_groups_in_common">
@@ -4184,11 +4262,20 @@
     <string name="CallParticipantsListUpdatePopupWindow__s_joined">%1$s sluttede sig til opkaldet</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_and_s_joined">%1$s og %2$s sluttede sig til opkaldet</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_s_and_s_joined">%1$s, %2$s og %3$s sluttede sig til opkaldet</string>
-    <string name="CallParticipantsListUpdatePopupWindow__s_s_and_d_others_joined">%1$s, %2$s og %3$d andre sluttede sig til opkaldet</string>
+    <!-- Toast message shown in group call when 3 or more people join -->
+    <plurals name="CallParticipantsListUpdatePopupWindow__s_s_and_d_others_joined">
+        <item quantity="one">%1$s, %2$s and %3$d other joined</item>
+        <item quantity="other">%1$s, %2$s and %3$d others joined</item>
+    </plurals>
+    <!-- Toast/popup text shown when someone leaves a group call -->
     <string name="CallParticipantsListUpdatePopupWindow__s_left">%1$s forlod opkaldet</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_and_s_left">%1$s og %2$s forlod opkaldet</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_s_and_s_left">%1$s, %2$s og %3$s forlod opkaldet</string>
-    <string name="CallParticipantsListUpdatePopupWindow__s_s_and_d_others_left">%1$s, %2$s og %3$d andre forlod opkaldet</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 and %3$d other left</item>
+        <item quantity="other">%1$s, %2$s and %3$d others left</item>
+    </plurals>
 
     <string name="CallParticipant__you">Dig</string>
     <string name="CallParticipant__you_on_another_device">Dig (på en anden enhed)</string>
@@ -4558,10 +4645,15 @@
 
     <!-- PrivacySettingsFragment -->
     <string name="PrivacySettingsFragment__blocked">Blokeret</string>
-    <string name="PrivacySettingsFragment__d_contacts">%1$d kontakter</string>
+    <!-- Settings label that shows the number blocked contacts -->
+    <plurals name="PrivacySettingsFragment__d_contacts">
+        <item quantity="one">%1$d contact</item>
+        <item quantity="other">%1$d contacts</item>
+    </plurals>
     <string name="PrivacySettingsFragment__messaging">Beskeder</string>
     <string name="PrivacySettingsFragment__disappearing_messages">Forsvindende beskeder</string>
     <string name="PrivacySettingsFragment__app_security">App-sikkerhed</string>
+    <!-- This refers to the multi-tasking overview (recent apps) from the Android operating system.-->
     <string name="PrivacySettingsFragment__block_screenshots_in_the_recents_list_and_inside_the_app">Bloker muligheden for skærmbilleder i oversigten over senest anvendte apps og i Signal-appen</string>
     <string name="PrivacySettingsFragment__signal_message_and_calls">Signal-beskeder og opkald, videresend altid opkald og forseglet afsender.</string>
     <string name="PrivacySettingsFragment__default_timer_for_new_changes">Standardudløbstid for nye chats</string>
@@ -4618,11 +4710,14 @@
     <string name="DataAndStorageSettingsFragment__media_quality">Mediekvalitet</string>
     <string name="DataAndStorageSettingsFragment__sent_media_quality">Kvalitet af sendte mediefiler</string>
     <string name="DataAndStorageSettingsFragment__sending_high_quality_media_will_use_more_data">Afsendelse af mediefiler i høj kvalitet bruger mere data.</string>
+    <!-- Setting option that can be selected to default media to be sent as high quality by default -->
     <string name="DataAndStorageSettingsFragment__high">Høj</string>
+    <!-- Setting option that can be selected to default media to be sent as standard quality by default -->
     <string name="DataAndStorageSettingsFragment__standard">Standard</string>
     <string name="DataAndStorageSettingsFragment__calls">Opkald</string>
 
     <!-- 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__use_custom_colors">Brug tilpassede farver</string>
     <string name="ChatColorSelectionFragment__chat_color">Chatfarve</string>
@@ -4834,6 +4929,7 @@
     <string name="AvatarPickerFragment__take_a_picture">Tag et billede</string>
     <string name="AvatarPickerFragment__choose_a_photo">Vælg et billede</string>
     <string name="AvatarPickerFragment__photo">Billede</string>
+    <!-- Button label during avatar selection/creation that when tapped lets you generate an avatar from typed in text. -->
     <string name="AvatarPickerFragment__text">Tekst</string>
     <string name="AvatarPickerFragment__save">Gem</string>
     <string name="AvatarPickerFragment__clear_avatar">Fjern avatar</string>
@@ -4894,7 +4990,7 @@
     <string name="MediaReviewFragment__add_a_message">Tilføj en besked</string>
     <string name="MediaReviewFragment__add_a_reply">Tilføj et svar</string>
     <string name="MediaReviewFragment__send_to">Send til</string>
-    <string name="MediaReviewFragment__view_once_message">Vis besked én gang</string>
+    <string name="MediaReviewFragment__view_once_message">Se medier én gang</string>
     <string name="MediaReviewFragment__one_or_more_items_were_too_large">Et eller flere emner var for store</string>
     <string name="MediaReviewFragment__one_or_more_items_were_invalid">Et eller flere emner var ugyldige</string>
     <string name="MediaReviewFragment__too_many_items_selected">Der er valgt for mange emner</string>
@@ -5487,7 +5583,7 @@
     <string name="StoryViewerFragment__s_s">%1$s %2$s</string>
     <!-- Displayed when viewing a post you sent -->
     <string name="StoryViewerPageFragment__you">Dig</string>
-    <!-- Displayed when viewing a post displayed to a group -->
+    <!-- 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 til %2$s</string>
     <!-- Displayed when viewing a post from another user with no replies -->
     <string name="StoryViewerPageFragment__reply">Besvar</string>
@@ -6704,5 +6800,26 @@
     <!-- Content description for opening the note editor -->
     <string name="ViewNoteSheet__edit_note">Rediger note</string>
 
+    <!-- BackupProgressService -->
+    <!-- Notification title shown while backup restore job is running -->
+    <string name="BackupProgressService_title">Gendannelse af sikkerhedskopi…</string>
+    <!-- Notification title shown while downloading backup restore data -->
+    <string name="BackupProgressService_title_downloading">Downloader sikkerhedskopidata…</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>
+    <!-- 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 -->
+    <string name="BackupsTypeSettingsFragment__google_pay">Google Pay</string>
+    <!-- Displayed as the user\'s payment method as a label in a preference row -->
+    <string name="BackupsTypeSettingsFragment__bank_transfer">Bank transfer</string>
+    <!-- Displayed as the user\'s payment method as a label in a preference row -->
+    <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>
+
+
     <!-- 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 db417da1e4..2dab95dfdf 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -1,6 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- smartling.instruction_comments_enabled = on -->
-<resources>
+<?xml version="1.0" encoding="UTF-8"?><!-- 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> -->
@@ -89,6 +87,16 @@
     <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">Allow access to your location</string>
+    <!-- Dialog description that will explain the steps needed to give location permission -->
+    <string name="AttachmentManager_signal_to_send_location">To send your location:</string>
+    <!-- Alert dialog description asking for location permission -->
+    <string name="AttachmentManager_signal_allow_signal_access_location">Allow Molly access to send your location.</string>
+    <!-- Toast text explaining Signal\'s need for location access -->
+    <string name="AttachmentManager_signal_needs_location_access">Molly needs location access to send your location.</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>
     <!-- Alert dialog description to send the recipient a request to activate payments -->
@@ -241,7 +249,7 @@
     <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>
@@ -386,8 +394,16 @@
     <string name="ConversationActivity_your_request_to_join_has_been_sent_to_the_group_admin">Deine Beitrittsanfrage wurde an den Gruppen-Admin gesendet. Du wirst über die Entscheidung benachrichtigt.</string>
     <string name="ConversationActivity_cancel_request">Anfrage abbrechen</string>
 
-    <string name="ConversationActivity_to_send_audio_messages_allow_signal_access_to_your_microphone">Erlaube Molly Zugriff auf dein Mikrofon, um Sprachnachrichten zu versenden.</string>
+    <!-- Dialog title asking users for microphone permission -->
+    <string name="ConversationActivity_allow_access_microphone">Allow access to your microphone</string>
+    <!-- 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>
+    <!-- Toast text explaining Signal\'s need for microphone access -->
+    <string name="ConversationActivity_signal_needs_microphone_access_voice_message">Molly needs microphone access to record a voice message.</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">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>
@@ -411,10 +427,17 @@
     <string name="ConversationActivity_you_will_leave_this_group_and_it_will_be_deleted_from_all_of_your_devices">Du wirst diese Gruppe verlassen und sie wird von all deinen Geräten gelöscht werden.</string>
     <string name="ConversationActivity_delete">Löschen</string>
     <string name="ConversationActivity_delete_and_leave">Löschen und verlassen</string>
-    <string name="ConversationActivity__to_call_s_signal_needs_access_to_your_microphone">Um %1$s anzurufen, benötigt Molly Zugriff auf dein Mikrofon</string>
+
+    <!-- Dialog description that will explain the steps needed to give microphone permissions for a voice call -->
+    <string name="ConversationActivity__to_start_call">To start a 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">To start a call, allow Molly access to your microphone.</string>
+    <!-- Toast text explaining Signal\'s need for microphone access for a voice call -->
+    <string name="ConversationActivity_signal_needs_microphone_access_voice_call">Molly needs microphone access to start a call.</string>
 
 
     <string name="ConversationActivity_join">Beitreten</string>
+    <!-- Button text for an active group call but the call is currently full and unjoinable -->
     <string name="ConversationActivity_full">Voll</string>
 
     <string name="ConversationActivity_error_sending_media">Fehler beim Senden der Medieninhalte</string>
@@ -560,7 +583,7 @@
     <!-- Title of tip 2 -->
     <string name="SafetyTips_tip2_title">Vage oder irrelevante Nachrichten</string>
     <!-- Message of tip 2 -->
-    <string name="SafetyTips_tip2_message">Spammer beginnen oft mit einer einfachen Nachricht wie „Hallo“, um dich anzulocken. Wenn du antwortest, wirst du möglicherweise weiter kontaktiert.</string>
+    <string name="SafetyTips_tip2_message">Spammer beginnen oft mit einer einfachen Nachricht wie »Hallo«, um dich anzulocken. Wenn du antwortest, wirst du möglicherweise weiter kontaktiert.</string>
     <!-- Title of tip 3 -->
     <string name="SafetyTips_tip3_title">Nachrichten mit Links</string>
     <!-- Message of tip 3 -->
@@ -613,6 +636,7 @@
     <string name="ConversationListFragment_unarchive">Dearchivieren</string>
     <string name="ConversationListFragment_delete">Löschen</string>
     <string name="ConversationListFragment_select_all">Alle auswählen</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 ausgewählt</item>
         <item quantity="other">%1$d ausgewählt</item>
@@ -677,7 +701,7 @@
     <!-- 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 Datensicherung 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>
@@ -722,7 +746,7 @@
     <!-- CustomDefaultPreference -->
     <string name="CustomDefaultPreference_using_custom">Personalisiert: %1$s</string>
     <string name="CustomDefaultPreference_using_default">Standard: %1$s</string>
-    <string name="CustomDefaultPreference_none">Kein Eintrag</string>
+    <string name="CustomDefaultPreference_none">Keine</string>
 
     <!-- AvatarSelectionBottomSheetDialogFragment -->
     <string name="AvatarSelectionBottomSheetDialogFragment__taking_a_photo_requires_the_camera_permission">Für das Aufnehmen eines Fotos ist die Kamera-Berechtigung erforderlich.</string>
@@ -864,8 +888,9 @@
         <item quantity="one">Einladung versendet</item>
         <item quantity="other">%1$d Einladungen versendet</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">»%1$s« kann von dir nicht automatisch zu dieser Gruppe hinzugefügt werden.\n\nDer Nutzer wurde eingeladen beizutreten, wird aber keine Gruppennachrichten erhalten, bis er die Einladung angenommen hat.</string>
-    <string name="GroupManagement_invite_multiple_users">Diese Nutzer können von dir nicht automatisch zu dieser Gruppe hinzugefügt werden.\n\nSie wurden eingeladen, der Gruppe beizutreten, werden aber keine Gruppennachrichten erhalten, bis sie die Einladung angenommen haben.</string>
+    <string name="GroupManagement_invite_multiple_users">Diese Personen können von dir nicht automatisch zu dieser Gruppe hinzugefügt werden.\n\nSie wurden eingeladen, der Gruppe beizutreten, werden aber keine Gruppennachrichten erhalten, bis sie die Einladung angenommen haben.</string>
 
     <!-- GroupsV1MigrationLearnMoreBottomSheetDialogFragment -->
     <string name="GroupsV1MigrationLearnMore_what_are_new_groups">Was sind Gruppen neuen Typs?</string>
@@ -974,9 +999,9 @@
     <string name="PendingMembersActivity_invites">Einladungen</string>
     <string name="PendingMembersActivity_people_you_invited">Von dir eingeladene Personen</string>
     <string name="PendingMembersActivity_you_have_no_pending_invites">Du hast keine ausstehenden Einladungen.</string>
-    <string name="PendingMembersActivity_invites_by_other_group_members">Von Gruppenmitgliedern Eingeladene</string>
+    <string name="PendingMembersActivity_invites_by_other_group_members">Von Gruppenmitgliedern eingeladen</string>
     <string name="PendingMembersActivity_no_pending_invites_by_other_group_members">Keine ausstehenden Einladungen anderer Gruppenmitglieder.</string>
-    <string name="PendingMembersActivity_missing_detail_explanation">Du kannst keine Details zu von anderen Gruppenmitgliedern eingeladenen Personen ansehen. Erst wenn die Eingeladenen der Gruppe beitreten, sind ihre Details für dich und die anderen Gruppenmitglieder einsehbar. Bis zum Beitritt erhalten die Eingeladenen auch keine Gruppennachrichten.</string>
+    <string name="PendingMembersActivity_missing_detail_explanation">Details der von anderen Gruppenmitgliedern eingeladenen Personen werden nicht angezeigt. Erst wenn die Eingeladenen der Gruppe beitreten, sind ihre Details für dich und die anderen Gruppenmitglieder einsehbar. Bis zum Beitritt erhalten die Eingeladenen auch keine Gruppennachrichten.</string>
 
     <string name="PendingMembersActivity_revoke_invite">Einladung widerrufen</string>
     <string name="PendingMembersActivity_revoke_invites">Einladungen widerrufen</string>
@@ -1007,7 +1032,7 @@
     <string name="AddMembersActivity__add_members">Mitglieder hinzufügen</string>
 
     <!-- AddGroupDetailsFragment -->
-    <string name="AddGroupDetailsFragment__name_this_group">Gib dieser Gruppe einen Namen</string>
+    <string name="AddGroupDetailsFragment__name_this_group">Gruppennamen wählen</string>
     <string name="AddGroupDetailsFragment__create_group">Gruppe erstellen</string>
     <string name="AddGroupDetailsFragment__create">Erstellen</string>
     <string name="AddGroupDetailsFragment__members">Mitglieder</string>
@@ -1044,7 +1069,9 @@
 
     <string name="ManageGroupActivity_edit_name_and_picture">Name und Bild bearbeiten</string>
     <string name="ManageGroupActivity_legacy_group">Gruppe alten Typs</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">Dies ist eine Gruppe alten Typs. Funktionen wie Gruppen-Admins sind nur in Gruppen neuen Typs verfügbar.</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">Dies ist eine Gruppe alten Typs. Für neue Funktionen wie @Erwähnungen und Admins,</string>
     <string name="ManageGroupActivity_legacy_group_too_large">Diese Gruppe alten Typs kann nicht zu einer Gruppe neuen Typs aktualisiert werden. Die maximale Gruppengröße von %1$d Mitgliedern ist überschritten.</string>
     <string name="ManageGroupActivity_upgrade_this_group">aktualisiere diese Gruppe.</string>
@@ -1054,7 +1081,7 @@
     <string name="ManageGroupActivity_add_group_description">Gruppenbeschreibung hinzufügen …</string>
 
     <!-- GroupMentionSettingDialog -->
-    <string name="GroupMentionSettingDialog_notify_me_for_mentions">Mich über Erwähnungen benachrichtigen</string>
+    <string name="GroupMentionSettingDialog_notify_me_for_mentions">Mich bei Erwähnungen benachrichtigen</string>
     <string name="GroupMentionSettingDialog_receive_notifications_when_youre_mentioned_in_muted_chats">Benachrichtigungen erhalten, wenn du in stummgeschalteten Chats erwähnt wirst?</string>
     <string name="GroupMentionSettingDialog_always_notify_me">Immer benachrichtigen</string>
     <string name="GroupMentionSettingDialog_dont_notify_me">Nicht benachrichtigen</string>
@@ -1171,13 +1198,13 @@
 
     <!-- GroupJoinUpdateRequiredBottomSheetDialogFragment -->
     <string name="GroupJoinUpdateRequiredBottomSheetDialogFragment_update_signal_to_use_group_links">Aktualisiere Signal zum Verwenden von Gruppen-Links</string>
-    <string name="GroupJoinUpdateRequiredBottomSheetDialogFragment_update_message">Die von dir verwendete Signal-Version unterstützt nicht diesen Gruppen-Link. Aktualisiere auf die neueste Version, um dieser Gruppe über einen Link beizutreten.</string>
+    <string name="GroupJoinUpdateRequiredBottomSheetDialogFragment_update_message">Die von dir verwendete Signal-Version unterstützt diesen Gruppen-Link nicht. Aktualisiere auf die neueste Version, um dieser Gruppe über einen Link beizutreten.</string>
     <string name="GroupJoinUpdateRequiredBottomSheetDialogFragment_update_signal">Signal aktualisieren</string>
     <string name="GroupJoinUpdateRequiredBottomSheetDialogFragment_group_link_is_not_valid">Gruppen-Link ist ungültig</string>
 
     <!-- GroupInviteLinkEnableAndShareBottomSheetDialogFragment -->
     <string name="GroupInviteLinkEnableAndShareBottomSheetDialogFragment_invite_friends">Freunde einladen</string>
-    <string name="GroupInviteLinkEnableAndShareBottomSheetDialogFragment_share_a_link_with_friends_to_let_them_quickly_join_this_group">Teile einen Link mit Freunden, damit sie dieser Gruppe einfach beitreten können.</string>
+    <string name="GroupInviteLinkEnableAndShareBottomSheetDialogFragment_share_a_link_with_friends_to_let_them_quickly_join_this_group">Teile einen Link mit Personen, damit sie dieser Gruppe einfach beitreten können.</string>
 
     <string name="GroupInviteLinkEnableAndShareBottomSheetDialogFragment_enable_and_share_link">Link aktivieren und teilen</string>
     <string name="GroupInviteLinkEnableAndShareBottomSheetDialogFragment_share_link">Link teilen</string>
@@ -1208,7 +1235,7 @@
 
     <!-- InviteActivity -->
     <string name="InviteActivity_share">Teilen</string>
-    <string name="InviteActivity_share_with_contacts">Mit Kontakten teilen (SMS)</string>
+    <string name="InviteActivity_share_with_contacts">Mit Kontakten teilen</string>
     <string name="InviteActivity_share_via">Teilen über …</string>
 
     <string name="InviteActivity_cancel">Abbrechen</string>
@@ -1271,6 +1298,7 @@
         <item quantity="other">Löschen</item>
     </plurals>
 
+    <!-- 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 ausgewählt (%2$s)</item>
         <item quantity="other">%1$d ausgewählt (%2$s)</item>
@@ -1289,7 +1317,7 @@
 
     <!-- Megaphones -->
     <string name="Megaphones_remind_me_later">Später erinnern</string>
-    <string name="Megaphones_verify_your_signal_pin">Überprüfung deiner Signal-PIN</string>
+    <string name="Megaphones_verify_your_signal_pin">Signal-PIN überprüfen</string>
     <string name="Megaphones_well_occasionally_ask_you_to_verify_your_pin">Wir fragen dich gelegentlich nach deiner PIN, damit du sie nicht vergisst.</string>
     <string name="Megaphones_verify_pin">PIN überprüfen</string>
     <string name="Megaphones_get_started">Leg los</string>
@@ -1302,15 +1330,15 @@
     <string name="MessageQuotesBottomSheet_replies">Antworten</string>
 
     <!-- NotificationBarManager -->
-    <string name="NotificationBarManager__establishing_signal_call">Signal-Anruf wird hergestellt</string>
+    <string name="NotificationBarManager__establishing_signal_call">Signal-Anruf wird gestartet</string>
     <!-- Temporary notification shown when starting the calling service -->
-    <string name="NotificationBarManager__starting_signal_call_service">Den Molly Anrufdienst starten</string>
-    <string name="NotificationBarManager__stopping_signal_call_service">Mollys 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 -->
     <string name="NotificationsMegaphone_turn_on_notifications">Benachrichtigungen einschalten?</string>
-    <string name="NotificationsMegaphone_never_miss_a_message">Versäume nie eine Nachricht deiner Kontakte und Gruppen.</string>
+    <string name="NotificationsMegaphone_never_miss_a_message">Versäume keine Nachricht deiner Kontakte und Gruppen.</string>
     <string name="NotificationsMegaphone_turn_on">Einschalten</string>
     <string name="NotificationsMegaphone_not_now">Jetzt nicht</string>
 
@@ -1335,17 +1363,13 @@
     <string name="MessageRecord_left_group">Du hast die Gruppe verlassen.</string>
     <string name="MessageRecord_you_updated_group">Du hast die Gruppe aktualisiert.</string>
     <string name="MessageRecord_the_group_was_updated">Die Gruppe wurde aktualisiert.</string>
-    <!-- Update message shown when placing an outgoing 1:1 voice/audio call and it\'s answered by the other party -->
+    <!-- Update message shown when placing an outgoing 1:1 voice/audio call -->
     <string name="MessageRecord_outgoing_voice_call">Ausgehender Sprachanruf</string>
-    <!-- Update message shown when placing an outgoing 1:1 video call and it\'s answered by the other party -->
+    <!-- Update message shown when placing an outgoing 1:1 video call -->
     <string name="MessageRecord_outgoing_video_call">Ausgehender Videoanruf</string>
-    <!-- Update message shown when placing an outgoing 1:1 voice/audio call and it\'s not answered by the other party -->
-    <string name="MessageRecord_unanswered_voice_call">Unbeantworteter Sprachanruf</string>
-    <!-- Update message shown when placing an outgoing 1:1 video call and it\'s not answered by the other party -->
-    <string name="MessageRecord_unanswered_video_call">Unbeantworteter Videoanruf</string>
-    <!-- Update message shown when receiving an incoming 1:1 voice/audio call and it\'s answered -->
+    <!-- Update message shown when receiving an incoming 1:1 voice/audio call and it\'s answered or ringing -->
     <string name="MessageRecord_incoming_voice_call">Eingehender Sprachanruf</string>
-    <!-- Update message shown when receiving an incoming 1:1 video call and answered -->
+    <!-- Update message shown when receiving an incoming 1:1 video call and answered or ringing -->
     <string name="MessageRecord_incoming_video_call">Eingehender Videoanruf</string>
     <!-- Update message shown when receiving an incoming 1:1 voice/audio call and not answered -->
     <string name="MessageRecord_missed_voice_call">Verpasster Sprachanruf</string>
@@ -1355,10 +1379,6 @@
     <string name="MessageRecord_missed_voice_call_notification_profile">Verpasster Sprachanruf bei aktiviertem Benachrichtigungsprofil</string>
     <!-- Update message shown when receiving an incoming video call and declined due to notification profile -->
     <string name="MessageRecord_missed_video_call_notification_profile">Verpasster Videoanruf bei aktiviertem Benachrichtigungsprofil</string>
-    <!-- Update message shown when receiving an incoming 1:1 voice/audio call and explicitly declined -->
-    <string name="MessageRecord_you_declined_a_voice_call">Du hast einen Sprachanruf abgelehnt</string>
-    <!-- Update message shown when receiving an incoming 1:1 video call and explicitly declined -->
-    <string name="MessageRecord_you_declined_a_video_call">Du hast einen Videoanruf abgelehnt</string>
     <!-- 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 hat die Gruppe aktualisiert.</string>
@@ -1369,10 +1389,10 @@
     <string name="MessageRecord_s_set_disappearing_message_time_to_s">%1$s hat die Ablaufzeit verschwindender Nachrichten auf %2$s festgelegt.</string>
     <string name="MessageRecord_disappearing_message_time_set_to_s">Die Ablaufzeit verschwindender Nachrichten wurde auf %1$s festgelegt.</string>
     <string name="MessageRecord_this_group_was_updated_to_a_new_group">Diese Gruppe wurde auf eine Gruppe neuen Typs aktualisiert.</string>
-    <string name="MessageRecord_you_couldnt_be_added_to_the_new_group_and_have_been_invited_to_join">Du konntest der Gruppe neuen Typs nicht hinzugefügt werden und wurdest daher eingeladen, beizutreten.</string>
+    <string name="MessageRecord_you_couldnt_be_added_to_the_new_group_and_have_been_invited_to_join">Du konntest der Gruppe nicht hinzugefügt werden und wurdest daher eingeladen, beizutreten.</string>
     <string name="MessageRecord_chat_session_refreshed">Chat-Sitzung aktualisiert</string>
     <plurals name="MessageRecord_members_couldnt_be_added_to_the_new_group_and_have_been_invited">
-        <item quantity="one">Ein Mitglied konnte der Gruppe neuen Typs nicht hinzugefügt werden und wurde daher eingeladen, beizutreten.</item>
+        <item quantity="one">Ein Mitglied konnte der Gruppe nicht hinzugefügt werden und wurde daher eingeladen, beizutreten.</item>
         <item quantity="other">%1$s Mitglieder konnten der Gruppe neuen Typs nicht hinzugefügt werden und wurden daher eingeladen, beizutreten.</item>
     </plurals>
 
@@ -1391,7 +1411,7 @@
     <!-- GV2 specific -->
     <string name="MessageRecord_you_created_the_group">Du hast die Gruppe erstellt.</string>
     <string name="MessageRecord_group_updated">Gruppe aktualisiert.</string>
-    <string name="MessageRecord_invite_friends_to_this_group">Lade mit einem Gruppen-Link Freunde zu dieser Gruppe ein.</string>
+    <string name="MessageRecord_invite_friends_to_this_group">Lade mit einem Gruppen-Link Personen zu dieser Gruppe ein.</string>
 
     <!-- GV2 member additions -->
     <string name="MessageRecord_you_added_s">Du hast %1$s hinzugefügt.</string>
@@ -1474,14 +1494,14 @@
     <string name="MessageRecord_the_group_group_avatar_has_been_changed">Der Gruppenavatar wurde geändert.</string>
 
     <!-- GV2 attribute access level change -->
-    <string name="MessageRecord_you_changed_who_can_edit_group_info_to_s">Du hast die Bearbeitungsberechtigten für Gruppendetails zu »%1$s« geändert.</string>
-    <string name="MessageRecord_s_changed_who_can_edit_group_info_to_s">%1$s hat die Bearbeitungsberechtigten für Gruppendetails zu »%2$s« geändert.</string>
-    <string name="MessageRecord_who_can_edit_group_info_has_been_changed_to_s">Die Bearbeitungsberechtigten für Gruppendetails wurden zu »%1$s« geändert.</string>
+    <string name="MessageRecord_you_changed_who_can_edit_group_info_to_s">Du hast die Berechtigung »Gruppendetails bearbeiten« zu »%1$s« geändert.</string>
+    <string name="MessageRecord_s_changed_who_can_edit_group_info_to_s">%1$s hat die Berechtigung »Gruppendetails bearbeiten« zu »%2$s« geändert.</string>
+    <string name="MessageRecord_who_can_edit_group_info_has_been_changed_to_s">Die Berechtigung »Gruppendetails bearbeiten« wurde zu »%1$s« geändert.</string>
 
     <!-- GV2 membership access level change -->
-    <string name="MessageRecord_you_changed_who_can_edit_group_membership_to_s">Du hast die Bearbeitungsberechtigten für die Gruppenmitgliedschaft zu »%1$s« geändert.</string>
-    <string name="MessageRecord_s_changed_who_can_edit_group_membership_to_s">%1$s hat die Bearbeitungsberechtigten für die Gruppenmitgliedschaft zu »%2$s« geändert.</string>
-    <string name="MessageRecord_who_can_edit_group_membership_has_been_changed_to_s">Die Bearbeitungsberechtigten für die Gruppenmitgliedschaft wurden zu »%1$s« geändert.</string>
+    <string name="MessageRecord_you_changed_who_can_edit_group_membership_to_s">Du hast die Berechtigung »Mitglieder hinzufügen« zu »%1$s« geändert.</string>
+    <string name="MessageRecord_s_changed_who_can_edit_group_membership_to_s">%1$s hat die Berechtigung »Mitglieder hinzufügen« zu »%2$s« geändert.</string>
+    <string name="MessageRecord_who_can_edit_group_membership_has_been_changed_to_s">Die Berechtigung »Mitglieder hinzufügen« wurde zu »%1$s« geändert.</string>
 
     <!-- GV2 announcement group change -->
     <string name="MessageRecord_you_allow_all_members_to_send">Du hast die Gruppen-Einstellungen geändert, um allen Mitgliedern das Senden von Nachrichten zu erlauben.</string>
@@ -1537,8 +1557,8 @@
     <string name="MessageRecord_your_request_to_join_the_group_has_been_denied_by_an_admin">Deine Gruppenbeitrittsanfrage wurde von einem Admin abgelehnt.</string>
     <string name="MessageRecord_s_denied_a_request_to_join_the_group_from_s">%1$s hat eine Gruppenbeitrittsanfrage von %2$s abgelehnt.</string>
     <string name="MessageRecord_a_request_to_join_the_group_from_s_has_been_denied">Eine Gruppenbeitrittsanfrage von %1$s wurde abgelehnt.</string>
-    <string name="MessageRecord_you_canceled_your_request_to_join_the_group">Du hast deine Gruppenbeitrittsanfrage abgebrochen.</string>
-    <string name="MessageRecord_s_canceled_their_request_to_join_the_group">%1$s hat die Gruppenbeitrittsanfrage abgebrochen.</string>
+    <string name="MessageRecord_you_canceled_your_request_to_join_the_group">Du hast deine Gruppenbeitrittsanfrage widerrufen.</string>
+    <string name="MessageRecord_s_canceled_their_request_to_join_the_group">%1$s hat die Gruppenbeitrittsanfrage widerrufen.</string>
 
     <!-- End of GV2 specific update messages -->
 
@@ -1567,28 +1587,53 @@
     <string name="MessageRecord_can_accept_payments">%1$s kann Zahlungen jetzt akzeptieren.</string>
 
     <!-- Group Calling update messages -->
-    <string name="MessageRecord_s_started_a_group_call_s">%1$s hat einen Gruppenanruf begonnen · %2$s</string>
-    <string name="MessageRecord_you_started_a_group_call_s">Du hast einen Gruppenanruf gestartet · %1$s</string>
-    <string name="MessageRecord_s_is_in_the_group_call_s">%1$s nimmt am Gruppenanruf teil · %2$s</string>
-    <string name="MessageRecord_you_are_in_the_group_call_s1">Du nimmst am Gruppenanruf teil · %1$s</string>
-    <string name="MessageRecord_s_and_s_are_in_the_group_call_s1">%1$s und %2$s nehmen am Gruppenanruf teil · %3$s</string>
-    <string name="MessageRecord_group_call_s">Gruppenanruf · %1$s</string>
-
-    <string name="MessageRecord_s_started_a_group_call">%1$s hat einen Gruppenanruf gestartet</string>
-    <string name="MessageRecord_you_started_a_group_call">Du hast einen Gruppenanruf gestartet</string>
-    <string name="MessageRecord_s_is_in_the_group_call">%1$s nimmt am Gruppenanruf teil</string>
-    <string name="MessageRecord_you_are_in_the_group_call">Du nimmst am Gruppenanruf teil</string>
-    <string name="MessageRecord_s_and_s_are_in_the_group_call">%1$s und %2$s nehmen am Gruppenanruf teil</string>
-    <string name="MessageRecord_group_call">Gruppenanruf</string>
+    <!-- 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 nimmt am Anruf teil · %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">Du nimmst am Anruf teil · %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 und %2$s nehmen am Anruf teil · %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 nimmt am Anruf teil</string>
+    <!-- Chat log text for an ongoing group call only the local user has joined -->
+    <string name="MessageRecord_you_are_in_the_call">Du nimmst am Anruf teil</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 und %2$s nehmen am Anruf teil</string>
+    <!-- Chat log text for a group call that ended within the last 5 minutes -->
+    <string name="MessageRecord__the_video_call_has_ended">Der Videoanruf wurde beendet</string>
+    <!-- Chat log text for a group call that ended within the last 5 minutes with a placeholder for formatted time -->
+    <string name="MessageRecord__the_video_call_has_ended_s">Der Videoanruf wurde beendet · %1$s</string>
+    <!-- Chat log text for a group call that ended more than 5 minutes ago and was missed -->
+    <string name="MessageRecord__missed_video_call">Verpasster Videoanruf</string>
+    <!-- Chat log text for a group call that ended more than 5 minutes ago and was missed with a placeholder for formatted time -->
+    <string name="MessageRecord__missed_video_call_s">Verpasster Videoanruf · %1$s</string>
+    <!-- Chat log text for a group call that ended that the local user did not start -->
+    <string name="MessageRecord__incoming_video_call">Eingehender Videoanruf</string>
+    <!-- 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">Eingehender Videoanruf · %1$s</string>
+    <!-- Chat log text for a group call that ended that the local user started -->
+    <string name="MessageRecord__outgoing_video_call">Ausgehender Videoanruf</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">Ausgehender Videoanruf · %1$s</string>
+    <!-- Chat log text for an ongoing group call that the local user started -->
+    <string name="MessageRecord__you_started_a_video_call">Du hast einen Videoanruf gestartet</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">Du hast einen Videoanruf gestartet · %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 hat einen Videoanruf gestartet</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 hat einen Videoanruf gestartet · %2$s</string>
 
     <string name="MessageRecord_you">Du</string>
 
-    <plurals name="MessageRecord_s_s_and_d_others_are_in_the_group_call_s">
+    <!-- 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 und %3$d weitere Person nehmen am Gruppenanruf teil · %4$s</item>
         <item quantity="other">%1$s, %2$s und %3$d weitere Personen nehmen am Gruppenanruf teil · %4$s</item>
     </plurals>
 
-    <plurals name="MessageRecord_s_s_and_d_others_are_in_the_group_call">
+    <!-- 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 und %3$d weitere Person nehmen am Gruppenanruf teil</item>
         <item quantity="other">%1$s, %2$s und %3$d weitere Personen nehmen am Gruppenanruf teil</item>
     </plurals>
@@ -1612,7 +1657,7 @@
     <string name="MessageRequestBottomView_unblock">Freigeben</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">Darf dir %1$s Nachrichten schreiben und deinen Namen und dein Foto sehen? Diese Person wurde bereits entfernt.</string>
-    <string name="MessageRequestBottomView_do_you_want_to_let_s_message_you_they_wont_know_youve_seen_their_messages_until_you_accept">Darf %1$s dir Nachrichten schreiben und deinen Namen und dein Foto sehen? Der Nutzer weiß nicht, dass du seine Nachricht gesehen hast, bis du die Anfrage annimmst.</string>
+    <string name="MessageRequestBottomView_do_you_want_to_let_s_message_you_they_wont_know_youve_seen_their_messages_until_you_accept">Darf %1$s dir Nachrichten schreiben und deinen Namen und dein Foto sehen? Die Person weiß nicht, dass du ihre Nachricht gesehen hast, bis du die Anfrage annimmst.</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">Darf %1$s dir Nachrichten schreiben und deinen Namen und dein Foto sehen? Du wirst keine Nachrichten erhalten, es sei denn, du erteilst eine Freigabe.</string>
     <!-- Shown in message request flow. Describes what will happen if you unblock an SMS user -->
@@ -1624,7 +1669,7 @@
     <string name="MessageRequestBottomView_continue_your_conversation_with_s_and_share_your_name_and_photo">Chat mit %1$s fortsetzen und deinen Namen und dein Foto mit diesem Nutzer/dieser Nutzerin teilen?</string>
     <string name="MessageRequestBottomView_do_you_want_to_join_this_group_they_wont_know_youve_seen_their_messages_until_you_accept">Möchtest du dieser Gruppe beitreten und deinen Namen und dein Foto mit ihren Mitgliedern teilen? Diese wissen nicht, dass du ihre Nachrichten gesehen hast, bis du die Anfrage annimmst.</string>
     <string name="MessageRequestBottomView_do_you_want_to_join_this_group_you_wont_see_their_messages">Möchtest du dieser Gruppe beitreten und deinen Namen und dein Foto mit ihren Mitgliedern teilen? Du kannst deren Nachrichten nicht sehen, bis du die Anfrage annimmst.</string>
-    <string name="MessageRequestBottomView_join_this_group_they_wont_know_youve_seen_their_messages_until_you_accept">Dieser Gruppe beitreten? Solange du nicht beitrittst, werden die Gruppenmitglieder nicht wissen, dass du ihre Nachrichten gesehen hast.</string>
+    <string name="MessageRequestBottomView_join_this_group_they_wont_know_youve_seen_their_messages_until_you_accept">Dieser Gruppe beitreten? Die Gruppenmitglieder wissen nicht, dass du ihre Nachrichten gesehen hast, bis du die Anfrage annimmst.</string>
     <string name="MessageRequestBottomView_unblock_this_group_and_share_your_name_and_photo_with_its_members">Möchtest du diese Gruppe freigeben und deinen Namen und dein Foto mit deren Mitgliedern teilen? Du wirst keine Nachrichten erhalten, es sei denn, du erteilst eine Freigabe.</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">Anzeigen</string>
@@ -1672,9 +1717,9 @@
     <string name="DeviceProvisioningActivity_content_progress_network_error">Netzwerkfehler.</string>
     <string name="DeviceProvisioningActivity_content_progress_key_error">Ungültiger QR-Code.</string>
     <string name="DeviceProvisioningActivity_sorry_you_have_too_many_devices_linked_already">Es sind bereits zu viele Geräte gekoppelt. Bitte entferne mindestens ein Gerät.</string>
-    <string name="DeviceActivity_sorry_this_is_not_a_valid_device_link_qr_code">Dies ist leider kein gültiger QR-Code zur Gerätekopplung.</string>
+    <string name="DeviceActivity_sorry_this_is_not_a_valid_device_link_qr_code">Dies ist kein gültiger QR-Code zur Gerätekopplung.</string>
     <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 aus Signal ein.</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">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>
@@ -1708,7 +1753,7 @@
     <string name="PinRestoreEntryFragment_incorrect_pin">Falsche PIN</string>
     <string name="PinRestoreEntryFragment_skip_pin_entry">PIN-Eingabe überspringen?</string>
     <string name="PinRestoreEntryFragment_need_help">Hilfe benötigt?</string>
-    <string name="PinRestoreEntryFragment_your_pin_is_a_d_digit_code">Deine PIN ist ein von dir erstellter, numerischer oder alphanumerischer Code von %1$d+ Zeichen.\n\nFalls du deine PIN vergessen hast, kannst du eine neue erstellen. Du kannst dich registrieren und dein Nutzerkonto verwenden, wirst aber einige gespeicherte Einstellungen, wie z. B. deine Profilinformationen verlieren.</string>
+    <string name="PinRestoreEntryFragment_your_pin_is_a_d_digit_code">Deine PIN ist ein von dir erstellter, numerischer oder alphanumerischer Code aus %1$d+ Zeichen.\n\nFalls du deine PIN vergessen hast, kannst du eine neue erstellen. Du kannst dich registrieren und dein Nutzerkonto verwenden, wirst aber einige gespeicherte Einstellungen, wie z. B. deine Profilinformationen verlieren.</string>
     <string name="PinRestoreEntryFragment_if_you_cant_remember_your_pin">Falls du deine PIN vergessen hast, kannst du eine neue erstellen. Du kannst dich registrieren und dein Nutzerkonto verwenden, wirst aber einige gespeicherte Einstellungen, wie z. B. deine Profilinformationen verlieren.</string>
     <string name="PinRestoreEntryFragment_create_new_pin">Neue PIN erstellen</string>
     <string name="PinRestoreEntryFragment_contact_support">Support kontaktieren</string>
@@ -1744,7 +1789,7 @@
 
     <!-- RatingManager -->
     <string name="RatingManager_rate_this_app">Bewerte diese App</string>
-    <string name="RatingManager_if_you_enjoy_using_this_app_please_take_a_moment">Hilf uns durch deine Bewertung, falls dir die App gefällt.</string>
+    <string name="RatingManager_if_you_enjoy_using_this_app_please_take_a_moment">Bitte hilf uns durch deine Bewertung, falls dir die App gefällt.</string>
     <string name="RatingManager_rate_now">Jetzt bewerten!</string>
     <string name="RatingManager_no_thanks">Nein danke</string>
     <string name="RatingManager_later">Später</string>
@@ -1759,9 +1804,9 @@
     <string name="ReactionsRecipientAdapter_you">Du</string>
 
     <!-- RecaptchaRequiredBottomSheetFragment -->
-    <string name="RecaptchaRequiredBottomSheetFragment_verify_to_continue_messaging">Verifizieren zum Senden weiterer Nachrichten</string>
-    <string name="RecaptchaRequiredBottomSheetFragment_to_help_prevent_spam_on_signal">Hilf dabei, Spam auf Molly zu verhindern, und schließe die Verifikation ab.</string>
-    <string name="RecaptchaRequiredBottomSheetFragment_after_verifying_you_can_continue_messaging">Nach abgeschlossener Verifikation kannst du wieder Nachrichten senden. Alle pausierten Nachrichten werden dann automatisch versendet.</string>
+    <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 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 -->
     <string name="Recipient_you">Du</string>
@@ -1792,7 +1837,7 @@
     <!-- Body text for the Valentine\'s Day donation megaphone. -->
 
     <!-- WebRtcCallActivity -->
-    <string name="WebRtcCallActivity__tap_here_to_turn_on_your_video">Hier antippen, um deine Videoübertragung anzuschalten</string>
+    <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 Molly Zugriff auf deine Kamera</string>
     <string name="WebRtcCallActivity__signal_s">Molly %1$s</string>
     <string name="WebRtcCallActivity__calling">Anrufen …</string>
@@ -1884,23 +1929,23 @@
     </plurals>
 
     <string name="WebRtcCallView__ringing_s">Klingelt gerade bei %1$s</string>
-    <string name="WebRtcCallView__ringing_s_and_s">Klingelt gerade bei %1$s und %2$s</string>
+    <string name="WebRtcCallView__ringing_s_and_s">Klingelt bei %1$s und %2$s</string>
     <plurals name="WebRtcCallView__ringing_s_s_and_d_others">
-        <item quantity="one">Klingelt gerade bei %1$s, %2$s und %3$d weiteren Person</item>
-        <item quantity="other">Klingelt gerade bei %1$s, %2$s und %3$d weiteren Personen</item>
+        <item quantity="one">Klingelt bei %1$s, %2$s und %3$d weiteren Person</item>
+        <item quantity="other">Klingelt bei %1$s, %2$s und %3$d weiteren Personen</item>
     </plurals>
 
-    <string name="WebRtcCallView__s_is_calling_you">%1$s ruft dich gerade an</string>
-    <string name="WebRtcCallView__s_is_calling_you_and_s">%1$s ruft dich und %2$s gerade an</string>
-    <string name="WebRtcCallView__s_is_calling_you_s_and_s">%1$s ruft dich, %2$s und %3$s gerade an</string>
+    <string name="WebRtcCallView__s_is_calling_you">%1$s ruft dich an</string>
+    <string name="WebRtcCallView__s_is_calling_you_and_s">%1$s ruft dich und %2$s an</string>
+    <string name="WebRtcCallView__s_is_calling_you_s_and_s">%1$s ruft dich, %2$s und %3$s an</string>
     <plurals name="WebRtcCallView__s_is_calling_you_s_s_and_d_others">
-        <item quantity="one">%1$s ruft dich, %2$s, %3$s und %4$d weitere Person gerade an</item>
-        <item quantity="other">%1$s ruft dich, %2$s, %3$s und %4$d weitere Personen gerade an</item>
+        <item quantity="one">%1$s ruft dich, %2$s, %3$s und %4$d weitere Person an</item>
+        <item quantity="other">%1$s ruft dich, %2$s, %3$s und %4$d weitere Personen an</item>
     </plurals>
 
     <string name="WebRtcCallView__no_one_else_is_here">Niemand anderes ist hier</string>
     <string name="WebRtcCallView__s_is_in_this_call">%1$s nimmt an diesem Anruf teil</string>
-    <string name="WebRtcCallView__s_are_in_this_call">%1$s nimmst an diesem Anruf teil</string>
+    <string name="WebRtcCallView__s_are_in_this_call">%1$s nimmt an diesem Anruf teil</string>
     <string name="WebRtcCallView__s_and_s_are_in_this_call">%1$s und %2$s nehmen an diesem Anruf teil</string>
 
     <plurals name="WebRtcCallView__s_s_and_d_others_are_in_this_call">
@@ -2010,8 +2055,8 @@
     <!-- CallParticipantView -->
     <string name="CallParticipantView__s_is_blocked">%1$s ist blockiert</string>
     <string name="CallParticipantView__more_info">Mehr Details</string>
-    <string name="CallParticipantView__you_wont_receive_their_audio_or_video">Weder du noch dieser Teilnehmer werden gegenseitig Audio- oder Videodaten empfangen.</string>
-    <string name="CallParticipantView__cant_receive_audio_video_from_s">Audio- &amp; Videodaten von %1$s können nicht empfangen werden</string>
+    <string name="CallParticipantView__you_wont_receive_their_audio_or_video">Du und dieser Teilnehmer werden gegenseitig keine Audio- oder Videodaten empfangen.</string>
+    <string name="CallParticipantView__cant_receive_audio_video_from_s">Audio- und Videodaten von %1$s können nicht empfangen werden</string>
     <string name="CallParticipantView__cant_receive_audio_and_video_from_s">Audio- und Videodaten von %1$s können nicht empfangen werden</string>
     <string name="CallParticipantView__this_may_be_Because_they_have_not_verified_your_safety_number_change">Dies kann daran liegen, dass der Teilnehmer die Änderung deiner Sicherheitsnummer nicht verifiziert hat, ein Problem mit dessen Gerät besteht oder er dich blockiert hat.</string>
 
@@ -2027,7 +2072,7 @@
 
     <!-- RecaptchaProofActivity -->
     <string name="RecaptchaProofActivity_failed_to_submit">Übermittlung gescheitert</string>
-    <string name="RecaptchaProofActivity_complete_verification">Verifikation abschließen</string>
+    <string name="RecaptchaProofActivity_complete_verification">Verifizierung abschließen</string>
 
     <!-- RegistrationActivity -->
     <string name="RegistrationActivity_select_your_country">Wähle dein Land aus</string>
@@ -2044,7 +2089,7 @@
     <string name="RegistrationActivity_additional_verification_required">Zusätzliche Verifizierung erforderlich</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">Ein Verifizierungscode wird an diese Nummer gesendet. Es können Tarife anfallen.</string>
-    <string name="RegistrationActivity_you_will_receive_a_call_to_verify_this_number">Du erhälst einen Anruf zur Verifikation dieser Telefonnummer.</string>
+    <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. 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>
@@ -2063,26 +2108,27 @@
     <!-- Generic error when the app is unable to request an SMS code for an unknown reason. -->
     <string name="RegistrationActivity_unable_to_request_verification_code">Ein Verifizierungscode kann nicht angefordert werden. Bitte überprüfe deine Netzverbindung und versuche es erneut.</string>
     <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">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 angefragt</string>
+    <string name="RegistrationActivity_call_requested">Anruf angefordert</string>
     <!--    Small "toast" notification to the user confirming that they have requested a new code via SMS.-->
     <string name="RegistrationActivity_sms_requested">SMS angefordert</string>
     <!--    Small "toast" notification to the user confirming that they have requested a new code (through an unspecified channel).-->
-    <string name="RegistrationActivity_code_requested">Verifikationscode angefordert</string>
+    <string name="RegistrationActivity_code_requested">Verifizierungscode angefordert</string>
     <plurals name="RegistrationActivity_debug_log_hint">
         <item quantity="one">Nur noch %1$d Schritt, und du kannst ein Diagnoseprotokoll übermitteln.</item>
         <item quantity="other">Nur noch %1$d Schritte, und du kannst ein Diagnoseprotokoll übermitteln.</item>
     </plurals>
-    <string name="RegistrationActivity_we_need_to_verify_that_youre_human">Bist du ein Mensch?</string>
+    <string name="RegistrationActivity_we_need_to_verify_that_youre_human">Wir müssen sicherstellen, dass du ein Mensch bist.</string>
     <!-- Button label to trigger a phone call to provide the registration code, in lieu of an SMS code -->
     <string name="RegistrationActivity_voice_call">Sprachanruf</string>
     <!-- Dialog button to cancel the pending action and return to the previous state. -->
     <string name="RegistrationActivity_cancel">Abbrechen</string>
     <string name="RegistrationActivity_next">Weiter</string>
     <string name="RegistrationActivity_continue">Weiter</string>
-    <string name="RegistrationActivity_take_privacy_with_you_be_yourself_in_every_message">Nimm Privatsphäre mit dir.\nSei du selbst in jeder Nachricht.</string>
+    <string name="RegistrationActivity_take_privacy_with_you_be_yourself_in_every_message">Privatsphäre immer dabei.\nSei du selbst in jeder Nachricht.</string>
     <!-- Title of registration screen when asking for the users phone number -->
     <string name="RegistrationActivity_phone_number">Telefonnummer</string>
     <!-- Subtitle of registration screen when asking for the users phone number -->
@@ -2092,7 +2138,7 @@
     <string name="RegistrationActivity_phone_number_description">Telefonnummer</string>
     <string name="RegistrationActivity_country_code_description">Landesvorwahl</string>
     <string name="RegistrationActivity_call">Mich anrufen</string>
-    <string name="RegistrationActivity_verification_code">Verifikationscode</string>
+    <string name="RegistrationActivity_verification_code">Verifizierungscode</string>
     <string name="RegistrationActivity_resend_code">Code erneut senden</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">Probleme bei der Anmeldung?</string>
@@ -2108,7 +2154,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 7 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 vergisst, wird dein Konto für sieben Tage gesperrt.</string>
     <string name="RegistrationLockV2Dialog_turn_on">Einschalten</string>
     <string name="RegistrationLockV2Dialog_turn_off">Ausschalten</string>
 
@@ -2204,10 +2250,10 @@
     <string name="SubmitDebugLogActivity_success">Erfolgreich!</string>
     <string name="SubmitDebugLogActivity_copy_this_url_and_add_it_to_your_issue">Bitte kopiere diese Internetadresse und füge sie deinem Fehlerbericht oder deiner E-Mail an den Support hinzu:\n\n<b>%1$s</b></string>
     <string name="SubmitDebugLogActivity_share">Teilen</string>
-    <string name="SubmitDebugLogActivity_this_log_will_be_posted_publicly_online_for_contributors">Dieses Diagnoseprotokoll wird im Internet veröffentlicht, sodass Mitwirkende es einsehen können. Bevor du das Protokoll hochlädst, kannst du es noch einmal überprüfen.</string>
+    <string name="SubmitDebugLogActivity_this_log_will_be_posted_publicly_online_for_contributors">Dieses Diagnoseprotokoll wird online gestellt, sodass Mitwirkende es einsehen können. Bevor du das Protokoll hochlädst, kannst du es noch einmal überprüfen.</string>
 
     <!-- SupportEmailUtil -->
-  <!-- Removed by excludeNonTranslatables <string name="SupportEmailUtil_support_email" translatable="false">support@molly.im</string> -->
+  <!-- Removed by excludeNonTranslatables <string name="SupportEmailUtil_support_email" translatable="false">support@signal.org</string> -->
     <string name="SupportEmailUtil_filter">Filter:</string>
     <string name="SupportEmailUtil_device_info">Geräteinformationen:</string>
     <string name="SupportEmailUtil_android_version">Android-Version:</string>
@@ -2303,7 +2349,7 @@
     <!-- Toast message shown if user exceeds the rate limit for reserving usernames -->
     <string name="UsernameEditFragment_rate_limit_exceeded_error">Zu viele Versuche. Bitte versuche es später erneut.</string>
     <string name="UsernameEditFragment_this_username_is_taken">Dieser Nutzername ist vergeben.</string>
-    <string name="UsernameEditFragment_usernames_can_only_include">Nutzernamen dürfen nur a–Z, 0–9 und Unterstriche beinhalten.</string>
+    <string name="UsernameEditFragment_usernames_can_only_include">Nutzernamen dürfen nur Buchstaben (a-Z), 0-9 und Unterstriche beinhalten.</string>
     <string name="UsernameEditFragment_usernames_cannot_begin_with_a_number">Nutzernamen dürfen nicht mit einer Ziffer beginnen.</string>
     <string name="UsernameEditFragment_username_is_invalid">Nutzername ist ungültig.</string>
     <string name="UsernameEditFragment_usernames_must_be_between_a_and_b_characters">Nutzernamen dürfen aus %1$d bis %2$d Zeichen bestehen.</string>
@@ -2343,15 +2389,15 @@
     <string name="UsernameShareBottomSheet__copy_or_share_a_username_link">Einen Nutzernamen-Link kopieren oder teilen</string>
 
     <!-- VerifyIdentityActivity -->
-    <string name="VerifyIdentityActivity_your_contact_is_running_a_newer_version_of_Signal">Dein Kontakt verwendet eine neuere Signal-Version mit einem inkompatiblen QR-Code-Format. Zum Vergleichen bitte aktualisieren.</string>
-    <string name="VerifyIdentityActivity_the_scanned_qr_code_is_not_a_correctly_formatted_safety_number">Der eingescannte QR-Code ist kein korrekt formatierter Verifikationscode einer Sicherheitsnummer. Bitte versuche es erneut.</string>
+    <string name="VerifyIdentityActivity_your_contact_is_running_a_newer_version_of_Signal">Dein Kontakt verwendet eine neuere Signal-Version mit einem inkompatiblen QR-Code-Format. Zum Vergleichen bitte Signal aktualisieren.</string>
+    <string name="VerifyIdentityActivity_the_scanned_qr_code_is_not_a_correctly_formatted_safety_number">Der eingescannte QR-Code ist kein korrekt formatierter Verifizierungscode einer Sicherheitsnummer. Bitte versuche es erneut.</string>
     <string name="VerifyIdentityActivity_share_safety_number_via">Sicherheitsnummer teilen über …</string>
     <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">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 eure Sicherheitsnummer sehen zu können.</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 -->
     <string name="VerifyIdentityActivity_dialog_exchange_messages_to_create_safety_number_message">Nachdem du mit dieser Person Nachrichten ausgetauscht hast, wird eine Sicherheitsnummer erstellt.</string>
     <!-- Confirmation option for dialog explaining to user they must exchange messages first to create a safety number  -->
@@ -2368,11 +2414,11 @@
   <!-- Removed by excludeNonTranslatables <string name="AudioView_duration" translatable="false">%1$d:%2$02d</string> -->
 
     <!-- MessageDisplayHelper -->
-    <string name="MessageDisplayHelper_message_encrypted_for_non_existing_session">Nachricht wurde für eine nicht bestehende sichere Sitzung verschlüsselt</string>
+    <string name="MessageDisplayHelper_message_encrypted_for_non_existing_session">Nachricht wurde für eine nicht bestehende Sitzung verschlüsselt</string>
 
     <!-- MmsMessageRecord -->
     <string name="MmsMessageRecord_bad_encrypted_mms_message">Fehlerhaft verschlüsselte MMS</string>
-    <string name="MmsMessageRecord_mms_message_encrypted_for_non_existing_session">MMS wurde für eine nicht bestehende sichere Sitzung verschlüsselt</string>
+    <string name="MmsMessageRecord_mms_message_encrypted_for_non_existing_session">MMS wurde für eine nicht bestehende Sitzung verschlüsselt</string>
 
     <!-- MuteDialog -->
     <string name="MuteDialog_mute_notifications">Stummschalten</string>
@@ -2430,7 +2476,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 auf Molly.</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>
@@ -2460,7 +2506,7 @@
     <!-- Subtitle  for sheet explaining how to turn on app notifications -->
     <string name="TurnOnNotificationsBottomSheet__to_receive_notifications">Um Benachrichtigungen über neue Nachrichten zu erhalten:</string>
     <!-- Sheet step 1  for sheet explaining how to turn on app notifications-->
-    <string name="TurnOnNotificationsBottomSheet__1_tap_settings_below">1. Tippe unten auf „Einstellungen“</string>
+    <string name="TurnOnNotificationsBottomSheet__1_tap_settings_below">1. Tippe unten auf »Einstellungen«</string>
     <!-- Sheet step 2 with placeholder which will be replaced with an image of a toggle  for sheet explaining how to turn on app notifications -->
     <string name="TurnOnNotificationsBottomSheet__2_s_turn_on_notifications">2. %1$s Benachrichtigungen einschalten</string>
     <!-- Label for button at the bottom of the sheet which opens system app notification settings for sheet explaining how to turn on app notifications -->
@@ -2583,7 +2629,7 @@
     <string name="GroupCallSafetyNumberChangeNotification__someone_has_joined_this_call_with_a_safety_number_that_has_changed">Jemand mit einer geänderten Sicherheitsnummer ist diesem Anruf beigetreten.</string>
 
     <!-- WebRtcCallScreen -->
-    <string name="WebRtcCallScreen_swipe_up_to_change_views">Zum Ansichtswechsel nach oben wischen</string>
+    <string name="WebRtcCallScreen_swipe_up_to_change_views">Nach oben wischen um Ansicht zu wechseln</string>
 
     <!-- WebRtcCallScreen V2 -->
     <!-- Label with hyphenation. Translation can use soft hyphen - Unicode U+00AD -->
@@ -2681,8 +2727,8 @@
     <string name="conversation_activity__sim_n">SIM %1$d</string>
     <string name="conversation_activity__send">Senden</string>
     <string name="conversation_activity__compose_description">Nachricht verfassen</string>
-    <string name="conversation_activity__emoji_toggle_description">Emoji-Tastatur aktivieren</string>
-    <string name="conversation_activity__attachment_thumbnail">Anhangsvorschaubild</string>
+    <string name="conversation_activity__emoji_toggle_description">Emoji-Tastatur anzeigen</string>
+    <string name="conversation_activity__attachment_thumbnail">Vorschaubild Anhang</string>
     <string name="conversation_activity__quick_attachment_drawer_toggle_camera_description">Direktaufnahme</string>
     <string name="conversation_activity__quick_attachment_drawer_record_and_send_audio_description">Sprachnachricht aufnehmen und senden</string>
     <string name="conversation_activity__quick_attachment_drawer_lock_record_description">Audioaufnahme arretieren</string>
@@ -2709,6 +2755,8 @@
     <string name="ConversationUpdateItem_loading">Wird geladen …</string>
     <string name="ConversationUpdateItem_learn_more">Mehr erfahren</string>
     <string name="ConversationUpdateItem_join_call">Anruf beitreten</string>
+    <!-- Action button label for starting a new call in the current conversation -->
+    <string name="ConversationUpdateItem_call_back">Rückruf</string>
     <string name="ConversationUpdateItem_return_to_call">Zurück zum Anruf</string>
     <string name="ConversationUpdateItem_call_is_full">Anruf ist voll</string>
     <string name="ConversationUpdateItem_invite_friends">Freunde einladen</string>
@@ -2719,7 +2767,7 @@
     <string name="ConversationUpdateItem_no_groups_in_common_review_requests_carefully">Keine gemeinsamen Gruppen. Prüfe Anfragen sorgfältig.</string>
     <string name="ConversationUpdateItem_no_contacts_in_this_group_review_requests_carefully">Keine Kontakte in dieser Gruppe. Prüfe Anfragen sorgfältig.</string>
     <string name="ConversationUpdateItem_view">Anzeigen</string>
-    <string name="ConversationUpdateItem_the_disappearing_message_time_will_be_set_to_s_when_you_message_them">Die Ablaufzeit für verschwindende Nachrichten wird auf %1$s festgelegt, sobald du dem Nutzer eine Nachricht sendest.</string>
+    <string name="ConversationUpdateItem_the_disappearing_message_time_will_be_set_to_s_when_you_message_them">Die Ablaufzeit für verschwindende Nachrichten wird auf %1$s festgelegt, sobald du der Person eine Nachricht sendest.</string>
     <!-- Update item button text to show to boost a feature -->
     <string name="ConversationUpdateItem_donate">Spenden</string>
     <!-- Update item button text to send payment -->
@@ -2754,7 +2802,7 @@
     <string name="QuoteView__donation_for_a_friend">Spende für einen Freund</string>
 
     <!-- conversation_fragment -->
-    <string name="conversation_fragment__scroll_to_the_bottom_content_description">Zum Ende scrollen</string>
+    <string name="conversation_fragment__scroll_to_the_bottom_content_description">Nach unten scrollen</string>
 
     <!-- BubbleOptOutTooltip -->
     <!-- Message to inform the user of what Android chat bubbles are -->
@@ -2771,8 +2819,9 @@
     <string name="safety_number_change_dialog__join_call">Anruf beitreten</string>
     <string name="safety_number_change_dialog__continue_call">Anruf fortsetzen</string>
     <string name="safety_number_change_dialog__leave_call">Anruf verlassen</string>
-    <string name="safety_number_change_dialog__the_following_people_may_have_reinstalled_or_changed_devices">Die folgenden Personen haben Signal vielleicht erneut installiert oder das Gerät gewechselt. Verifiziert eure gemeinsame Sicherheitsnummer zur Sicherstellung der Privatsphäre.</string>
+    <string name="safety_number_change_dialog__the_following_people_may_have_reinstalled_or_changed_devices">Die folgenden Personen haben Signal vielleicht erneut installiert oder das Gerät gewechselt. Verifiziert eure gemeinsame Sicherheitsnummer, um eure Privatsphäre sicherzustellen.</string>
     <string name="safety_number_change_dialog__view">Anzeigen</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">Zuvor verifiziert</string>
 
     <!-- EnableCallNotificationSettingsDialog__call_notifications_checklist -->
@@ -2942,7 +2991,7 @@
     <string name="EditProfileNameFragment_first_name">Vorname</string>
     <string name="EditProfileNameFragment_last_name_optional">Nachname (optional)</string>
     <string name="EditProfileNameFragment_save">Speichern</string>
-    <string name="EditProfileNameFragment_failed_to_save_due_to_network_issues_try_again_later">Profilname konnte aufgrund Netzproblemen nicht gespeichert werden. Bitte versuche es später erneut.</string>
+    <string name="EditProfileNameFragment_failed_to_save_due_to_network_issues_try_again_later">Profilname konnte aufgrund von Netzproblemen nicht gespeichert werden. Bitte versuche es später erneut.</string>
 
     <!-- recipient_preferences_activity -->
     <string name="recipient_preference_activity__shared_media">Geteilte Medieninhalte</string>
@@ -2957,7 +3006,7 @@
     <string name="verify_display_fragment__failed_to_verify_safety_number">Sicherheitsnummer konnte nicht verifiziert werden</string>
     <string name="verify_display_fragment__loading">Wird geladen …</string>
     <string name="verify_display_fragment__mark_as_verified">Als verifiziert markieren</string>
-    <string name="verify_display_fragment__clear_verification">Verifikation entfernen</string>
+    <string name="verify_display_fragment__clear_verification">Verifizierung entfernen</string>
 
     <!-- verity_scan_fragment -->
     <string name="verify_scan_fragment__scan_the_qr_code_on_your_contact">Scanne den QR-Code deines Kontakts ein.</string>
@@ -3016,8 +3065,8 @@
   <!-- 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">Supportinformationen</string>
-    <string name="HelpFragment__signal_android_support_request">Supportanfrage für Signal Android</string>
+    <string name="HelpFragment__support_info">Support-Informationen</string>
+    <string name="HelpFragment__signal_android_support_request">Support-Anfrage für Signal Android</string>
     <string name="HelpFragment__debug_log">Diagnoseprotokoll:</string>
     <string name="HelpFragment__could_not_upload_logs">Protokoll konnte nicht hochgeladen werden</string>
     <string name="HelpFragment__please_be_as_descriptive_as_possible">Bitte beschreibe das Problem so genau wie möglich, damit wir es besser verstehen können.</string>
@@ -3086,6 +3135,7 @@
 
     <string name="arrays__default">Standard</string>
     <string name="arrays__high">Hoch</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">Maximal</string>
 
     <!-- plurals.xml -->
@@ -3199,7 +3249,7 @@
     <string name="preferences__language">Sprache</string>
     <string name="preferences__signal_messages_and_calls">Signal-Nachrichten und ‑Anrufe</string>
     <string name="preferences__advanced_pin_settings">Erweiterte PIN-Einstellungen</string>
-    <string name="preferences__free_private_messages_and_calls">Kostenlos und verschlüsselt mit Signal-Nutzern Nachrichten austauschen und telefonieren</string>
+    <string name="preferences__free_private_messages_and_calls">Kostenlos und verschlüsselt mit Signal-Kontakten Nachrichten austauschen und telefonieren</string>
     <string name="preferences__submit_debug_log">Diagnoseprotokoll übermitteln</string>
     <string name="preferences__delete_account">Dein Konto löschen</string>
     <string name="preferences__support_wifi_calling">Kompatibilität WLAN-Telefonie</string>
@@ -3357,7 +3407,7 @@
     <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 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>
@@ -3406,6 +3456,14 @@
     <!-- Storage permission row description -->
     <string name="GrantPermissionsFragment__send_photos_videos_and_files">Sende Fotos, Videos und Dateien von deinem Gerät.</string>
 
+    <!-- PermissionDeniedBottomSheet -->
+    <!-- Sheet describing step 1 on how to give permissions by opening settings -->
+    <string name="PermissionDeniedBottomSheet__1_tap_settings_below">1. Tap “Settings” below</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 Allow the permission</string>
+    <!-- Label for button at the bottom of the sheet which opens the system permission settings -->
+    <string name="PermissionDeniedBottomSheet__settings">Settings</string>
+
     <!-- PaymentsSecuritySetupFragment -->
     <!-- Toolbar title -->
     <string name="PaymentsSecuritySetupFragment__security_setup">Sicherheitseinstellungen</string>
@@ -3446,6 +3504,7 @@
     <string name="PaymentsDetailsFragment__sent_to_s">Gesendet an %1$s</string>
     <string name="PaymentsDetailsFragment__you_on_s_at_s">Du am %1$s um %2$s</string>
     <string name="PaymentsDetailsFragment__s_on_s_at_s">%1$s am %2$s um %3$s</string>
+    <!-- Prefix to a name to indicate who a payment was sent to -->
     <string name="PaymentsDetailsFragment__to">An</string>
     <string name="PaymentsDetailsFragment__from">Von</string>
     <string name="PaymentsDetailsFragment__information">Transaktionsdetails wie Zahlbetrag und Transaktionszeit sind Teil des MobileCoin-Kontenblatts.</string>
@@ -3508,6 +3567,7 @@
     <string name="ConfirmPayment__confirm_payment">Zahlung bestätigen</string>
     <string name="ConfirmPayment__network_fee">Netzwerkgebühr</string>
     <string name="ConfirmPayment__estimated_s">Geschätzt: %1$s</string>
+    <!-- Prefix to a name to indicate who a payment will be sent to -->
     <string name="ConfirmPayment__to">An</string>
     <string name="ConfirmPayment__total_amount">Gesamtbetrag</string>
     <string name="ConfirmPayment__balance_s">Kontostand: %1$s</string>
@@ -3658,6 +3718,14 @@
     <string name="conversation_group_options__conversation">Chat</string>
     <string name="conversation_group_options__broadcast">Broadcast</string>
 
+    <!-- DoubleTapEditEducationSheet -->
+    <!-- Displayed as the title of the education bottom sheet -->
+    <string name="DoubleTapEditEducationSheet__double_tap_edit_title">Double tap to edit</string>
+    <!-- Text on the sheet explaining how double tapping on a message will let them edit it -->
+    <string name="DoubleTapEditEducationSheet__quickly_tap_twice">Quickly tap twice on your messages to edit them. You can edit your messages up to 24hrs after they’ve been sent.</string>
+    <!-- Button label to dismiss sheet -->
+    <string name="DoubleTapEditEducationSheet__got_it">Got it</string>
+
     <!-- text_secure_normal -->
     <string name="text_secure_normal__menu_new_group">Neue Gruppe</string>
     <string name="text_secure_normal__menu_settings">Einstellungen</string>
@@ -3762,7 +3830,7 @@
 
     <!-- KbsLockFragment -->
     <string name="RegistrationLockFragment__enter_your_pin">PIN eingeben</string>
-    <string name="RegistrationLockFragment__enter_the_pin_you_created">Gib die PIN ein, die du für dein Konto erstellt hast. Sie unterscheidet sich von deinem SMS-Verifikationscode.</string>
+    <string name="RegistrationLockFragment__enter_the_pin_you_created">Gib die PIN ein, die du für dein Konto erstellt hast. Sie unterscheidet sich von deinem SMS-Verifizierungscode.</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">Gib die PIN ein, die du für dein Konto festgelegt hast.</string>
     <!-- Button label to prompt the user to switch between an alphanumeric and numeric-only keyboards -->
@@ -3884,7 +3952,7 @@
     <!--    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">Molly-Support kontaktieren</string>
-    <string name="RegistrationActivity_code_support_subject">Molly-Registrierung – Verifikationscode für Android</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>
@@ -4112,6 +4180,7 @@
     <string name="RecipientBottomSheet_copied_to_clipboard">In Zwischenablage kopiert</string>
 
     <string name="GroupRecipientListItem_admin">Admin</string>
+    <!-- Button text to approve a user that has requested to join a group -->
     <string name="GroupRecipientListItem_approve_description">Bestätigen</string>
     <string name="GroupRecipientListItem_deny_description">Ablehnen</string>
 
@@ -4139,6 +4208,7 @@
 
     <!-- VoiceNoteMediaDescriptionCompatFactory -->
     <string name="VoiceNoteMediaItemFactory__voice_message">Sprachnachricht · %1$s</string>
+    <!-- This is a title in a banner describing the conversation sender to receiver placeholders of the currently playing voice memo. -->
     <string name="VoiceNoteMediaItemFactory__s_to_s">%1$s an %2$s</string>
 
     <!-- StorageUtil -->
@@ -4152,8 +4222,16 @@
     <string name="ReviewCardDialogFragment__review_members">Mitglieder prüfen</string>
     <!-- Title of a screen where the user will be prompted to review a message request matching the name of someone they already know -->
     <string name="ReviewCardDialogFragment__review_request">Anfrage prüfen</string>
-    <string name="ReviewCardDialogFragment__d_group_members_have_the_same_name">%1$d Gruppenmitglieder haben denselben Namen. Prüfe die folgenden Mitglieder und handle entsprechend.</string>
-    <string name="ReviewCardDialogFragment__if_youre_not_sure">Falls du dir über die Herkunft der Anfrage unsicher bist, prüfe die folgenden Kontakte und handle entsprechend.</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="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 -->
+    <plurals name="ReviewCardDialogFragment__if_youre_not_sure">
+        <item quantity="one">If you\'re not sure who the request is from, review the contact below and take action.</item>
+        <item quantity="other">If you\'re not sure who the request is from, review the contacts below and take action.</item>
+    </plurals>
     <string name="ReviewCardDialogFragment__no_other_groups_in_common">Keine anderen gemeinsamen Gruppen.</string>
     <string name="ReviewCardDialogFragment__no_groups_in_common">Keine gemeinsamen Gruppen.</string>
     <plurals name="ReviewCardDialogFragment__d_other_groups_in_common">
@@ -4184,11 +4262,20 @@
     <string name="CallParticipantsListUpdatePopupWindow__s_joined">%1$s ist beigetreten</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_and_s_joined">%1$s und %2$s sind beigetreten</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_s_and_s_joined">%1$s, %2$s und %3$s sind beigetreten</string>
-    <string name="CallParticipantsListUpdatePopupWindow__s_s_and_d_others_joined">%1$s, %2$s und %3$d weitere Personen sind beigetreten</string>
+    <!-- Toast message shown in group call when 3 or more people join -->
+    <plurals name="CallParticipantsListUpdatePopupWindow__s_s_and_d_others_joined">
+        <item quantity="one">%1$s, %2$s and %3$d other joined</item>
+        <item quantity="other">%1$s, %2$s and %3$d others joined</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_s_and_d_others_left">%1$s, %2$s und %3$d weitere Personen sind ausgetreten</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 and %3$d other left</item>
+        <item quantity="other">%1$s, %2$s and %3$d others left</item>
+    </plurals>
 
     <string name="CallParticipant__you">Du</string>
     <string name="CallParticipant__you_on_another_device">Du (auf einem anderen Gerät)</string>
@@ -4558,10 +4645,15 @@
 
     <!-- PrivacySettingsFragment -->
     <string name="PrivacySettingsFragment__blocked">Blockiert</string>
-    <string name="PrivacySettingsFragment__d_contacts">%1$d Nutzer</string>
+    <!-- Settings label that shows the number blocked contacts -->
+    <plurals name="PrivacySettingsFragment__d_contacts">
+        <item quantity="one">%1$d contact</item>
+        <item quantity="other">%1$d contacts</item>
+    </plurals>
     <string name="PrivacySettingsFragment__messaging">Nachrichtenübermittlung</string>
     <string name="PrivacySettingsFragment__disappearing_messages">Verschwindende Nachrichten</string>
     <string name="PrivacySettingsFragment__app_security">App-Sicherheit</string>
+    <!-- This refers to the multi-tasking overview (recent apps) from the Android operating system.-->
     <string name="PrivacySettingsFragment__block_screenshots_in_the_recents_list_and_inside_the_app">Bildschirmfotos in der Anwendung und der Liste der letzten Anwendungen blockieren</string>
     <string name="PrivacySettingsFragment__signal_message_and_calls">Signal-Nachrichten und -Anrufe, Anrufe immer indirekt und Vertraulicher Absender</string>
     <string name="PrivacySettingsFragment__default_timer_for_new_changes">Standardablaufzeit für neue Chats</string>
@@ -4618,11 +4710,14 @@
     <string name="DataAndStorageSettingsFragment__media_quality">Medienqualität</string>
     <string name="DataAndStorageSettingsFragment__sent_media_quality">Medienqualität für Versand</string>
     <string name="DataAndStorageSettingsFragment__sending_high_quality_media_will_use_more_data">Das Senden von Medieninhalten hoher Qualität verbraucht mehr Datenvolumen.</string>
+    <!-- Setting option that can be selected to default media to be sent as high quality by default -->
     <string name="DataAndStorageSettingsFragment__high">Hoch</string>
+    <!-- Setting option that can be selected to default media to be sent as standard quality by default -->
     <string name="DataAndStorageSettingsFragment__standard">Standard</string>
     <string name="DataAndStorageSettingsFragment__calls">Anrufe</string>
 
     <!-- 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__use_custom_colors">Personalisierte Farben</string>
     <string name="ChatColorSelectionFragment__chat_color">Chat-Farbe</string>
@@ -4834,6 +4929,7 @@
     <string name="AvatarPickerFragment__take_a_picture">Nimm ein Foto auf</string>
     <string name="AvatarPickerFragment__choose_a_photo">Wähle ein Foto</string>
     <string name="AvatarPickerFragment__photo">Foto</string>
+    <!-- Button label during avatar selection/creation that when tapped lets you generate an avatar from typed in text. -->
     <string name="AvatarPickerFragment__text">Text</string>
     <string name="AvatarPickerFragment__save">Speichern</string>
     <string name="AvatarPickerFragment__clear_avatar">Avatar löschen</string>
@@ -4888,13 +4984,13 @@
 
     <!-- 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>
+    <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_reply">Antwort hinzufügen</string>
     <string name="MediaReviewFragment__send_to">Senden an</string>
-    <string name="MediaReviewFragment__view_once_message">Einmalig anzeigbare Nachricht</string>
+    <string name="MediaReviewFragment__view_once_message">Medien zur Einmalansicht</string>
     <string name="MediaReviewFragment__one_or_more_items_were_too_large">Mindestens ein Element war zu groß</string>
     <string name="MediaReviewFragment__one_or_more_items_were_invalid">Mindestens ein Element war ungültig</string>
     <string name="MediaReviewFragment__too_many_items_selected">Zu viele Elemente ausgewählt</string>
@@ -5398,7 +5494,7 @@
     <!-- Donation receipts amount title -->
     <string name="DonationReceiptDetailsFragment__amount">Betrag</string>
     <!-- Donation receipts thanks -->
-    <string name="DonationReceiptDetailsFragment__thank_you_for_supporting">Vielen Dank, dass du Signal unterstützt. Deine Spende trägt dazu bei, die Entwicklung von Open-Source-Datenschutztechnologien voranzutreiben, die die freie Meinungsäußerung schützen und eine sichere globale Kommunikation für Millionen von Menschen auf der ganzen Welt ermöglichen. Falls du deinen Wohnsitz in den USA hast, bewahre bitte diese Bescheinigung für deine Steuerunterlagen auf. Die Signal Technology Foundation ist eine steuerbefreite gemeinnützige Organisation in den USA gemäß Abschnitt 501c3 des Internal Revenue Code. Unsere Federal Tax ID lautet 82-4506840.</string>
+    <string name="DonationReceiptDetailsFragment__thank_you_for_supporting">Vielen Dank, dass du Signal unterstützt. Deine Spende trägt dazu bei, die Entwicklung von Open-Source-Datenschutztechnologien voranzutreiben, die die freie Meinungsäußerung schützen und eine sichere globale Kommunikation für Millionen von Menschen auf der ganzen Welt ermöglichen. Falls du deinen Wohnsitz in den USA hast, bewahre bitte diese Bescheinigung für deine Steuerunterlagen auf. Die Signal Stiftung (Signal Technology Foundation) ist eine steuerbefreite gemeinnützige Organisation in den USA gemäß Abschnitt 501c3 des Internal Revenue Code. Unsere Federal Tax ID lautet 82-4506840.</string>
     <!-- Donation receipt type -->
     <string name="DonationReceiptDetailsFragment__s_dash_s">%1$s - %2$s</string>
     <!-- Donation reciepts screen empty state title -->
@@ -5487,7 +5583,7 @@
     <string name="StoryViewerFragment__s_s">%1$s %2$s</string>
     <!-- Displayed when viewing a post you sent -->
     <string name="StoryViewerPageFragment__you">Du</string>
-    <!-- Displayed when viewing a post displayed to a group -->
+    <!-- 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 an %2$s</string>
     <!-- Displayed when viewing a post from another user with no replies -->
     <string name="StoryViewerPageFragment__reply">Antworten</string>
@@ -5871,7 +5967,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 Verbindungen 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>
@@ -6668,8 +6764,8 @@
     <string name="LinkedDeviceInactiveMegaphone_title">Inaktive gekoppelte Geräte</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">Öffne Signal auf dem Gerät innerhalb %2$d Tages, damit \"%1$s\" weiterhin gekoppelt bleibt.</item>
-        <item quantity="other">Öffne Signal auf dem Gerät innerhalb von %2$d Tagen, damit \"%1$s\" weiterhin gekoppelt bleibt.</item>
+        <item quantity="one">Öffne Signal auf dem Gerät innerhalb %2$d Tages, damit »%1$s« weiterhin gekoppelt bleibt.</item>
+        <item quantity="other">Öffne Signal auf dem Gerät innerhalb von %2$d Tagen, damit »%1$s« weiterhin gekoppelt bleibt.</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">Mich nicht daran erinnern</string>
@@ -6680,7 +6776,7 @@
     <!-- Title displayed at the top of the screen -->
     <string name="NicknameActivity__nickname">Spitzname</string>
     <!-- Subtitle displayed under title -->
-    <string name="NicknameActivity__nicknames_amp_notes">Nicknames &amp; notes are stored with Signal and end-to-end encrypted. They are only visible to you.</string>
+    <string name="NicknameActivity__nicknames_amp_notes">Spitznamen und Notizen werden mit Signal gespeichert und sind Ende-zu-Ende-verschlüsselt. Sie sind nur für dich sichtbar.</string>
     <!-- Field label for given name -->
     <string name="NicknameActivity__first_name">Vorname</string>
     <!-- Content description for first name clear button -->
@@ -6694,9 +6790,9 @@
     <!-- Button label to save -->
     <string name="NicknameActivity__save">Speichern</string>
     <!-- Dialog title for note and name deletion -->
-    <string name="NicknameActivity__delete_nickname">Delete?</string>
+    <string name="NicknameActivity__delete_nickname">Löschen?</string>
     <!-- Dialog message for note and name deletion -->
-    <string name="NicknameActivity__this_will_permanently_delete_this_nickname_and_note">This will permanently delete any nickname and note you’ve set.</string>
+    <string name="NicknameActivity__this_will_permanently_delete_this_nickname_and_note">Dadurch werden diese Spitznamen und Notizen unwiderruflich gelöscht.</string>
 
     <!-- ViewNoteBottomSheetDialogFragment -->
     <!-- Sheet title -->
@@ -6704,5 +6800,26 @@
     <!-- Content description for opening the note editor -->
     <string name="ViewNoteSheet__edit_note">Notiz bearbeiten</string>
 
+    <!-- BackupProgressService -->
+    <!-- Notification title shown while backup restore job is running -->
+    <string name="BackupProgressService_title">Datensicherung wiederherstellen…</string>
+    <!-- Notification title shown while downloading backup restore data -->
+    <string name="BackupProgressService_title_downloading">Sicherungsdaten werden heruntergeladen…</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>
+    <!-- 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 -->
+    <string name="BackupsTypeSettingsFragment__google_pay">Google Pay</string>
+    <!-- Displayed as the user\'s payment method as a label in a preference row -->
+    <string name="BackupsTypeSettingsFragment__bank_transfer">Bank transfer</string>
+    <!-- Displayed as the user\'s payment method as a label in a preference row -->
+    <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>
+
+
     <!-- 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 78df847d3b..50686bc515 100644
--- a/app/src/main/res/values-el/strings.xml
+++ b/app/src/main/res/values-el/strings.xml
@@ -1,6 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- smartling.instruction_comments_enabled = on -->
-<resources>
+<?xml version="1.0" encoding="UTF-8"?><!-- 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> -->
@@ -89,6 +87,16 @@
     <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">Allow access to your location</string>
+    <!-- Dialog description that will explain the steps needed to give location permission -->
+    <string name="AttachmentManager_signal_to_send_location">To send your location:</string>
+    <!-- Alert dialog description asking for location permission -->
+    <string name="AttachmentManager_signal_allow_signal_access_location">Allow Molly access to send your location.</string>
+    <!-- Toast text explaining Signal\'s need for location access -->
+    <string name="AttachmentManager_signal_needs_location_access">Molly needs location access to send your location.</string>
+
     <!-- Alert dialog title to show the recipient has not activated payments -->
     <string name="AttachmentManager__not_activated_payments">Ο χρήστης %1$s δεν έχει ενεργοποιήσει τις πληρωμές </string>
     <!-- Alert dialog description to send the recipient a request to activate payments -->
@@ -241,7 +249,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>
@@ -386,8 +394,16 @@
     <string name="ConversationActivity_your_request_to_join_has_been_sent_to_the_group_admin">Το αίτημά σου για να μπεις στην ομάδα στάλθηκε στον διαχειριστή/τρια της ομάδας. Θα ενημερωθείς όταν λάβει απόφαση.</string>
     <string name="ConversationActivity_cancel_request">Ακύρωση αιτήματος</string>
 
-    <string name="ConversationActivity_to_send_audio_messages_allow_signal_access_to_your_microphone">Για να στείλεις μηνύματα ήχου, δώσε στο Molly πρόσβαση στο μικρόφωνο.</string>
+    <!-- Dialog title asking users for microphone permission -->
+    <string name="ConversationActivity_allow_access_microphone">Allow access to your microphone</string>
+    <!-- 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>
+    <!-- Toast text explaining Signal\'s need for microphone access -->
+    <string name="ConversationActivity_signal_needs_microphone_access_voice_message">Molly needs microphone access to record a voice message.</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">Το 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>
@@ -411,10 +427,17 @@
     <string name="ConversationActivity_you_will_leave_this_group_and_it_will_be_deleted_from_all_of_your_devices">Θα αποχωρήσεις από αυτή την ομάδα και θα διαγραφεί από όλες τις συσκευές σου.</string>
     <string name="ConversationActivity_delete">Διαγραφή</string>
     <string name="ConversationActivity_delete_and_leave">Διαγραφή και αποχώρηση</string>
-    <string name="ConversationActivity__to_call_s_signal_needs_access_to_your_microphone">Για να καλέσεις τον/την %1$s, το Molly χρειάζεται πρόσβαση στο μικρόφωνό σου.</string>
+
+    <!-- Dialog description that will explain the steps needed to give microphone permissions for a voice call -->
+    <string name="ConversationActivity__to_start_call">To start a 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">To start a call, allow Molly access to your microphone.</string>
+    <!-- Toast text explaining Signal\'s need for microphone access for a voice call -->
+    <string name="ConversationActivity_signal_needs_microphone_access_voice_call">Molly needs microphone access to start a call.</string>
 
 
     <string name="ConversationActivity_join">Μπες στην κλήση</string>
+    <!-- Button text for an active group call but the call is currently full and unjoinable -->
     <string name="ConversationActivity_full">Γεμάτο</string>
 
     <string name="ConversationActivity_error_sending_media">Σφάλμα στην αποστολή πολυμέσων</string>
@@ -613,6 +636,7 @@
     <string name="ConversationListFragment_unarchive">Επαναφορά</string>
     <string name="ConversationListFragment_delete">Διαγραφή</string>
     <string name="ConversationListFragment_select_all">Επιλογή όλων</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 επιλεγμένο</item>
         <item quantity="other">%1$d επιλεγμένα</item>
@@ -864,6 +888,7 @@
         <item quantity="one">Στάλθηκε πρόσκληση</item>
         <item quantity="other">Στάλθηκαν %1$d προσκλήσεις</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">Δεν μπορείς να προσθέσεις τον/την \"%1$s\" αυτόματα στην ομάδα.\n\nΈχει λάβει πρόσκληση, και δεν θα βλέπει τα μηνύματα της ομάδας μέχρι να την αποδεχτεί.</string>
     <string name="GroupManagement_invite_multiple_users">Δεν μπορείς να προσθέσεις αυτόματα αυτούς τους χρήστες στην ομάδα.\n\nΈχουν λάβει πρ΄σκληση, και δεν θα βλέπουν τα μηνύματα της ομάδας μέχρι να την αποδεχτούν.</string>
 
@@ -1044,7 +1069,9 @@
 
     <string name="ManageGroupActivity_edit_name_and_picture">Επεξεργασία ονόματος και φωτογραφίας</string>
     <string name="ManageGroupActivity_legacy_group">Ομάδα παλαιού τύπου</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">Αυτή είναι ομάδα παλαιού τύπου. Δυνατότητες όπως οι διαχειριστές ομάδας είναι διαθέσιμα μόνο στις ομάδες νέου τύπου.</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">Αυτή είναι μια ομάδα παλαιού τύπου. Για πρόσβαση σε δυνατότητες όπως οι @αναφορές και οι διαχειριστές ομάδας,</string>
     <string name="ManageGroupActivity_legacy_group_too_large">Αυτή η ομάδα παλαιού τύπου δεν μπορεί να αναβαθμιστεί σε Ομάδα νέου τύπου επειδή είναι πολύ μεγάλη. Το μέγιστο μέγεθος της ομάδας είναι %1$d.</string>
     <string name="ManageGroupActivity_upgrade_this_group">αναβάθμισε την ομάδα.</string>
@@ -1271,6 +1298,7 @@
         <item quantity="other">Διαγραφή</item>
     </plurals>
 
+    <!-- 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 επιλεγμένο (%2$s)</item>
         <item quantity="other">%1$d επιλεγμένα (%2$s)</item>
@@ -1335,17 +1363,13 @@
     <string name="MessageRecord_left_group">Αποχώρησες απ\' την ομάδα.</string>
     <string name="MessageRecord_you_updated_group">Ενημέρωσες την ομάδα</string>
     <string name="MessageRecord_the_group_was_updated">Η ομάδα ανανεώθηκε.</string>
-    <!-- Update message shown when placing an outgoing 1:1 voice/audio call and it\'s answered by the other party -->
+    <!-- Update message shown when placing an outgoing 1:1 voice/audio call -->
     <string name="MessageRecord_outgoing_voice_call">Εξερχόμενη κλήση</string>
-    <!-- Update message shown when placing an outgoing 1:1 video call and it\'s answered by the other party -->
+    <!-- Update message shown when placing an outgoing 1:1 video call -->
     <string name="MessageRecord_outgoing_video_call">Εξερχόμενη βιντεοκλήση</string>
-    <!-- Update message shown when placing an outgoing 1:1 voice/audio call and it\'s not answered by the other party -->
-    <string name="MessageRecord_unanswered_voice_call">Αναπάντητη κλήση</string>
-    <!-- Update message shown when placing an outgoing 1:1 video call and it\'s not answered by the other party -->
-    <string name="MessageRecord_unanswered_video_call">Αναπάντητη βιντεοκλήση</string>
-    <!-- Update message shown when receiving an incoming 1:1 voice/audio call and it\'s answered -->
+    <!-- Update message shown when receiving an incoming 1:1 voice/audio call and it\'s answered or ringing -->
     <string name="MessageRecord_incoming_voice_call">Εισερχόμενη κλήση</string>
-    <!-- Update message shown when receiving an incoming 1:1 video call and answered -->
+    <!-- Update message shown when receiving an incoming 1:1 video call and answered or ringing -->
     <string name="MessageRecord_incoming_video_call">Εισερχόμενη βιντεοκλήση</string>
     <!-- Update message shown when receiving an incoming 1:1 voice/audio call and not answered -->
     <string name="MessageRecord_missed_voice_call">Αναπάντητη κλήση</string>
@@ -1355,10 +1379,6 @@
     <string name="MessageRecord_missed_voice_call_notification_profile">Αναπάντητη φωνητική κλήση ενώ είναι ενεργό το προφίλ ειδοποιήσεων</string>
     <!-- Update message shown when receiving an incoming video call and declined due to notification profile -->
     <string name="MessageRecord_missed_video_call_notification_profile">Αναπάντητη βιντεοκλήση ενώ είναι ενεργό το προφίλ ειδοποιήσεων</string>
-    <!-- Update message shown when receiving an incoming 1:1 voice/audio call and explicitly declined -->
-    <string name="MessageRecord_you_declined_a_voice_call">Απέρριψες μια κλήση</string>
-    <!-- Update message shown when receiving an incoming 1:1 video call and explicitly declined -->
-    <string name="MessageRecord_you_declined_a_video_call">Απέρριψες μια βιντεοκλήση</string>
     <!-- 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>
@@ -1567,28 +1587,53 @@
     <string name="MessageRecord_can_accept_payments">Ο χρήστης %1$s μπορεί να αποδεχτεί πληρωμές</string>
 
     <!-- Group Calling update messages -->
-    <string name="MessageRecord_s_started_a_group_call_s">Ο/Η %1$s ξεκίνησε μια ομαδική κλήση · %2$s</string>
-    <string name="MessageRecord_you_started_a_group_call_s">Ξεκίνησες μια ομαδική κλήση · %1$s</string>
-    <string name="MessageRecord_s_is_in_the_group_call_s">Ο/Η %1$s είναι στην ομαδική κλήση · %2$s</string>
-    <string name="MessageRecord_you_are_in_the_group_call_s1">Είσαι στην ομαδική κλήση · %1$s</string>
-    <string name="MessageRecord_s_and_s_are_in_the_group_call_s1">Οι %1$s και %2$s είναι στην ομαδική κλήση · %3$s</string>
-    <string name="MessageRecord_group_call_s">Ομαδική κλήση · %1$s</string>
-
-    <string name="MessageRecord_s_started_a_group_call">Ο/Η %1$s ξεκίνησε μια ομαδική κλήση</string>
-    <string name="MessageRecord_you_started_a_group_call">Ξεκίνησες μια ομαδική κλήση</string>
-    <string name="MessageRecord_s_is_in_the_group_call">Ο/Η %1$s είναι στην ομαδική κλήση</string>
-    <string name="MessageRecord_you_are_in_the_group_call">Είσαι στην ομαδική κλήση</string>
-    <string name="MessageRecord_s_and_s_are_in_the_group_call">Οι %1$s και %2$s είναι στην ομαδική κλήση</string>
-    <string name="MessageRecord_group_call">Ομαδική κλήση</string>
+    <!-- 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 είναι στην κλήση · %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">Είσαι στην κλήση · %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 και %2$s είναι στην κλήση · %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 είναι στην κλήση</string>
+    <!-- Chat log text for an ongoing group call only the local user has joined -->
+    <string name="MessageRecord_you_are_in_the_call">Είσαι στην κλήση</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 και %2$s είναι στην κλήση</string>
+    <!-- Chat log text for a group call that ended within the last 5 minutes -->
+    <string name="MessageRecord__the_video_call_has_ended">Η βιντεοκλήση τελείωσε</string>
+    <!-- Chat log text for a group call that ended within the last 5 minutes with a placeholder for formatted time -->
+    <string name="MessageRecord__the_video_call_has_ended_s">Η βιντεοκλήση τελείωσε · %1$s</string>
+    <!-- Chat log text for a group call that ended more than 5 minutes ago and was missed -->
+    <string name="MessageRecord__missed_video_call">Αναπάντητη βιντεοκλήση</string>
+    <!-- Chat log text for a group call that ended more than 5 minutes ago and was missed with a placeholder for formatted time -->
+    <string name="MessageRecord__missed_video_call_s">Αναπάντητη βιντεοκλήση · %1$s</string>
+    <!-- Chat log text for a group call that ended that the local user did not start -->
+    <string name="MessageRecord__incoming_video_call">Εισερχόμενη βιντεοκλήση</string>
+    <!-- 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">Εισερχόμενη βιντεοκλήση · %1$s</string>
+    <!-- Chat log text for a group call that ended that the local user started -->
+    <string name="MessageRecord__outgoing_video_call">Εξερχόμενη βιντεοκλήση</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">Εξερχόμενη βιντεοκλήση · %1$s</string>
+    <!-- Chat log text for an ongoing group call that the local user started -->
+    <string name="MessageRecord__you_started_a_video_call">Ξεκίνησες μια βιντεοκλήση</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">Ξεκίνησες μια βιντεοκλήση · %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 ξεκίνησε μια βιντεοκλήση</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 ξεκίνησε μια βιντεοκλήση · %2$s</string>
 
     <string name="MessageRecord_you">Εσύ</string>
 
-    <plurals name="MessageRecord_s_s_and_d_others_are_in_the_group_call_s">
+    <!-- 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 και %3$d ακόμα είναι στην κλήση · %4$s</item>
         <item quantity="other">Οι %1$s, %2$s και %3$d ακόμα είναι στην ομαδική κλήση · %4$s</item>
     </plurals>
 
-    <plurals name="MessageRecord_s_s_and_d_others_are_in_the_group_call">
+    <!-- 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 και %3$d ακόμα είναι στην ομαδική κλήση</item>
         <item quantity="other">Οι %1$s, %2$s και %3$d ακόμα είναι στην ομαδική κλήση</item>
     </plurals>
@@ -2063,6 +2108,7 @@
     <!-- Generic error when the app is unable to request an SMS code for an unknown reason. -->
     <string name="RegistrationActivity_unable_to_request_verification_code">Αδυναμία αίτησης κωδικού επαλήθευσης. Έλεγξε τη σύνδεση στο δίκτυο και προσπάθησε ξανά.</string>
     <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">Molly Android - Μορφή αριθμού τηλεφώνου</string>
     <!--    Small "toast" notification to the user confirming that they have requested a new code via voice call.-->
@@ -2207,7 +2253,7 @@
     <string name="SubmitDebugLogActivity_this_log_will_be_posted_publicly_online_for_contributors">Αυτό το αρχείο καταγραφής συμβάντων θα αναρτηθεί δημόσια στο διαδίκτυο για προβολή από τους συνεισφέροντες. Μπορείς να το εξετάσεις πριν το υποβάλλεις.</string>
 
     <!-- SupportEmailUtil -->
-  <!-- Removed by excludeNonTranslatables <string name="SupportEmailUtil_support_email" translatable="false">support@molly.im</string> -->
+  <!-- Removed by excludeNonTranslatables <string name="SupportEmailUtil_support_email" translatable="false">support@signal.org</string> -->
     <string name="SupportEmailUtil_filter">Φίλτρο:</string>
     <string name="SupportEmailUtil_device_info">Πληροφορίες συσκευής:</string>
     <string name="SupportEmailUtil_android_version">Έκδοση Android:</string>
@@ -2709,6 +2755,8 @@
     <string name="ConversationUpdateItem_loading">Φορτώνει</string>
     <string name="ConversationUpdateItem_learn_more">Μάθε περισσότερα</string>
     <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_call_is_full">Η κλήση είναι γεμάτη</string>
     <string name="ConversationUpdateItem_invite_friends">Πρόσκληση φίλων</string>
@@ -2773,6 +2821,7 @@
     <string name="safety_number_change_dialog__leave_call">Αποχώρηση από την κλήση</string>
     <string name="safety_number_change_dialog__the_following_people_may_have_reinstalled_or_changed_devices">Τα παρακάτω άτομα ίσως επανεγκατεστησαν το Signal ή άλλαξαν συσκευή. Επιβεβαίωσε τους αριθμούς ασφαλείας με αυτά, για να διασφαλίσεις την ιδιωτικότητα.</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>
 
     <!-- EnableCallNotificationSettingsDialog__call_notifications_checklist -->
@@ -3086,6 +3135,7 @@
 
     <string name="arrays__default">Προκαθορισμένη</string>
     <string name="arrays__high">Υψηλή</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">Μέγιστη</string>
 
     <!-- plurals.xml -->
@@ -3357,7 +3407,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">Μπορείς να χρησιμοποιήσεις το 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">Οι πληρωμές στο Molly δεν είναι πλέον διαθέσιμες. Μπορείτε ακόμα να μεταφέρετε χρήματα προς ένα ανταλλακτήριο, αλλά δεν μπορείτε πλέον να στέλνετε και να λαμβάνετε πληρωμές ή να προσθέτετε χρήματα.</string>
@@ -3406,6 +3456,14 @@
     <!-- Storage permission row description -->
     <string name="GrantPermissionsFragment__send_photos_videos_and_files">Στείλε φωτογραφίες, βίντεο και αρχεία από τη συσκευή σου.</string>
 
+    <!-- PermissionDeniedBottomSheet -->
+    <!-- Sheet describing step 1 on how to give permissions by opening settings -->
+    <string name="PermissionDeniedBottomSheet__1_tap_settings_below">1. Tap “Settings” below</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 Allow the permission</string>
+    <!-- Label for button at the bottom of the sheet which opens the system permission settings -->
+    <string name="PermissionDeniedBottomSheet__settings">Settings</string>
+
     <!-- PaymentsSecuritySetupFragment -->
     <!-- Toolbar title -->
     <string name="PaymentsSecuritySetupFragment__security_setup">Ρύθμιση ασφάλειας</string>
@@ -3446,6 +3504,7 @@
     <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__information">Τα στοιχεία της συναλλαγής, συμπεριλαμβανομένου του ποσού πληρωμής και του χρόνου συναλλαγής, αποτελούν μέρος του MobileCoin Ledger.</string>
@@ -3508,6 +3567,7 @@
     <string name="ConfirmPayment__confirm_payment">Επιβεβαίωση πληρωμής</string>
     <string name="ConfirmPayment__network_fee">Χρέωση δικτύου</string>
     <string name="ConfirmPayment__estimated_s">Εκτιμώμενο %1$s</string>
+    <!-- Prefix to a name to indicate who a payment will be sent to -->
     <string name="ConfirmPayment__to">Προς</string>
     <string name="ConfirmPayment__total_amount">Συνολικό ποσό</string>
     <string name="ConfirmPayment__balance_s">Υπόλοιπο: %1$s</string>
@@ -3658,6 +3718,14 @@
     <string name="conversation_group_options__conversation">Συνομιλία</string>
     <string name="conversation_group_options__broadcast">Αποστολή σε όλους/ες</string>
 
+    <!-- DoubleTapEditEducationSheet -->
+    <!-- Displayed as the title of the education bottom sheet -->
+    <string name="DoubleTapEditEducationSheet__double_tap_edit_title">Double tap to edit</string>
+    <!-- Text on the sheet explaining how double tapping on a message will let them edit it -->
+    <string name="DoubleTapEditEducationSheet__quickly_tap_twice">Quickly tap twice on your messages to edit them. You can edit your messages up to 24hrs after they’ve been sent.</string>
+    <!-- Button label to dismiss sheet -->
+    <string name="DoubleTapEditEducationSheet__got_it">Got it</string>
+
     <!-- text_secure_normal -->
     <string name="text_secure_normal__menu_new_group">Νέα ομάδα</string>
     <string name="text_secure_normal__menu_settings">Ρυθμίσεις</string>
@@ -4112,6 +4180,7 @@
     <string name="RecipientBottomSheet_copied_to_clipboard">Αντιγράφηκε στο πρόχειρο</string>
 
     <string name="GroupRecipientListItem_admin">Διαχειριστής/τρια</string>
+    <!-- Button text to approve a user that has requested to join a group -->
     <string name="GroupRecipientListItem_approve_description">Έγκριση</string>
     <string name="GroupRecipientListItem_deny_description">Απόρριψη</string>
 
@@ -4139,6 +4208,7 @@
 
     <!-- VoiceNoteMediaDescriptionCompatFactory -->
     <string name="VoiceNoteMediaItemFactory__voice_message">Μήνυμα φωνής · %1$s</string>
+    <!-- This is a title in a banner describing the conversation sender to receiver placeholders of the currently playing voice memo. -->
     <string name="VoiceNoteMediaItemFactory__s_to_s">%1$s προς %2$s</string>
 
     <!-- StorageUtil -->
@@ -4152,8 +4222,16 @@
     <string name="ReviewCardDialogFragment__review_members">Ανασκόπηση μελών</string>
     <!-- Title of a screen where the user will be prompted to review a message request matching the name of someone they already know -->
     <string name="ReviewCardDialogFragment__review_request">Εξέταση αιτήματος</string>
-    <string name="ReviewCardDialogFragment__d_group_members_have_the_same_name">%1$d μέλη της ομάδας έχουν το ίδιο όνομα, εξέτασε τα παρακάτω μέλη, και διάλεξε τί ενέργεια να κάνεις.</string>
-    <string name="ReviewCardDialogFragment__if_youre_not_sure">Αν δεν είσαι σίγουρος/η από ποιόν είναι το αίτημα, εξέτασε τις παρακάτω επαφές, και κάνε κάποια ενέργεια.</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="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 -->
+    <plurals name="ReviewCardDialogFragment__if_youre_not_sure">
+        <item quantity="one">If you\'re not sure who the request is from, review the contact below and take action.</item>
+        <item quantity="other">If you\'re not sure who the request is from, review the contacts below and take action.</item>
+    </plurals>
     <string name="ReviewCardDialogFragment__no_other_groups_in_common">Καμμία άλλη κοινή ομάδα</string>
     <string name="ReviewCardDialogFragment__no_groups_in_common">Καμμία κοινή ομάδα.</string>
     <plurals name="ReviewCardDialogFragment__d_other_groups_in_common">
@@ -4184,11 +4262,20 @@
     <string name="CallParticipantsListUpdatePopupWindow__s_joined">Ο/Η %1$s μπήκε</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_and_s_joined">Οι %1$s και %2$s μπήκαν</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_s_and_s_joined">Οι %1$s, %2$s και %3$s μπήκαν</string>
-    <string name="CallParticipantsListUpdatePopupWindow__s_s_and_d_others_joined">Οι %1$s, %2$s και %3$d ακόμα μπήκαν</string>
+    <!-- Toast message shown in group call when 3 or more people join -->
+    <plurals name="CallParticipantsListUpdatePopupWindow__s_s_and_d_others_joined">
+        <item quantity="one">%1$s, %2$s and %3$d other joined</item>
+        <item quantity="other">%1$s, %2$s and %3$d others joined</item>
+    </plurals>
+    <!-- Toast/popup text shown when someone leaves a group call -->
     <string name="CallParticipantsListUpdatePopupWindow__s_left">Ο/Η %1$s έφυγε</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_and_s_left">Οι %1$s και %2$s έφυγαν</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_s_and_s_left">Οι %1$s, %2$s και %3$s έφυγαν</string>
-    <string name="CallParticipantsListUpdatePopupWindow__s_s_and_d_others_left">Οι %1$s, %2$s και %3$d ακόμα έφυγαν</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 and %3$d other left</item>
+        <item quantity="other">%1$s, %2$s and %3$d others left</item>
+    </plurals>
 
     <string name="CallParticipant__you">Εσύ</string>
     <string name="CallParticipant__you_on_another_device">Εσύ (από άλλη συσκευή)</string>
@@ -4558,10 +4645,15 @@
 
     <!-- PrivacySettingsFragment -->
     <string name="PrivacySettingsFragment__blocked">Λίστα αποκλεισμού</string>
-    <string name="PrivacySettingsFragment__d_contacts">%1$d επαφές</string>
+    <!-- Settings label that shows the number blocked contacts -->
+    <plurals name="PrivacySettingsFragment__d_contacts">
+        <item quantity="one">%1$d contact</item>
+        <item quantity="other">%1$d contacts</item>
+    </plurals>
     <string name="PrivacySettingsFragment__messaging">Συνομιλίες</string>
     <string name="PrivacySettingsFragment__disappearing_messages">Μηνύματα που εξαφανίζονται</string>
     <string name="PrivacySettingsFragment__app_security">Ασφάλεια εφαρμογής</string>
+    <!-- This refers to the multi-tasking overview (recent apps) from the Android operating system.-->
     <string name="PrivacySettingsFragment__block_screenshots_in_the_recents_list_and_inside_the_app">Να μην επιτρέπονται τα στιγμιότυπα οθόνης (screenshots) στη λίστα με τα πρόσφατα και μέσα στην εφαρμογή</string>
     <string name="PrivacySettingsFragment__signal_message_and_calls">Κλήσεις και μηνύματα Signal, κλήσεις που πάντα αναμεταδίδονται, και προστατευμένος αποστολέας</string>
     <string name="PrivacySettingsFragment__default_timer_for_new_changes">Προκαθορισμένο χρονόμετρο για νέες συνομιλίες</string>
@@ -4618,11 +4710,14 @@
     <string name="DataAndStorageSettingsFragment__media_quality">Ποιότητα πολυμέσων</string>
     <string name="DataAndStorageSettingsFragment__sent_media_quality">Ποιότητα απεσταλμένων πολυμέσων</string>
     <string name="DataAndStorageSettingsFragment__sending_high_quality_media_will_use_more_data">Η αποστολή πολυμέσων υψηλής ποιότητας θα καταναλώνει περισσότερα δεδομένα.</string>
+    <!-- Setting option that can be selected to default media to be sent as high quality by default -->
     <string name="DataAndStorageSettingsFragment__high">Υψηλή</string>
+    <!-- Setting option that can be selected to default media to be sent as standard quality by default -->
     <string name="DataAndStorageSettingsFragment__standard">Κανονική</string>
     <string name="DataAndStorageSettingsFragment__calls">Κλήσεις</string>
 
     <!-- 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__use_custom_colors">Χρήση προσαρμοσένων χρωμάτων</string>
     <string name="ChatColorSelectionFragment__chat_color">Χρώμα συνομιλίας</string>
@@ -4834,6 +4929,7 @@
     <string name="AvatarPickerFragment__take_a_picture">Λήψη φωτογραφίας</string>
     <string name="AvatarPickerFragment__choose_a_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>
     <string name="AvatarPickerFragment__clear_avatar">Εκκαθάριση εικόνας προφίλ</string>
@@ -4894,7 +4990,7 @@
     <string name="MediaReviewFragment__add_a_message">Προσθήκη μηνύματος</string>
     <string name="MediaReviewFragment__add_a_reply">Προσθήκη απάντησης</string>
     <string name="MediaReviewFragment__send_to">Αποστολή σε</string>
-    <string name="MediaReviewFragment__view_once_message">Μήνυμα μιας μόνο προβολής</string>
+    <string name="MediaReviewFragment__view_once_message">Πολυμέσα μιας μόνο προβολής</string>
     <string name="MediaReviewFragment__one_or_more_items_were_too_large">Ένα ή περισσότερα αντικείμενα ήταν πολύ μεγάλα</string>
     <string name="MediaReviewFragment__one_or_more_items_were_invalid">Ένα ή περισσότερα αντικείμενα δεν ήταν έγκυρα</string>
     <string name="MediaReviewFragment__too_many_items_selected">Επιλέχθηκαν πάρα πολλά αντικείμενα</string>
@@ -5487,7 +5583,7 @@
     <string name="StoryViewerFragment__s_s">%1$s %2$s</string>
     <!-- Displayed when viewing a post you sent -->
     <string name="StoryViewerPageFragment__you">Εσύ</string>
-    <!-- Displayed when viewing a post displayed to a group -->
+    <!-- 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 -->
     <string name="StoryViewerPageFragment__reply">Απάντηση</string>
@@ -6704,5 +6800,26 @@
     <!-- Content description for opening the note editor -->
     <string name="ViewNoteSheet__edit_note">Επεξεργασία σημείωσης</string>
 
+    <!-- BackupProgressService -->
+    <!-- Notification title shown while backup restore job is running -->
+    <string name="BackupProgressService_title">Επαναφορά αντίγραφου ασφαλείας…</string>
+    <!-- Notification title shown while downloading backup restore data -->
+    <string name="BackupProgressService_title_downloading">Λήψη δεδομένων αντιγράφου ασφαλείας…</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>
+    <!-- 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 -->
+    <string name="BackupsTypeSettingsFragment__google_pay">Google Pay</string>
+    <!-- Displayed as the user\'s payment method as a label in a preference row -->
+    <string name="BackupsTypeSettingsFragment__bank_transfer">Bank transfer</string>
+    <!-- Displayed as the user\'s payment method as a label in a preference row -->
+    <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>
+
+
     <!-- 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 6c7110cc7c..0c3583b0be 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -1,6 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- smartling.instruction_comments_enabled = on -->
-<resources>
+<?xml version="1.0" encoding="UTF-8"?><!-- 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> -->
@@ -89,6 +87,16 @@
     <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. Por favor, ve a la aplicación «Ajustes», selecciona Molly 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">Molly 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 Molly 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">Molly necesita acceso a tu posición para adjuntar la información en tus chats. Por favor, ve a la aplicación «Ajustes», selecciona Molly en el menú «Aplicaciones y notificaciones» y en «Permisos» activa «Ubicación».</string>
+
+    <!-- Dialog title asking users for location permission -->
+    <string name="AttachmentManager_signal_allow_access_location">Allow access to your location</string>
+    <!-- Dialog description that will explain the steps needed to give location permission -->
+    <string name="AttachmentManager_signal_to_send_location">To send your location:</string>
+    <!-- Alert dialog description asking for location permission -->
+    <string name="AttachmentManager_signal_allow_signal_access_location">Allow Molly access to send your location.</string>
+    <!-- Toast text explaining Signal\'s need for location access -->
+    <string name="AttachmentManager_signal_needs_location_access">Molly needs location access to send your location.</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>
     <!-- Alert dialog description to send the recipient a request to activate payments -->
@@ -241,7 +249,7 @@
     <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>
@@ -386,8 +394,16 @@
     <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_cancel_request">Cancelar solicitud</string>
 
-    <string name="ConversationActivity_to_send_audio_messages_allow_signal_access_to_your_microphone">Para enviar notas de voz y hacer llamadas, permite a Molly acceder al micrófono.</string>
+    <!-- Dialog title asking users for microphone permission -->
+    <string name="ConversationActivity_allow_access_microphone">Allow access to your microphone</string>
+    <!-- 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>
+    <!-- Toast text explaining Signal\'s need for microphone access -->
+    <string name="ConversationActivity_signal_needs_microphone_access_voice_message">Molly needs microphone access to record a voice message.</string>
     <string name="ConversationActivity_signal_requires_the_microphone_permission_in_order_to_send_audio_messages">Molly necesita acceso al micrófono para enviar notas de voz. Por favor, ve a la aplicación «Ajustes», selecciona Molly en el menú «Aplicaciones y notificaciones» y en «Permisos» activa «Micrófono».</string>
+
     <string name="ConversationActivity_signal_needs_the_microphone_and_camera_permissions_in_order_to_call_s">Molly necesita acceso al micrófono y cámara para llamar a %1$s. Por favor, ve a la aplicación «Ajustes», selecciona Molly 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 Molly 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 tomar fotos o vídeos. Por favor, ve a la aplicación «Ajustes», selecciona Molly en el menú «Aplicaciones y notificaciones» y en «Permisos» activa «Cámara».</string>
@@ -411,10 +427,17 @@
     <string name="ConversationActivity_you_will_leave_this_group_and_it_will_be_deleted_from_all_of_your_devices">Abandonarás este grupo, que se eliminará de todos tus dispositivos.</string>
     <string name="ConversationActivity_delete">Eliminar</string>
     <string name="ConversationActivity_delete_and_leave">Eliminar y abandonar</string>
-    <string name="ConversationActivity__to_call_s_signal_needs_access_to_your_microphone">Molly necesita acceder a tu micrófono para llamar a %1$s.</string>
+
+    <!-- Dialog description that will explain the steps needed to give microphone permissions for a voice call -->
+    <string name="ConversationActivity__to_start_call">To start a 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">To start a call, allow Molly access to your microphone.</string>
+    <!-- Toast text explaining Signal\'s need for microphone access for a voice call -->
+    <string name="ConversationActivity_signal_needs_microphone_access_voice_call">Molly needs microphone access to start a call.</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>
@@ -613,6 +636,7 @@
     <string name="ConversationListFragment_unarchive">Desarchivar</string>
     <string name="ConversationListFragment_delete">Eliminar</string>
     <string name="ConversationListFragment_select_all">Seleccionarlos</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 seleccionado</item>
         <item quantity="other">%1$d seleccionados</item>
@@ -864,6 +888,7 @@
         <item quantity="one">Invitación enviada</item>
         <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>
 
@@ -1044,7 +1069,9 @@
 
     <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>
+    <!-- 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_upgrade_this_group">actualiza este grupo.</string>
@@ -1271,6 +1298,7 @@
         <item quantity="other">Eliminar</item>
     </plurals>
 
+    <!-- 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>
@@ -1335,17 +1363,13 @@
     <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>
-    <!-- Update message shown when placing an outgoing 1:1 voice/audio call and it\'s answered by the other party -->
+    <!-- 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 and it\'s answered by the other party -->
+    <!-- Update message shown when placing an outgoing 1:1 video call -->
     <string name="MessageRecord_outgoing_video_call">Videollamada realizada</string>
-    <!-- Update message shown when placing an outgoing 1:1 voice/audio call and it\'s not answered by the other party -->
-    <string name="MessageRecord_unanswered_voice_call">Llamada no atendida</string>
-    <!-- Update message shown when placing an outgoing 1:1 video call and it\'s not answered by the other party -->
-    <string name="MessageRecord_unanswered_video_call">Videollamada no atendida</string>
-    <!-- Update message shown when receiving an incoming 1:1 voice/audio call and it\'s answered -->
+    <!-- Update message shown when receiving an incoming 1:1 voice/audio call and it\'s answered or ringing -->
     <string name="MessageRecord_incoming_voice_call">Llamada entrante</string>
-    <!-- Update message shown when receiving an incoming 1:1 video call and answered -->
+    <!-- Update message shown when receiving an incoming 1:1 video call and answered or ringing -->
     <string name="MessageRecord_incoming_video_call">Videollamada entrante</string>
     <!-- Update message shown when receiving an incoming 1:1 voice/audio call and not answered -->
     <string name="MessageRecord_missed_voice_call">Llamada perdida</string>
@@ -1355,10 +1379,6 @@
     <string name="MessageRecord_missed_voice_call_notification_profile">Llamada de voz perdida mientras el perfil de notificación estaba activado</string>
     <!-- Update message shown when receiving an incoming video call and declined due to notification profile -->
     <string name="MessageRecord_missed_video_call_notification_profile">Videollamada perdida mientras el perfil de notificación estaba activado</string>
-    <!-- Update message shown when receiving an incoming 1:1 voice/audio call and explicitly declined -->
-    <string name="MessageRecord_you_declined_a_voice_call">Has rechazado una llamada</string>
-    <!-- Update message shown when receiving an incoming 1:1 video call and explicitly declined -->
-    <string name="MessageRecord_you_declined_a_video_call">Has rechazado una videollamada</string>
     <!-- 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 ha actualizado el grupo.</string>
@@ -1567,28 +1587,53 @@
     <string name="MessageRecord_can_accept_payments">%1$s ya puede aceptar Pagos</string>
 
     <!-- Group Calling update messages -->
-    <string name="MessageRecord_s_started_a_group_call_s">%1$s ha iniciado una llamada en grupo · %2$s</string>
-    <string name="MessageRecord_you_started_a_group_call_s">Has iniciado una llamada en grupo · %1$s</string>
-    <string name="MessageRecord_s_is_in_the_group_call_s">%1$s participa en la llamada · %2$s</string>
-    <string name="MessageRecord_you_are_in_the_group_call_s1">Participas en la llamada · %1$s</string>
-    <string name="MessageRecord_s_and_s_are_in_the_group_call_s1">%1$s y %2$s participan en la llamada · %3$s</string>
-    <string name="MessageRecord_group_call_s">Llamada en grupo · %1$s</string>
-
-    <string name="MessageRecord_s_started_a_group_call">%1$s ha(s) iniciado una llamada en grupo</string>
-    <string name="MessageRecord_you_started_a_group_call">Has iniciado una llamada en grupo</string>
-    <string name="MessageRecord_s_is_in_the_group_call">%1$s participa en la llamada en grupo</string>
-    <string name="MessageRecord_you_are_in_the_group_call">Participas en la llamada</string>
-    <string name="MessageRecord_s_and_s_are_in_the_group_call">%1$s y %2$s participan en la llamada</string>
-    <string name="MessageRecord_group_call">Llamada en grupo</string>
+    <!-- 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>
+    <!-- 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>
+    <!-- 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>
+    <!-- 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>
+    <!-- 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>
+    <!-- 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>
+    <!-- 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 -->
+    <string name="MessageRecord__the_video_call_has_ended_s">La videollamada ha finalizado · %1$s</string>
+    <!-- Chat log text for a group call that ended more than 5 minutes ago and was missed -->
+    <string name="MessageRecord__missed_video_call">Videollamada perdida</string>
+    <!-- Chat log text for a group call that ended more than 5 minutes ago and was missed with a placeholder for formatted time -->
+    <string name="MessageRecord__missed_video_call_s">Videollamada perdida · %1$s</string>
+    <!-- Chat log text for a group call that ended that the local user did not start -->
+    <string name="MessageRecord__incoming_video_call">Videollamada entrante</string>
+    <!-- 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>
+    <!-- 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>
+    <!-- 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>
+    <!-- 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>
+    <!-- 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>
+    <!-- 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_you">Tú</string>
 
-    <plurals name="MessageRecord_s_s_and_d_others_are_in_the_group_call_s">
+    <!-- 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>
     </plurals>
 
-    <plurals name="MessageRecord_s_s_and_d_others_are_in_the_group_call">
+    <!-- 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>
     </plurals>
@@ -2063,6 +2108,7 @@
     <!-- 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_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">Molly Android - Formato de número</string>
     <!--    Small "toast" notification to the user confirming that they have requested a new code via voice call.-->
@@ -2207,7 +2253,7 @@
     <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>
 
     <!-- SupportEmailUtil -->
-  <!-- Removed by excludeNonTranslatables <string name="SupportEmailUtil_support_email" translatable="false">support@molly.im</string> -->
+  <!-- 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_android_version">Versión de Android:</string>
@@ -2709,6 +2755,8 @@
     <string name="ConversationUpdateItem_loading">Cargando</string>
     <string name="ConversationUpdateItem_learn_more">Saber más</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_invite_friends">Invitar personas</string>
@@ -2773,6 +2821,7 @@
     <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__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>
 
     <!-- EnableCallNotificationSettingsDialog__call_notifications_checklist -->
@@ -3086,6 +3135,7 @@
 
     <string name="arrays__default">Por defecto</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 -->
@@ -3357,7 +3407,7 @@
     <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 Molly 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 Molly.</string>
@@ -3406,6 +3456,14 @@
     <!-- Storage permission row description -->
     <string name="GrantPermissionsFragment__send_photos_videos_and_files">Envía fotos, vídeos y archivos desde tu dispositivo.</string>
 
+    <!-- PermissionDeniedBottomSheet -->
+    <!-- Sheet describing step 1 on how to give permissions by opening settings -->
+    <string name="PermissionDeniedBottomSheet__1_tap_settings_below">1. Tap “Settings” below</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 Allow the permission</string>
+    <!-- Label for button at the bottom of the sheet which opens the system permission settings -->
+    <string name="PermissionDeniedBottomSheet__settings">Settings</string>
+
     <!-- PaymentsSecuritySetupFragment -->
     <!-- Toolbar title -->
     <string name="PaymentsSecuritySetupFragment__security_setup">Configuración de seguridad</string>
@@ -3446,6 +3504,7 @@
     <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>
+    <!-- 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>
@@ -3508,6 +3567,7 @@
     <string name="ConfirmPayment__confirm_payment">Confirmar pago</string>
     <string name="ConfirmPayment__network_fee">Tasa de la red</string>
     <string name="ConfirmPayment__estimated_s">Estimación en %1$s</string>
+    <!-- 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>
@@ -3658,6 +3718,14 @@
     <string name="conversation_group_options__conversation">Chat</string>
     <string name="conversation_group_options__broadcast">Transmisión</string>
 
+    <!-- DoubleTapEditEducationSheet -->
+    <!-- Displayed as the title of the education bottom sheet -->
+    <string name="DoubleTapEditEducationSheet__double_tap_edit_title">Double tap to edit</string>
+    <!-- Text on the sheet explaining how double tapping on a message will let them edit it -->
+    <string name="DoubleTapEditEducationSheet__quickly_tap_twice">Quickly tap twice on your messages to edit them. You can edit your messages up to 24hrs after they’ve been sent.</string>
+    <!-- Button label to dismiss sheet -->
+    <string name="DoubleTapEditEducationSheet__got_it">Got it</string>
+
     <!-- text_secure_normal -->
     <string name="text_secure_normal__menu_new_group">Nuevo grupo</string>
     <string name="text_secure_normal__menu_settings">Ajustes</string>
@@ -4112,6 +4180,7 @@
     <string name="RecipientBottomSheet_copied_to_clipboard">Copiado al portapapeles</string>
 
     <string name="GroupRecipientListItem_admin">Admin</string>
+    <!-- Button text to approve a user that has requested to join a group -->
     <string name="GroupRecipientListItem_approve_description">Aprobar</string>
     <string name="GroupRecipientListItem_deny_description">Denegar</string>
 
@@ -4139,6 +4208,7 @@
 
     <!-- VoiceNoteMediaDescriptionCompatFactory -->
     <string name="VoiceNoteMediaItemFactory__voice_message">Nota de voz · %1$s</string>
+    <!-- This is a title in a banner describing the conversation sender to receiver placeholders of the currently playing voice memo. -->
     <string name="VoiceNoteMediaItemFactory__s_to_s">%1$s de %2$s</string>
 
     <!-- StorageUtil -->
@@ -4152,8 +4222,16 @@
     <string name="ReviewCardDialogFragment__review_members">Revisar participantes</string>
     <!-- Title of a screen where the user will be prompted to review a message request matching the name of someone they already know -->
     <string name="ReviewCardDialogFragment__review_request">Revisar solicitud</string>
-    <string name="ReviewCardDialogFragment__d_group_members_have_the_same_name">%1$d participantes usan el mismo nombre, revisa la lista de participantes debajo y selecciona la opción correcta.</string>
-    <string name="ReviewCardDialogFragment__if_youre_not_sure">Si no sabes quién ha enviado esta solicitud, revisa la lista de personas debajo para tomar la decisión correcta.</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="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 -->
+    <plurals name="ReviewCardDialogFragment__if_youre_not_sure">
+        <item quantity="one">If you\'re not sure who the request is from, review the contact below and take action.</item>
+        <item quantity="other">If you\'re not sure who the request is from, review the contacts below and take action.</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>
     <plurals name="ReviewCardDialogFragment__d_other_groups_in_common">
@@ -4184,11 +4262,20 @@
     <string name="CallParticipantsListUpdatePopupWindow__s_joined">%1$s se ha unido</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_and_s_joined">%1$s y %2$s se han unido</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_s_and_s_joined">%1$s, %2$s y %3$s se han unido</string>
-    <string name="CallParticipantsListUpdatePopupWindow__s_s_and_d_others_joined">%1$s, %2$s y %3$d más se han unido</string>
+    <!-- Toast message shown in group call when 3 or more people join -->
+    <plurals name="CallParticipantsListUpdatePopupWindow__s_s_and_d_others_joined">
+        <item quantity="one">%1$s, %2$s and %3$d other joined</item>
+        <item quantity="other">%1$s, %2$s and %3$d others joined</item>
+    </plurals>
+    <!-- Toast/popup text shown when someone leaves a group call -->
     <string name="CallParticipantsListUpdatePopupWindow__s_left">%1$s se ha ido</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_and_s_left">%1$s y %2$s se han ido</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_s_and_s_left">%1$s, %2$s y %3$s se han ido</string>
-    <string name="CallParticipantsListUpdatePopupWindow__s_s_and_d_others_left">%1$s, %2$s y %3$d más se han ido</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 and %3$d other left</item>
+        <item quantity="other">%1$s, %2$s and %3$d others left</item>
+    </plurals>
 
     <string name="CallParticipant__you">Tú</string>
     <string name="CallParticipant__you_on_another_device">Tú (en otro dispositivo)</string>
@@ -4558,10 +4645,15 @@
 
     <!-- PrivacySettingsFragment -->
     <string name="PrivacySettingsFragment__blocked">Personas bloqueadas</string>
-    <string name="PrivacySettingsFragment__d_contacts">%1$d contactos</string>
+    <!-- Settings label that shows the number blocked contacts -->
+    <plurals name="PrivacySettingsFragment__d_contacts">
+        <item quantity="one">%1$d contact</item>
+        <item quantity="other">%1$d contacts</item>
+    </plurals>
     <string name="PrivacySettingsFragment__messaging">Mensajería</string>
     <string name="PrivacySettingsFragment__disappearing_messages">Desaparición de mensajes</string>
     <string name="PrivacySettingsFragment__app_security">Seguridad de la aplicación</string>
+    <!-- This refers to the multi-tasking overview (recent apps) from the Android operating system.-->
     <string name="PrivacySettingsFragment__block_screenshots_in_the_recents_list_and_inside_the_app">Bloquea capturas de pantalla en la lista de aplicaciones recientes y dentro de la aplicación</string>
     <string name="PrivacySettingsFragment__signal_message_and_calls">Los mensajes y llamadas de Signal siempre usan remitente confidencial y las llamadas se desvían</string>
     <string name="PrivacySettingsFragment__default_timer_for_new_changes">Tiempo de desaparición de mensajes por defecto en nuevos chats</string>
@@ -4618,11 +4710,14 @@
     <string name="DataAndStorageSettingsFragment__media_quality">Calidad de fotos y vídeos</string>
     <string name="DataAndStorageSettingsFragment__sent_media_quality">Calidad de envío de fotos y vídeos</string>
     <string name="DataAndStorageSettingsFragment__sending_high_quality_media_will_use_more_data">Se usarán más datos al seleccionar la opción de alta calidad.</string>
+    <!-- Setting option that can be selected to default media to be sent as high quality by default -->
     <string name="DataAndStorageSettingsFragment__high">Alta</string>
+    <!-- Setting option that can be selected to default media to be sent as standard quality by default -->
     <string name="DataAndStorageSettingsFragment__standard">Normal</string>
     <string name="DataAndStorageSettingsFragment__calls">Llamadas</string>
 
     <!-- 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__use_custom_colors">Usar colores personalizados</string>
     <string name="ChatColorSelectionFragment__chat_color">Color del chat</string>
@@ -4834,6 +4929,7 @@
     <string name="AvatarPickerFragment__take_a_picture">Toma una foto</string>
     <string name="AvatarPickerFragment__choose_a_photo">Selecciona una foto</string>
     <string name="AvatarPickerFragment__photo">Foto</string>
+    <!-- Button label during avatar selection/creation that when tapped lets you generate an avatar from typed in text. -->
     <string name="AvatarPickerFragment__text">Texto</string>
     <string name="AvatarPickerFragment__save">Guardar</string>
     <string name="AvatarPickerFragment__clear_avatar">Eliminar avatar</string>
@@ -4894,7 +4990,7 @@
     <string name="MediaReviewFragment__add_a_message">Añadir mensaje</string>
     <string name="MediaReviewFragment__add_a_reply">Añadir respuesta</string>
     <string name="MediaReviewFragment__send_to">Enviar a</string>
-    <string name="MediaReviewFragment__view_once_message">Mensaje para ver una vez</string>
+    <string name="MediaReviewFragment__view_once_message">Contenido para ver solo una vez</string>
     <string name="MediaReviewFragment__one_or_more_items_were_too_large">Uno o más elementos son demasiado grandes</string>
     <string name="MediaReviewFragment__one_or_more_items_were_invalid">Uno o más elementos no son válidos</string>
     <string name="MediaReviewFragment__too_many_items_selected">Demasiados elementos seleccionados</string>
@@ -5487,7 +5583,7 @@
     <string name="StoryViewerFragment__s_s">%1$s %2$s</string>
     <!-- Displayed when viewing a post you sent -->
     <string name="StoryViewerPageFragment__you">Tú</string>
-    <!-- Displayed when viewing a post displayed to a group -->
+    <!-- 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 -->
     <string name="StoryViewerPageFragment__reply">Responder</string>
@@ -6704,5 +6800,26 @@
     <!-- Content description for opening the note editor -->
     <string name="ViewNoteSheet__edit_note">Editar nota</string>
 
+    <!-- BackupProgressService -->
+    <!-- Notification title shown while backup restore job is running -->
+    <string name="BackupProgressService_title">Recuperando copia de seguridad…</string>
+    <!-- Notification title shown while downloading backup restore data -->
+    <string name="BackupProgressService_title_downloading">Descargando copia de seguridad…</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>
+    <!-- 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 -->
+    <string name="BackupsTypeSettingsFragment__google_pay">Google Pay</string>
+    <!-- Displayed as the user\'s payment method as a label in a preference row -->
+    <string name="BackupsTypeSettingsFragment__bank_transfer">Bank transfer</string>
+    <!-- Displayed as the user\'s payment method as a label in a preference row -->
+    <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>
+
+
     <!-- 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 cd13c118ff..d554b3bf36 100644
--- a/app/src/main/res/values-et/strings.xml
+++ b/app/src/main/res/values-et/strings.xml
@@ -1,6 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- smartling.instruction_comments_enabled = on -->
-<resources>
+<?xml version="1.0" encoding="UTF-8"?><!-- 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> -->
@@ -89,6 +87,16 @@
     <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">Allow access to your location</string>
+    <!-- Dialog description that will explain the steps needed to give location permission -->
+    <string name="AttachmentManager_signal_to_send_location">To send your location:</string>
+    <!-- Alert dialog description asking for location permission -->
+    <string name="AttachmentManager_signal_allow_signal_access_location">Allow Molly access to send your location.</string>
+    <!-- Toast text explaining Signal\'s need for location access -->
+    <string name="AttachmentManager_signal_needs_location_access">Molly needs location access to send your location.</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>
     <!-- Alert dialog description to send the recipient a request to activate payments -->
@@ -241,7 +249,7 @@
     <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>
@@ -386,8 +394,16 @@
     <string name="ConversationActivity_your_request_to_join_has_been_sent_to_the_group_admin">Sinu taotlus grupiga liitumiseks on grupi administraatoritele saadetud. Sulle antakse teada, kui nad vastavad.</string>
     <string name="ConversationActivity_cancel_request">Tühista taotlus</string>
 
-    <string name="ConversationActivity_to_send_audio_messages_allow_signal_access_to_your_microphone">Audiosõnumite saatmiseks luba Mollyile juurdepääs seadme mikrofonile.</string>
+    <!-- Dialog title asking users for microphone permission -->
+    <string name="ConversationActivity_allow_access_microphone">Allow access to your microphone</string>
+    <!-- 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>
+    <!-- Toast text explaining Signal\'s need for microphone access -->
+    <string name="ConversationActivity_signal_needs_microphone_access_voice_message">Molly needs microphone access to record a voice message.</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">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>
@@ -411,10 +427,17 @@
     <string name="ConversationActivity_you_will_leave_this_group_and_it_will_be_deleted_from_all_of_your_devices">Sa lahkud sellest grupist ja see kustutatakse kõigist sinu seadmetest.</string>
     <string name="ConversationActivity_delete">Kustuta</string>
     <string name="ConversationActivity_delete_and_leave">Kustuta ja lahku</string>
-    <string name="ConversationActivity__to_call_s_signal_needs_access_to_your_microphone">Molly vajab kasutajale %1$s helistamiseks juurdepääsu seadme mikrofonile</string>
+
+    <!-- Dialog description that will explain the steps needed to give microphone permissions for a voice call -->
+    <string name="ConversationActivity__to_start_call">To start a 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">To start a call, allow Molly access to your microphone.</string>
+    <!-- Toast text explaining Signal\'s need for microphone access for a voice call -->
+    <string name="ConversationActivity_signal_needs_microphone_access_voice_call">Molly needs microphone access to start a call.</string>
 
 
     <string name="ConversationActivity_join">Liitu</string>
+    <!-- Button text for an active group call but the call is currently full and unjoinable -->
     <string name="ConversationActivity_full">Täis</string>
 
     <string name="ConversationActivity_error_sending_media">Meedia saatmisel tekkis tõrge</string>
@@ -613,6 +636,7 @@
     <string name="ConversationListFragment_unarchive">Ennista</string>
     <string name="ConversationListFragment_delete">Kustuta</string>
     <string name="ConversationListFragment_select_all">Vali kõik</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 valitud</item>
         <item quantity="other">%1$d valitud</item>
@@ -864,6 +888,7 @@
         <item quantity="one">Kutse saadetud</item>
         <item quantity="other">%1$d kutset saadetud</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">“%1$s” ei saa sinu poolt automaatselt gruppi lisada.\n\nNad on kutsutud grupiga liituma ja ei näe grupi sõnumeid enne kui on liitumisega nõustunud.</string>
     <string name="GroupManagement_invite_multiple_users">Neid kasutajaid ei saa sinu poolt automaatselt gruppi lisada.\n\nNad on kutsutud grupiga liituma ja ei näe grupi sõnumeid enne kui on liitumisega nõustunud.</string>
 
@@ -1044,7 +1069,9 @@
 
     <string name="ManageGroupActivity_edit_name_and_picture">Muuda nime ja pilti</string>
     <string name="ManageGroupActivity_legacy_group">Vana grupp</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">See on vana grupp. Uued funktsioonid, nt grupi administraatorid on saadaval ainult uutes gruppides.</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">See on vana grupp. Uute funktsioonide, näiteks @mainimised ja administraatorid, kasutamiseks,</string>
     <string name="ManageGroupActivity_legacy_group_too_large">Seda vana gruppi ei saa uueks grupiks uuendada, sest see on liiga suur. Maksimaalne grupi suurus on %1$d.</string>
     <string name="ManageGroupActivity_upgrade_this_group">uuenda see grupp</string>
@@ -1271,6 +1298,7 @@
         <item quantity="other">Kustuta</item>
     </plurals>
 
+    <!-- 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 valis (%2$s)</item>
         <item quantity="other">%1$d valis (%2$s)</item>
@@ -1335,17 +1363,13 @@
     <string name="MessageRecord_left_group">Sa lahkusid grupist.</string>
     <string name="MessageRecord_you_updated_group">Sa uuendasid gruppi.</string>
     <string name="MessageRecord_the_group_was_updated">Grupp on uuendatud.</string>
-    <!-- Update message shown when placing an outgoing 1:1 voice/audio call and it\'s answered by the other party -->
+    <!-- Update message shown when placing an outgoing 1:1 voice/audio call -->
     <string name="MessageRecord_outgoing_voice_call">Väljuv häälkõne</string>
-    <!-- Update message shown when placing an outgoing 1:1 video call and it\'s answered by the other party -->
+    <!-- Update message shown when placing an outgoing 1:1 video call -->
     <string name="MessageRecord_outgoing_video_call">Väljuv videokõne</string>
-    <!-- Update message shown when placing an outgoing 1:1 voice/audio call and it\'s not answered by the other party -->
-    <string name="MessageRecord_unanswered_voice_call">Vastamata häälkõne</string>
-    <!-- Update message shown when placing an outgoing 1:1 video call and it\'s not answered by the other party -->
-    <string name="MessageRecord_unanswered_video_call">Vastamata videokõne</string>
-    <!-- Update message shown when receiving an incoming 1:1 voice/audio call and it\'s answered -->
+    <!-- Update message shown when receiving an incoming 1:1 voice/audio call and it\'s answered or ringing -->
     <string name="MessageRecord_incoming_voice_call">Sissetulev häälkõne</string>
-    <!-- Update message shown when receiving an incoming 1:1 video call and answered -->
+    <!-- Update message shown when receiving an incoming 1:1 video call and answered or ringing -->
     <string name="MessageRecord_incoming_video_call">Sissetulev videokõne</string>
     <!-- Update message shown when receiving an incoming 1:1 voice/audio call and not answered -->
     <string name="MessageRecord_missed_voice_call">Vastamata häälkõne</string>
@@ -1355,10 +1379,6 @@
     <string name="MessageRecord_missed_voice_call_notification_profile">Vastamata häälkõne teavituste profiili sisselülitatuse ajal</string>
     <!-- Update message shown when receiving an incoming video call and declined due to notification profile -->
     <string name="MessageRecord_missed_video_call_notification_profile">Vastamata videokõne teavituste profiili sisselülitatuse ajal</string>
-    <!-- Update message shown when receiving an incoming 1:1 voice/audio call and explicitly declined -->
-    <string name="MessageRecord_you_declined_a_voice_call">Sa keeldusid häälkõnest</string>
-    <!-- Update message shown when receiving an incoming 1:1 video call and explicitly declined -->
-    <string name="MessageRecord_you_declined_a_video_call">Sa keeldusid videokõnest</string>
     <!-- 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 uuendas gruppi.</string>
@@ -1567,28 +1587,53 @@
     <string name="MessageRecord_can_accept_payments">%1$s saab nüüd makseid vastu võtta</string>
 
     <!-- Group Calling update messages -->
-    <string name="MessageRecord_s_started_a_group_call_s">%1$s alustas grupikõne · %2$s</string>
-    <string name="MessageRecord_you_started_a_group_call_s">Alustasid grupikõne · %1$s</string>
-    <string name="MessageRecord_s_is_in_the_group_call_s">%1$s on selles grupikõnes · %2$s</string>
-    <string name="MessageRecord_you_are_in_the_group_call_s1">Sa oled grupikõnes · %1$s</string>
-    <string name="MessageRecord_s_and_s_are_in_the_group_call_s1">%1$s ja %2$s on grupikõnes · %3$s</string>
-    <string name="MessageRecord_group_call_s">Grupikõne · %1$s</string>
-
-    <string name="MessageRecord_s_started_a_group_call">%1$s alustas grupikõne</string>
-    <string name="MessageRecord_you_started_a_group_call">Sa alustasid grupikõne</string>
-    <string name="MessageRecord_s_is_in_the_group_call">%1$s on grupikõnes</string>
-    <string name="MessageRecord_you_are_in_the_group_call">Sa oled grupikõnes</string>
-    <string name="MessageRecord_s_and_s_are_in_the_group_call">%1$s ja %2$s on grupikõnes</string>
-    <string name="MessageRecord_group_call">Grupikõne</string>
+    <!-- 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 on kõnes · %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">Sa oled kõnes · %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 ja %2$s on kõnes · %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 on kõnes</string>
+    <!-- Chat log text for an ongoing group call only the local user has joined -->
+    <string name="MessageRecord_you_are_in_the_call">Sa oled kõnes</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 ja %2$s on kõnes</string>
+    <!-- Chat log text for a group call that ended within the last 5 minutes -->
+    <string name="MessageRecord__the_video_call_has_ended">Videokõne on lõppenud</string>
+    <!-- Chat log text for a group call that ended within the last 5 minutes with a placeholder for formatted time -->
+    <string name="MessageRecord__the_video_call_has_ended_s">Videokõne on lõppenud · %1$s</string>
+    <!-- Chat log text for a group call that ended more than 5 minutes ago and was missed -->
+    <string name="MessageRecord__missed_video_call">Vastamata videokõne</string>
+    <!-- Chat log text for a group call that ended more than 5 minutes ago and was missed with a placeholder for formatted time -->
+    <string name="MessageRecord__missed_video_call_s">Vastamata videokõne · %1$s</string>
+    <!-- Chat log text for a group call that ended that the local user did not start -->
+    <string name="MessageRecord__incoming_video_call">Sissetulev videokõne</string>
+    <!-- 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">Sissetulev videokõne · %1$s</string>
+    <!-- Chat log text for a group call that ended that the local user started -->
+    <string name="MessageRecord__outgoing_video_call">Väljuv videokõne</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">Väljuv videokõne · %1$s</string>
+    <!-- Chat log text for an ongoing group call that the local user started -->
+    <string name="MessageRecord__you_started_a_video_call">Sa alustasid videokõnet</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">Sa alustasid videokõnet · %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 alustas videokõnet</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 alustas videokõnet · %2$s</string>
 
     <string name="MessageRecord_you">Sina</string>
 
-    <plurals name="MessageRecord_s_s_and_d_others_are_in_the_group_call_s">
+    <!-- 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 ja %3$d teine on grupikõnes · %4$s</item>
         <item quantity="other">%1$s, %2$s ja %3$d teist on grupikõnes · %4$s</item>
     </plurals>
 
-    <plurals name="MessageRecord_s_s_and_d_others_are_in_the_group_call">
+    <!-- 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 ja %3$d teine on grupikõnes</item>
         <item quantity="other">%1$s, %2$s ja %3$d teist on grupikõnes</item>
     </plurals>
@@ -2063,6 +2108,7 @@
     <!-- Generic error when the app is unable to request an SMS code for an unknown reason. -->
     <string name="RegistrationActivity_unable_to_request_verification_code">Kinnituskoodi küsimine nurjus. Palun kontrolli oma võrguühendust ja proovi uuesti.</string>
     <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">Molly Android - telefoninumbri formaat</string>
     <!--    Small "toast" notification to the user confirming that they have requested a new code via voice call.-->
@@ -2207,7 +2253,7 @@
     <string name="SubmitDebugLogActivity_this_log_will_be_posted_publicly_online_for_contributors">See logi postitatakse internetti avalikult, et kaaspanustajad saaksid seda näha. Võid selle enne üleslaadimist üle vaadata.</string>
 
     <!-- SupportEmailUtil -->
-  <!-- Removed by excludeNonTranslatables <string name="SupportEmailUtil_support_email" translatable="false">support@molly.im</string> -->
+  <!-- Removed by excludeNonTranslatables <string name="SupportEmailUtil_support_email" translatable="false">support@signal.org</string> -->
     <string name="SupportEmailUtil_filter">Filter:</string>
     <string name="SupportEmailUtil_device_info">Seadme info:</string>
     <string name="SupportEmailUtil_android_version">Androidi versioon:</string>
@@ -2709,6 +2755,8 @@
     <string name="ConversationUpdateItem_loading">Laadimine</string>
     <string name="ConversationUpdateItem_learn_more">Rohkem infot</string>
     <string name="ConversationUpdateItem_join_call">Liitu kõnega</string>
+    <!-- Action button label for starting a new call in the current conversation -->
+    <string name="ConversationUpdateItem_call_back">Helista tagasi</string>
     <string name="ConversationUpdateItem_return_to_call">Pöördu kõnesse tagasi</string>
     <string name="ConversationUpdateItem_call_is_full">Kõne on täis</string>
     <string name="ConversationUpdateItem_invite_friends">Kutsu sõpru</string>
@@ -2773,6 +2821,7 @@
     <string name="safety_number_change_dialog__leave_call">Lahku kõnest</string>
     <string name="safety_number_change_dialog__the_following_people_may_have_reinstalled_or_changed_devices">Need inimised on võibolla rakenduse reinstallinud või seadet vahetanud. Privaatsuse kindlustamiseks kontrolli nendega turvanumbrit.</string>
     <string name="safety_number_change_dialog__view">Näita</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">Eelnevalt kinnitatud</string>
 
     <!-- EnableCallNotificationSettingsDialog__call_notifications_checklist -->
@@ -3086,6 +3135,7 @@
 
     <string name="arrays__default">Vaikimisi</string>
     <string name="arrays__high">Kõrge</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">Maksimaalne</string>
 
     <!-- plurals.xml -->
@@ -3357,7 +3407,7 @@
     <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 Mollyis saadaval. Sul on võimalik kanda vahendid valuutavahetusse, aga sul pole enam võimalik saata või saada makseid ega lisada vahendeid.</string>
@@ -3406,6 +3456,14 @@
     <!-- Storage permission row description -->
     <string name="GrantPermissionsFragment__send_photos_videos_and_files">Saada oma seadmest fotosid, videoid ja faile.</string>
 
+    <!-- PermissionDeniedBottomSheet -->
+    <!-- Sheet describing step 1 on how to give permissions by opening settings -->
+    <string name="PermissionDeniedBottomSheet__1_tap_settings_below">1. Tap “Settings” below</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 Allow the permission</string>
+    <!-- Label for button at the bottom of the sheet which opens the system permission settings -->
+    <string name="PermissionDeniedBottomSheet__settings">Settings</string>
+
     <!-- PaymentsSecuritySetupFragment -->
     <!-- Toolbar title -->
     <string name="PaymentsSecuritySetupFragment__security_setup">Turvasätted</string>
@@ -3446,6 +3504,7 @@
     <string name="PaymentsDetailsFragment__sent_to_s">Saadetud kasutajale %1$s</string>
     <string name="PaymentsDetailsFragment__you_on_s_at_s">Sina vestluses %1$s ajal %2$s</string>
     <string name="PaymentsDetailsFragment__s_on_s_at_s">%1$s vestluses %2$s ajal %3$s</string>
+    <!-- Prefix to a name to indicate who a payment was sent to -->
     <string name="PaymentsDetailsFragment__to">Saaja</string>
     <string name="PaymentsDetailsFragment__from">Saatja</string>
     <string name="PaymentsDetailsFragment__information">Tehingu andmed, sh maksesumma ja tehingu aeg on osa MobileCoini arvestusraamatust.</string>
@@ -3508,6 +3567,7 @@
     <string name="ConfirmPayment__confirm_payment">Kinnita makse</string>
     <string name="ConfirmPayment__network_fee">Võrgutasu</string>
     <string name="ConfirmPayment__estimated_s">Hinnanguline %1$s</string>
+    <!-- Prefix to a name to indicate who a payment will be sent to -->
     <string name="ConfirmPayment__to">Saaja</string>
     <string name="ConfirmPayment__total_amount">Kogusumma</string>
     <string name="ConfirmPayment__balance_s">Saldo: %1$s</string>
@@ -3658,6 +3718,14 @@
     <string name="conversation_group_options__conversation">Vestlus</string>
     <string name="conversation_group_options__broadcast">Kanna üle</string>
 
+    <!-- DoubleTapEditEducationSheet -->
+    <!-- Displayed as the title of the education bottom sheet -->
+    <string name="DoubleTapEditEducationSheet__double_tap_edit_title">Double tap to edit</string>
+    <!-- Text on the sheet explaining how double tapping on a message will let them edit it -->
+    <string name="DoubleTapEditEducationSheet__quickly_tap_twice">Quickly tap twice on your messages to edit them. You can edit your messages up to 24hrs after they’ve been sent.</string>
+    <!-- Button label to dismiss sheet -->
+    <string name="DoubleTapEditEducationSheet__got_it">Got it</string>
+
     <!-- text_secure_normal -->
     <string name="text_secure_normal__menu_new_group">Uus grupp</string>
     <string name="text_secure_normal__menu_settings">Seaded</string>
@@ -4112,6 +4180,7 @@
     <string name="RecipientBottomSheet_copied_to_clipboard">Lõikelauale kopeeritud</string>
 
     <string name="GroupRecipientListItem_admin">Administraator</string>
+    <!-- Button text to approve a user that has requested to join a group -->
     <string name="GroupRecipientListItem_approve_description">Nõustu</string>
     <string name="GroupRecipientListItem_deny_description">Keeldu</string>
 
@@ -4139,6 +4208,7 @@
 
     <!-- VoiceNoteMediaDescriptionCompatFactory -->
     <string name="VoiceNoteMediaItemFactory__voice_message">Häälsõnum · %1$s</string>
+    <!-- This is a title in a banner describing the conversation sender to receiver placeholders of the currently playing voice memo. -->
     <string name="VoiceNoteMediaItemFactory__s_to_s">%1$s saajale %2$s</string>
 
     <!-- StorageUtil -->
@@ -4152,8 +4222,16 @@
     <string name="ReviewCardDialogFragment__review_members">Vaata liikmed üle</string>
     <!-- Title of a screen where the user will be prompted to review a message request matching the name of someone they already know -->
     <string name="ReviewCardDialogFragment__review_request">Vaata taotlus üle</string>
-    <string name="ReviewCardDialogFragment__d_group_members_have_the_same_name">%1$d grupi liiget on sama nimega, kontrolli allpool liikmeid ja vali, mida teha.</string>
-    <string name="ReviewCardDialogFragment__if_youre_not_sure">Kui sa pole kindel, kellelt soov on, siis vaata kontaktid allpool üle ja vali tegevus.</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="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 -->
+    <plurals name="ReviewCardDialogFragment__if_youre_not_sure">
+        <item quantity="one">If you\'re not sure who the request is from, review the contact below and take action.</item>
+        <item quantity="other">If you\'re not sure who the request is from, review the contacts below and take action.</item>
+    </plurals>
     <string name="ReviewCardDialogFragment__no_other_groups_in_common">Muid ühised gruppe pole.</string>
     <string name="ReviewCardDialogFragment__no_groups_in_common">Ühised grupid puuduvad</string>
     <plurals name="ReviewCardDialogFragment__d_other_groups_in_common">
@@ -4184,11 +4262,20 @@
     <string name="CallParticipantsListUpdatePopupWindow__s_joined">%1$s liitus</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_and_s_joined">%1$s ja %2$s liitusid</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_s_and_s_joined">%1$s, %2$s ja %3$s liitusid</string>
-    <string name="CallParticipantsListUpdatePopupWindow__s_s_and_d_others_joined">%1$s, %2$s ja %3$d muud liitusid</string>
+    <!-- Toast message shown in group call when 3 or more people join -->
+    <plurals name="CallParticipantsListUpdatePopupWindow__s_s_and_d_others_joined">
+        <item quantity="one">%1$s, %2$s and %3$d other joined</item>
+        <item quantity="other">%1$s, %2$s and %3$d others joined</item>
+    </plurals>
+    <!-- Toast/popup text shown when someone leaves a group call -->
     <string name="CallParticipantsListUpdatePopupWindow__s_left">%1$s lahkus</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_and_s_left">%1$s ja %2$s lahkusid</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_s_and_s_left">%1$s, %2$s ja %3$s lahkusid</string>
-    <string name="CallParticipantsListUpdatePopupWindow__s_s_and_d_others_left">%1$s, %2$s ja %3$d teist lahkusid</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 and %3$d other left</item>
+        <item quantity="other">%1$s, %2$s and %3$d others left</item>
+    </plurals>
 
     <string name="CallParticipant__you">Sina</string>
     <string name="CallParticipant__you_on_another_device">Sina (teisest seadmest)</string>
@@ -4558,10 +4645,15 @@
 
     <!-- PrivacySettingsFragment -->
     <string name="PrivacySettingsFragment__blocked">Blokeeritud</string>
-    <string name="PrivacySettingsFragment__d_contacts">%1$d kontakti</string>
+    <!-- Settings label that shows the number blocked contacts -->
+    <plurals name="PrivacySettingsFragment__d_contacts">
+        <item quantity="one">%1$d contact</item>
+        <item quantity="other">%1$d contacts</item>
+    </plurals>
     <string name="PrivacySettingsFragment__messaging">Sõnumside</string>
     <string name="PrivacySettingsFragment__disappearing_messages">Kaduvad sõnumid</string>
     <string name="PrivacySettingsFragment__app_security">Rakenduse turvalisus</string>
+    <!-- This refers to the multi-tasking overview (recent apps) from the Android operating system.-->
     <string name="PrivacySettingsFragment__block_screenshots_in_the_recents_list_and_inside_the_app">Blokeeri kuvatõmmised hiljutiste fotode nimekirjas ja rakenduse sees</string>
     <string name="PrivacySettingsFragment__signal_message_and_calls">Signali sõnumid ja kõned, alati kõnede suunamine ja turvatud saatja</string>
     <string name="PrivacySettingsFragment__default_timer_for_new_changes">Uute gruppide sõnumite vaikimisi kestus</string>
@@ -4618,11 +4710,14 @@
     <string name="DataAndStorageSettingsFragment__media_quality">Meedia kvaliteet</string>
     <string name="DataAndStorageSettingsFragment__sent_media_quality">Saadetud meedia kvaliteet</string>
     <string name="DataAndStorageSettingsFragment__sending_high_quality_media_will_use_more_data">Kõrge kvaliteediga meedia saatmine kasutab rohkem andmesidet.</string>
+    <!-- Setting option that can be selected to default media to be sent as high quality by default -->
     <string name="DataAndStorageSettingsFragment__high">Kõrge</string>
+    <!-- Setting option that can be selected to default media to be sent as standard quality by default -->
     <string name="DataAndStorageSettingsFragment__standard">Standardne</string>
     <string name="DataAndStorageSettingsFragment__calls">Kõned</string>
 
     <!-- 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__use_custom_colors">Kasuta kohandatud värve</string>
     <string name="ChatColorSelectionFragment__chat_color">Vestluse värv</string>
@@ -4834,6 +4929,7 @@
     <string name="AvatarPickerFragment__take_a_picture">Tee foto</string>
     <string name="AvatarPickerFragment__choose_a_photo">Vali foto</string>
     <string name="AvatarPickerFragment__photo">Foto</string>
+    <!-- Button label during avatar selection/creation that when tapped lets you generate an avatar from typed in text. -->
     <string name="AvatarPickerFragment__text">Tekst</string>
     <string name="AvatarPickerFragment__save">Salvesta</string>
     <string name="AvatarPickerFragment__clear_avatar">Eemalda profiilipilt</string>
@@ -4894,7 +4990,7 @@
     <string name="MediaReviewFragment__add_a_message">Lisa sõnum</string>
     <string name="MediaReviewFragment__add_a_reply">Lisa vastus</string>
     <string name="MediaReviewFragment__send_to">Vali saaja</string>
-    <string name="MediaReviewFragment__view_once_message">Ühekordne sõnum</string>
+    <string name="MediaReviewFragment__view_once_message">Ühekordselt vaadatav meediasisu</string>
     <string name="MediaReviewFragment__one_or_more_items_were_too_large">Üks või mitu üksust olid liiga suured</string>
     <string name="MediaReviewFragment__one_or_more_items_were_invalid">Üks või mitu üksust olid kehtetud</string>
     <string name="MediaReviewFragment__too_many_items_selected">Liiga palju elemente valitud</string>
@@ -5487,7 +5583,7 @@
     <string name="StoryViewerFragment__s_s">%1$s %2$s</string>
     <!-- Displayed when viewing a post you sent -->
     <string name="StoryViewerPageFragment__you">Sina</string>
-    <!-- Displayed when viewing a post displayed to a group -->
+    <!-- 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 saajale %2$s</string>
     <!-- Displayed when viewing a post from another user with no replies -->
     <string name="StoryViewerPageFragment__reply">Vasta</string>
@@ -6704,5 +6800,26 @@
     <!-- Content description for opening the note editor -->
     <string name="ViewNoteSheet__edit_note">Muuda märkust</string>
 
+    <!-- BackupProgressService -->
+    <!-- Notification title shown while backup restore job is running -->
+    <string name="BackupProgressService_title">Varukoopia taastamine …</string>
+    <!-- Notification title shown while downloading backup restore data -->
+    <string name="BackupProgressService_title_downloading">Varukoopia andmete allalaadimine …</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>
+    <!-- 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 -->
+    <string name="BackupsTypeSettingsFragment__google_pay">Google Pay</string>
+    <!-- Displayed as the user\'s payment method as a label in a preference row -->
+    <string name="BackupsTypeSettingsFragment__bank_transfer">Bank transfer</string>
+    <!-- Displayed as the user\'s payment method as a label in a preference row -->
+    <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>
+
+
     <!-- 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 df3e09be2f..cd4491f474 100644
--- a/app/src/main/res/values-eu/strings.xml
+++ b/app/src/main/res/values-eu/strings.xml
@@ -1,6 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- smartling.instruction_comments_enabled = on -->
-<resources>
+<?xml version="1.0" encoding="UTF-8"?><!-- 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> -->
@@ -89,6 +87,16 @@
     <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">Allow access to your location</string>
+    <!-- Dialog description that will explain the steps needed to give location permission -->
+    <string name="AttachmentManager_signal_to_send_location">To send your location:</string>
+    <!-- Alert dialog description asking for location permission -->
+    <string name="AttachmentManager_signal_allow_signal_access_location">Allow Molly access to send your location.</string>
+    <!-- Toast text explaining Signal\'s need for location access -->
+    <string name="AttachmentManager_signal_needs_location_access">Molly needs location access to send your location.</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>
     <!-- Alert dialog description to send the recipient a request to activate payments -->
@@ -241,7 +249,7 @@
     <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>
@@ -386,8 +394,16 @@
     <string name="ConversationActivity_your_request_to_join_has_been_sent_to_the_group_admin">Taldean sartzeko zure eskaera taldeko administratzaileari bidali zaio. Jakinaraziko zaizu erabaki bat hartzen duenean.</string>
     <string name="ConversationActivity_cancel_request">Bertan behera utzi eskaera</string>
 
-    <string name="ConversationActivity_to_send_audio_messages_allow_signal_access_to_your_microphone">Audio mezuak bidaltzeko, zure mikrofonoa erabiltzeko baimena eman Molly-i.</string>
+    <!-- Dialog title asking users for microphone permission -->
+    <string name="ConversationActivity_allow_access_microphone">Allow access to your microphone</string>
+    <!-- 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>
+    <!-- Toast text explaining Signal\'s need for microphone access -->
+    <string name="ConversationActivity_signal_needs_microphone_access_voice_message">Molly needs microphone access to record a voice message.</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">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>
@@ -411,10 +427,17 @@
     <string name="ConversationActivity_you_will_leave_this_group_and_it_will_be_deleted_from_all_of_your_devices">Talde honetatik irtengo zara, eta gailu guztietatik ezabatuko da.</string>
     <string name="ConversationActivity_delete">Ezabatu</string>
     <string name="ConversationActivity_delete_and_leave">Ezabatu eta irten</string>
-    <string name="ConversationActivity__to_call_s_signal_needs_access_to_your_microphone">%1$s erabiltzaileari deitzeko, Mollyek zure mikrofonoa erabiltzeko baimena behar du</string>
+
+    <!-- Dialog description that will explain the steps needed to give microphone permissions for a voice call -->
+    <string name="ConversationActivity__to_start_call">To start a 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">To start a call, allow Molly access to your microphone.</string>
+    <!-- Toast text explaining Signal\'s need for microphone access for a voice call -->
+    <string name="ConversationActivity_signal_needs_microphone_access_voice_call">Molly needs microphone access to start a call.</string>
 
 
     <string name="ConversationActivity_join">Batu</string>
+    <!-- Button text for an active group call but the call is currently full and unjoinable -->
     <string name="ConversationActivity_full">Beteta</string>
 
     <string name="ConversationActivity_error_sending_media">Errorea multimedia bidaltzean</string>
@@ -613,6 +636,7 @@
     <string name="ConversationListFragment_unarchive">Desartxibatu</string>
     <string name="ConversationListFragment_delete">Ezabatu</string>
     <string name="ConversationListFragment_select_all">Hautatu dena</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 hautatua</item>
         <item quantity="other">%1$d hautatua</item>
@@ -864,6 +888,7 @@
         <item quantity="one">Bidali da gonbidapena</item>
         <item quantity="other">%1$d gonbidapen bidali dira</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">\"%1$s\" erabiltzailea ezin duzu talde honetara modu automatikoan gehitu.\n\nGehitzeko gonbidapena bidali zaie eta ezingo dute talde mezurik ikusi gonbidapena onartu arte.</string>
     <string name="GroupManagement_invite_multiple_users">Ezin duzu modu automatikoan erabiltzaile hauek taldera gehitu. Gehitzeko gonbidapena bidali zaie eta ezingo dute talde mezurik ikusi onartu arte.</string>
 
@@ -1044,7 +1069,9 @@
 
     <string name="ManageGroupActivity_edit_name_and_picture">Editatu izena eta irudia</string>
     <string name="ManageGroupActivity_legacy_group">Jarauntsitako Taldea</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">Hau Jarauntsitako Talde bat da. Talde administratzaile moduko ezaugarriak Talde Berrietan erabil daitezke bakarrik.</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">Hau Jarauntsitako Talde bat da. Talde administratzaile eta @aipamenak moduko ezaugarriak erabili ahal izateko,</string>
     <string name="ManageGroupActivity_legacy_group_too_large">Jarauntsitako Talde Hau ezin da Talde Berrira eguneratu oso handia delako. Gehienezko talde tamaina %1$d da.</string>
     <string name="ManageGroupActivity_upgrade_this_group">eguneratu talde hau.</string>
@@ -1271,6 +1298,7 @@
         <item quantity="other">Ezabatu</item>
     </plurals>
 
+    <!-- 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$dek hautatua (%2$s)</item>
         <item quantity="other">%1$d(e)k hautatua (%2$s)</item>
@@ -1335,17 +1363,13 @@
     <string name="MessageRecord_left_group">Taldea utzi duzu.</string>
     <string name="MessageRecord_you_updated_group">Taldea eguneratu duzu</string>
     <string name="MessageRecord_the_group_was_updated">Taldea eguneratu egin da.</string>
-    <!-- Update message shown when placing an outgoing 1:1 voice/audio call and it\'s answered by the other party -->
+    <!-- Update message shown when placing an outgoing 1:1 voice/audio call -->
     <string name="MessageRecord_outgoing_voice_call">Irteerako ahots-deia</string>
-    <!-- Update message shown when placing an outgoing 1:1 video call and it\'s answered by the other party -->
+    <!-- Update message shown when placing an outgoing 1:1 video call -->
     <string name="MessageRecord_outgoing_video_call">Irteerako bideodeia</string>
-    <!-- Update message shown when placing an outgoing 1:1 voice/audio call and it\'s not answered by the other party -->
-    <string name="MessageRecord_unanswered_voice_call">Erantzun gabeko ahots-deia</string>
-    <!-- Update message shown when placing an outgoing 1:1 video call and it\'s not answered by the other party -->
-    <string name="MessageRecord_unanswered_video_call">Erantzun gabeko bideodeia</string>
-    <!-- Update message shown when receiving an incoming 1:1 voice/audio call and it\'s answered -->
+    <!-- Update message shown when receiving an incoming 1:1 voice/audio call and it\'s answered or ringing -->
     <string name="MessageRecord_incoming_voice_call">Sarrerako ahots-deia</string>
-    <!-- Update message shown when receiving an incoming 1:1 video call and answered -->
+    <!-- Update message shown when receiving an incoming 1:1 video call and answered or ringing -->
     <string name="MessageRecord_incoming_video_call">Sarrerako bideodeia</string>
     <!-- Update message shown when receiving an incoming 1:1 voice/audio call and not answered -->
     <string name="MessageRecord_missed_voice_call">Ahots-dei galdua</string>
@@ -1355,10 +1379,6 @@
     <string name="MessageRecord_missed_voice_call_notification_profile">Ahots-dei bat baztertu da, jakinarazpen-profila aktibatuta dagoelako</string>
     <!-- Update message shown when receiving an incoming video call and declined due to notification profile -->
     <string name="MessageRecord_missed_video_call_notification_profile">Bideodei bat baztertu da, jakinarazpen-profila aktibatuta dagoelako</string>
-    <!-- Update message shown when receiving an incoming 1:1 voice/audio call and explicitly declined -->
-    <string name="MessageRecord_you_declined_a_voice_call">Ahots-dei bat baztertu duzu</string>
-    <!-- Update message shown when receiving an incoming 1:1 video call and explicitly declined -->
-    <string name="MessageRecord_you_declined_a_video_call">Bideodei bati uko egin diozu</string>
     <!-- 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 erabiltzaileak taldea eguneratu du.</string>
@@ -1567,28 +1587,53 @@
     <string name="MessageRecord_can_accept_payments">%1$s(e)k orain ordainketak onar ditzake</string>
 
     <!-- Group Calling update messages -->
-    <string name="MessageRecord_s_started_a_group_call_s">%1$s erabiltzaileak talde-deia hasi du %2$s</string>
-    <string name="MessageRecord_you_started_a_group_call_s">Taldeko dei bat hasi duzu · %1$s</string>
-    <string name="MessageRecord_s_is_in_the_group_call_s">%1$s erabiltzailea talde-deian dago %2$s</string>
-    <string name="MessageRecord_you_are_in_the_group_call_s1">Talde-deian zaude %1$s</string>
-    <string name="MessageRecord_s_and_s_are_in_the_group_call_s1">%1$s eta %2$s talde-deian daude %3$s</string>
-    <string name="MessageRecord_group_call_s">Talde-deia %1$s</string>
-
-    <string name="MessageRecord_s_started_a_group_call">%1$s erabiltzaileak talde-deia hasi du</string>
-    <string name="MessageRecord_you_started_a_group_call">Talde-deia hasi duzu</string>
-    <string name="MessageRecord_s_is_in_the_group_call">%1$s talde-deian dago</string>
-    <string name="MessageRecord_you_are_in_the_group_call">Talde-deian zaude</string>
-    <string name="MessageRecord_s_and_s_are_in_the_group_call">%1$s eta %2$s talde-deian daude</string>
-    <string name="MessageRecord_group_call">Talde-deia</string>
+    <!-- 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 deian dago · %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">Deian zaude · %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 eta %2$s deian daude · %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 deian dago</string>
+    <!-- Chat log text for an ongoing group call only the local user has joined -->
+    <string name="MessageRecord_you_are_in_the_call">Deian zaude</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 eta %2$s deian daude</string>
+    <!-- Chat log text for a group call that ended within the last 5 minutes -->
+    <string name="MessageRecord__the_video_call_has_ended">Bideodeia amaitu da</string>
+    <!-- Chat log text for a group call that ended within the last 5 minutes with a placeholder for formatted time -->
+    <string name="MessageRecord__the_video_call_has_ended_s">Bideodeia amaitu da · %1$s</string>
+    <!-- Chat log text for a group call that ended more than 5 minutes ago and was missed -->
+    <string name="MessageRecord__missed_video_call">Bideodei galdua</string>
+    <!-- Chat log text for a group call that ended more than 5 minutes ago and was missed with a placeholder for formatted time -->
+    <string name="MessageRecord__missed_video_call_s">Bideodei galdua · %1$s</string>
+    <!-- Chat log text for a group call that ended that the local user did not start -->
+    <string name="MessageRecord__incoming_video_call">Sarrerako bideodeia</string>
+    <!-- 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">Sarrerako bideodeia · %1$s</string>
+    <!-- Chat log text for a group call that ended that the local user started -->
+    <string name="MessageRecord__outgoing_video_call">Irteerako bideodeia</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">Irteerako bideodeia · %1$s</string>
+    <!-- Chat log text for an ongoing group call that the local user started -->
+    <string name="MessageRecord__you_started_a_video_call">Bideodeia hasi duzu</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">Bideodeia hasi duzu · %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 erabiltzaileak bideodeia hasi du</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 erabiltzaileak bideodeia hasi du · %2$s</string>
 
     <string name="MessageRecord_you">Zu</string>
 
-    <plurals name="MessageRecord_s_s_and_d_others_are_in_the_group_call_s">
+    <!-- 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 eta beste %3$d talde deian daude %4$s</item>
         <item quantity="other">%1$s, %2$s eta beste %3$d talde-deian daude %4$s</item>
     </plurals>
 
-    <plurals name="MessageRecord_s_s_and_d_others_are_in_the_group_call">
+    <!-- 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 eta beste %3$d talde-deian daude</item>
         <item quantity="other">%1$s, %2$s eta beste %3$d talde-deian daude</item>
     </plurals>
@@ -2063,6 +2108,7 @@
     <!-- Generic error when the app is unable to request an SMS code for an unknown reason. -->
     <string name="RegistrationActivity_unable_to_request_verification_code">Ezin da egiaztapen-koderik eskatu. Egiaztatu sarera konektatuta zaudela eta saiatu berriro.</string>
     <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">Molly Android - Telefono-zenbakien formatua</string>
     <!--    Small "toast" notification to the user confirming that they have requested a new code via voice call.-->
@@ -2207,7 +2253,7 @@
     <string name="SubmitDebugLogActivity_this_log_will_be_posted_publicly_online_for_contributors">Erregistro hau publikoki argitaratuko da, laguntzaileek ikus dezaten. Kargatu aurretik azter dezakezu.</string>
 
     <!-- SupportEmailUtil -->
-  <!-- Removed by excludeNonTranslatables <string name="SupportEmailUtil_support_email" translatable="false">support@molly.im</string> -->
+  <!-- Removed by excludeNonTranslatables <string name="SupportEmailUtil_support_email" translatable="false">support@signal.org</string> -->
     <string name="SupportEmailUtil_filter">Filtroa:</string>
     <string name="SupportEmailUtil_device_info">Gailuari buruzko informazioa:</string>
     <string name="SupportEmailUtil_android_version">Android bertsioa:</string>
@@ -2709,6 +2755,8 @@
     <string name="ConversationUpdateItem_loading">Kargatzen</string>
     <string name="ConversationUpdateItem_learn_more">Gehiago jakin</string>
     <string name="ConversationUpdateItem_join_call">Deian sartu</string>
+    <!-- Action button label for starting a new call in the current conversation -->
+    <string name="ConversationUpdateItem_call_back">Itzuli deia</string>
     <string name="ConversationUpdateItem_return_to_call">Deira itzuli</string>
     <string name="ConversationUpdateItem_call_is_full">Deia beteta dago</string>
     <string name="ConversationUpdateItem_invite_friends">Gonbidatu lagunak</string>
@@ -2773,6 +2821,7 @@
     <string name="safety_number_change_dialog__leave_call">Deia utzi</string>
     <string name="safety_number_change_dialog__the_following_people_may_have_reinstalled_or_changed_devices">Ondoko pertsonek agian gailuak aldatu edo Signal berrinstalatu egin dute. Egiaztatu beraiekin duzun segurtasun zenbakia pribatutasuna ziurtatzeko.</string>
     <string name="safety_number_change_dialog__view">Ikusi</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">Aurretik egiaztatua</string>
 
     <!-- EnableCallNotificationSettingsDialog__call_notifications_checklist -->
@@ -3086,6 +3135,7 @@
 
     <string name="arrays__default">Lehenetsia</string>
     <string name="arrays__high">Altua</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">Maximoa</string>
 
     <!-- plurals.xml -->
@@ -3357,7 +3407,7 @@
     <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">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>
@@ -3406,6 +3456,14 @@
     <!-- Storage permission row description -->
     <string name="GrantPermissionsFragment__send_photos_videos_and_files">Bidali argazkiak, bideoak eta fitxategiak zure gailutik.</string>
 
+    <!-- PermissionDeniedBottomSheet -->
+    <!-- Sheet describing step 1 on how to give permissions by opening settings -->
+    <string name="PermissionDeniedBottomSheet__1_tap_settings_below">1. Tap “Settings” below</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 Allow the permission</string>
+    <!-- Label for button at the bottom of the sheet which opens the system permission settings -->
+    <string name="PermissionDeniedBottomSheet__settings">Settings</string>
+
     <!-- PaymentsSecuritySetupFragment -->
     <!-- Toolbar title -->
     <string name="PaymentsSecuritySetupFragment__security_setup">Segurtasun-konfigurazioa</string>
@@ -3446,6 +3504,7 @@
     <string name="PaymentsDetailsFragment__sent_to_s">%1$s(r)i bidalia</string>
     <string name="PaymentsDetailsFragment__you_on_s_at_s">Zuk (%1$s, %2$s)</string>
     <string name="PaymentsDetailsFragment__s_on_s_at_s">%1$s(e)k (%2$s, %3$s)</string>
+    <!-- Prefix to a name to indicate who a payment was sent to -->
     <string name="PaymentsDetailsFragment__to">Hartzailea:</string>
     <string name="PaymentsDetailsFragment__from">Igorlea:</string>
     <string name="PaymentsDetailsFragment__information">Transakzioaren xehetasunak (ordainketaren zenbatekoa, eta transakzioaren data eta ordua barne) MobileCoin-en liburu nagusian ageri dira.</string>
@@ -3508,6 +3567,7 @@
     <string name="ConfirmPayment__confirm_payment">Baieztatu ordainketa</string>
     <string name="ConfirmPayment__network_fee">Sare-komisioa</string>
     <string name="ConfirmPayment__estimated_s">%1$sestimatua</string>
+    <!-- Prefix to a name to indicate who a payment will be sent to -->
     <string name="ConfirmPayment__to">Hartzailea:</string>
     <string name="ConfirmPayment__total_amount">Zenbatekoa, guztira</string>
     <string name="ConfirmPayment__balance_s">Balantzea: %1$s</string>
@@ -3658,6 +3718,14 @@
     <string name="conversation_group_options__conversation">Txata</string>
     <string name="conversation_group_options__broadcast">Difusioa</string>
 
+    <!-- DoubleTapEditEducationSheet -->
+    <!-- Displayed as the title of the education bottom sheet -->
+    <string name="DoubleTapEditEducationSheet__double_tap_edit_title">Double tap to edit</string>
+    <!-- Text on the sheet explaining how double tapping on a message will let them edit it -->
+    <string name="DoubleTapEditEducationSheet__quickly_tap_twice">Quickly tap twice on your messages to edit them. You can edit your messages up to 24hrs after they’ve been sent.</string>
+    <!-- Button label to dismiss sheet -->
+    <string name="DoubleTapEditEducationSheet__got_it">Got it</string>
+
     <!-- text_secure_normal -->
     <string name="text_secure_normal__menu_new_group">Talde berria</string>
     <string name="text_secure_normal__menu_settings">Ezarpenak</string>
@@ -4112,6 +4180,7 @@
     <string name="RecipientBottomSheet_copied_to_clipboard">Arbelera kopiatuta</string>
 
     <string name="GroupRecipientListItem_admin">Administratzailea</string>
+    <!-- Button text to approve a user that has requested to join a group -->
     <string name="GroupRecipientListItem_approve_description">Onartu</string>
     <string name="GroupRecipientListItem_deny_description">Ukatu</string>
 
@@ -4139,6 +4208,7 @@
 
     <!-- VoiceNoteMediaDescriptionCompatFactory -->
     <string name="VoiceNoteMediaItemFactory__voice_message">Ahots-mezua · %1$s</string>
+    <!-- This is a title in a banner describing the conversation sender to receiver placeholders of the currently playing voice memo. -->
     <string name="VoiceNoteMediaItemFactory__s_to_s">%1$s tik %2$s ra</string>
 
     <!-- StorageUtil -->
@@ -4152,8 +4222,16 @@
     <string name="ReviewCardDialogFragment__review_members">Berrikusi kideak</string>
     <!-- Title of a screen where the user will be prompted to review a message request matching the name of someone they already know -->
     <string name="ReviewCardDialogFragment__review_request">Berrikusi eskaera</string>
-    <string name="ReviewCardDialogFragment__d_group_members_have_the_same_name">Taldean %1$d kide izen bera dute; egiaztatu azpian agertzen diren kideak eta ekintza bat hautatu.</string>
-    <string name="ReviewCardDialogFragment__if_youre_not_sure">Ziur ez bazaude eskaera nork bidali duen, egiaztatu azpian agertzen diren kontaktuak eta ekintza bat hautatu.</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="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 -->
+    <plurals name="ReviewCardDialogFragment__if_youre_not_sure">
+        <item quantity="one">If you\'re not sure who the request is from, review the contact below and take action.</item>
+        <item quantity="other">If you\'re not sure who the request is from, review the contacts below and take action.</item>
+    </plurals>
     <string name="ReviewCardDialogFragment__no_other_groups_in_common">Ez dago komuna den beste talderik.</string>
     <string name="ReviewCardDialogFragment__no_groups_in_common">Ez dago komuna den talderik.</string>
     <plurals name="ReviewCardDialogFragment__d_other_groups_in_common">
@@ -4184,11 +4262,20 @@
     <string name="CallParticipantsListUpdatePopupWindow__s_joined">%1$s batu da</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_and_s_joined">%1$s eta %2$s batu dira</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_s_and_s_joined">%1$s, %2$s eta %3$s batu dira</string>
-    <string name="CallParticipantsListUpdatePopupWindow__s_s_and_d_others_joined">%1$s, %2$s eta beste %3$d batu dira</string>
+    <!-- Toast message shown in group call when 3 or more people join -->
+    <plurals name="CallParticipantsListUpdatePopupWindow__s_s_and_d_others_joined">
+        <item quantity="one">%1$s, %2$s and %3$d other joined</item>
+        <item quantity="other">%1$s, %2$s and %3$d others joined</item>
+    </plurals>
+    <!-- Toast/popup text shown when someone leaves a group call -->
     <string name="CallParticipantsListUpdatePopupWindow__s_left">%1$s joan da</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_and_s_left">%1$s eta %2$s joan dira</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_s_and_s_left">%1$s, %2$s eta %3$s joan dira</string>
-    <string name="CallParticipantsListUpdatePopupWindow__s_s_and_d_others_left">%1$s, %2$s eta beste %3$d joan dira</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 and %3$d other left</item>
+        <item quantity="other">%1$s, %2$s and %3$d others left</item>
+    </plurals>
 
     <string name="CallParticipant__you">Zu</string>
     <string name="CallParticipant__you_on_another_device">Zu (beste gailu batean)</string>
@@ -4558,10 +4645,15 @@
 
     <!-- PrivacySettingsFragment -->
     <string name="PrivacySettingsFragment__blocked">Blokeatuta</string>
-    <string name="PrivacySettingsFragment__d_contacts">%1$dkontaktu</string>
+    <!-- Settings label that shows the number blocked contacts -->
+    <plurals name="PrivacySettingsFragment__d_contacts">
+        <item quantity="one">%1$d contact</item>
+        <item quantity="other">%1$d contacts</item>
+    </plurals>
     <string name="PrivacySettingsFragment__messaging">Mezularitza</string>
     <string name="PrivacySettingsFragment__disappearing_messages">Mezuen desagerpena</string>
     <string name="PrivacySettingsFragment__app_security">App segurtasuna</string>
+    <!-- This refers to the multi-tasking overview (recent apps) from the Android operating system.-->
     <string name="PrivacySettingsFragment__block_screenshots_in_the_recents_list_and_inside_the_app">Blokeatu pantaila-argazkiak azkenaldikoen zerrendan eta aplikazioaren barruan</string>
     <string name="PrivacySettingsFragment__signal_message_and_calls">Signal mezuak eta deiak, beti deiak transmititu, eta igorle zigilatua</string>
     <string name="PrivacySettingsFragment__default_timer_for_new_changes">Txat berrietarako tenporizadore lehenetsia</string>
@@ -4618,11 +4710,14 @@
     <string name="DataAndStorageSettingsFragment__media_quality">Media kalitatea</string>
     <string name="DataAndStorageSettingsFragment__sent_media_quality">Bidali media kalitatea</string>
     <string name="DataAndStorageSettingsFragment__sending_high_quality_media_will_use_more_data">Kalitate handiko multimedia bidaltzeak datu gehiago erabiliko ditu.</string>
+    <!-- Setting option that can be selected to default media to be sent as high quality by default -->
     <string name="DataAndStorageSettingsFragment__high">Altua</string>
+    <!-- Setting option that can be selected to default media to be sent as standard quality by default -->
     <string name="DataAndStorageSettingsFragment__standard">Estandarra</string>
     <string name="DataAndStorageSettingsFragment__calls">Deiak</string>
 
     <!-- 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__use_custom_colors">Erabili kolore pertsonalizatuak</string>
     <string name="ChatColorSelectionFragment__chat_color">Txat-kolorea</string>
@@ -4834,6 +4929,7 @@
     <string name="AvatarPickerFragment__take_a_picture">Argazki bat atera</string>
     <string name="AvatarPickerFragment__choose_a_photo">Aukeratu argazkia</string>
     <string name="AvatarPickerFragment__photo">Argazkia</string>
+    <!-- Button label during avatar selection/creation that when tapped lets you generate an avatar from typed in text. -->
     <string name="AvatarPickerFragment__text">Testua</string>
     <string name="AvatarPickerFragment__save">Gorde</string>
     <string name="AvatarPickerFragment__clear_avatar">Garbitu abatarra</string>
@@ -4894,7 +4990,7 @@
     <string name="MediaReviewFragment__add_a_message">Gehitu mezu bat</string>
     <string name="MediaReviewFragment__add_a_reply">Gehitu erantzun bat</string>
     <string name="MediaReviewFragment__send_to">Bidali honi:</string>
-    <string name="MediaReviewFragment__view_once_message">Mezua behin ikusi</string>
+    <string name="MediaReviewFragment__view_once_message">Behin ikusteko multimedia-elementua</string>
     <string name="MediaReviewFragment__one_or_more_items_were_too_large">Elementu bat edo gehiago handiegiak dira</string>
     <string name="MediaReviewFragment__one_or_more_items_were_invalid">Elementu bat edo gehiago handiegiak dira</string>
     <string name="MediaReviewFragment__too_many_items_selected">Elementu gehiegi hautatu dira</string>
@@ -5487,7 +5583,7 @@
     <string name="StoryViewerFragment__s_s">%1$s%2$s</string>
     <!-- Displayed when viewing a post you sent -->
     <string name="StoryViewerPageFragment__you">Zu</string>
-    <!-- Displayed when viewing a post displayed to a group -->
+    <!-- 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 -->
     <string name="StoryViewerPageFragment__reply">Erantzun</string>
@@ -6704,5 +6800,26 @@
     <!-- Content description for opening the note editor -->
     <string name="ViewNoteSheet__edit_note">Editatu oharra</string>
 
+    <!-- BackupProgressService -->
+    <!-- Notification title shown while backup restore job is running -->
+    <string name="BackupProgressService_title">Babeskopiak leheneratzen…</string>
+    <!-- Notification title shown while downloading backup restore data -->
+    <string name="BackupProgressService_title_downloading">Babeskopietako datuak deskargatzen…</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>
+    <!-- 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 -->
+    <string name="BackupsTypeSettingsFragment__google_pay">Google Pay</string>
+    <!-- Displayed as the user\'s payment method as a label in a preference row -->
+    <string name="BackupsTypeSettingsFragment__bank_transfer">Bank transfer</string>
+    <!-- Displayed as the user\'s payment method as a label in a preference row -->
+    <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>
+
+
     <!-- 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 9442119b7b..2c9b76d6b1 100644
--- a/app/src/main/res/values-fa/strings.xml
+++ b/app/src/main/res/values-fa/strings.xml
@@ -1,6 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- smartling.instruction_comments_enabled = on -->
-<resources>
+<?xml version="1.0" encoding="UTF-8"?><!-- 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> -->
@@ -89,6 +87,16 @@
     <string name="AttachmentManager_signal_requires_the_external_storage_permission_in_order_to_attach_photos_videos_or_audio">سیگنال برای پیوست کردن فایل‌های صوتی و تصویری به مجوز ذخیره‌سازی نیاز دارد، اما این مجوز به صورت دائمی رد شده است. لطفاً به منوی تنظیمات برنامه رفته، «مجوزها» را انتخاب کرده، و «ذخیره‌سازی» را فعال کنید.</string>
     <string name="AttachmentManager_signal_requires_contacts_permission_in_order_to_attach_contact_information">سیگنال برای پیوست کردن اطلاعات مخاطب به مجوز مخاطبین نیاز دارد، اما این مجوز به صورت دائمی رد شده است. لطفاً به منوی تنظیمات برنامه رفته، «مجوزها» را انتخاب کرده، و «مخاطبین» را فعال کنید.</string>
     <string name="AttachmentManager_signal_requires_location_information_in_order_to_attach_a_location">سیگنال برای پیوست کردن موقعیت مکانی به مجوز مکان نیاز دارد، اما این مجوز به صورت دائمی رد شده است. لطفاً به منوی تنظیمات برنامه رفته، «مجوزها» را انتخاب کرده، و «مکان» را فعال کنید.</string>
+
+    <!-- Dialog title asking users for location permission -->
+    <string name="AttachmentManager_signal_allow_access_location">Allow access to your location</string>
+    <!-- Dialog description that will explain the steps needed to give location permission -->
+    <string name="AttachmentManager_signal_to_send_location">To send your location:</string>
+    <!-- Alert dialog description asking for location permission -->
+    <string name="AttachmentManager_signal_allow_signal_access_location">Allow Molly access to send your location.</string>
+    <!-- Toast text explaining Signal\'s need for location access -->
+    <string name="AttachmentManager_signal_needs_location_access">Molly needs location access to send your location.</string>
+
     <!-- Alert dialog title to show the recipient has not activated payments -->
     <string name="AttachmentManager__not_activated_payments">%1$s پرداخت‌ها را فعال نکرده است </string>
     <!-- Alert dialog description to send the recipient a request to activate payments -->
@@ -386,8 +394,16 @@
     <string name="ConversationActivity_your_request_to_join_has_been_sent_to_the_group_admin">درخواست شما برای پیوستن به مدیر گروه ارسال شد. هنگامی که اقدامی انجام دهند مطلع خواهید شد.</string>
     <string name="ConversationActivity_cancel_request">لغو درخواست</string>
 
-    <string name="ConversationActivity_to_send_audio_messages_allow_signal_access_to_your_microphone">برای ارسال پیام‌های صوتی، به سیگنال اجازه دهید تا به میکروفون شما دسترسی داشته باشد.</string>
+    <!-- Dialog title asking users for microphone permission -->
+    <string name="ConversationActivity_allow_access_microphone">Allow access to your microphone</string>
+    <!-- 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>
+    <!-- Toast text explaining Signal\'s need for microphone access -->
+    <string name="ConversationActivity_signal_needs_microphone_access_voice_message">Molly needs microphone access to record a voice message.</string>
     <string name="ConversationActivity_signal_requires_the_microphone_permission_in_order_to_send_audio_messages">سیگنال برای ارسال پیام های صوتی نیاز به مجوز میکروفون دارد، ولی این اجازه به صورت دائم رد شده است. لطفاً به تنظیمات برنامه رفته، «مجوزها» را انتخاب کنید و «میکروفون» را فعال کنید.</string>
+
     <string name="ConversationActivity_signal_needs_the_microphone_and_camera_permissions_in_order_to_call_s">سیگنال نیاز به مجوزها‌ی دوربین و میکروفون دارد تا بتواند با %1$s تماس بگیرد، اما دسترسی به آن‌ها به صورت دائم رد شده است. لطفاً به قسمت تنظیمات برنامه رفته، «مجوزها» را انتخاب کرده، «دوربین» و «میکروفون» را فعال کنید.</string>
     <string name="ConversationActivity_to_capture_photos_and_video_allow_signal_access_to_the_camera">برای ضبط عکس و ویدئو، به سیگنال اجازه دهید به دوربین شما دسترسی داشته باشد.</string>
     <string name="ConversationActivity_signal_needs_the_camera_permission_to_take_photos_or_video">برای گرفتن عکس یا ضبط ویدئو سیگنال نیاز به مجوز دوربین دارد، اما دسترسی به آن رد شده است. لطفاً به تنظیمات برنامه رفته، «مجوزها» را انتخاب کرده، «دوربین» را فعال کنید.</string>
@@ -411,10 +427,17 @@
     <string name="ConversationActivity_you_will_leave_this_group_and_it_will_be_deleted_from_all_of_your_devices">شما این گروه را ترک خواهید کرد، و گروه از روی تمام دستگاه‌های شما پاک خواهد شد.</string>
     <string name="ConversationActivity_delete">پاک کردن</string>
     <string name="ConversationActivity_delete_and_leave">پاک کردن و ترک گروه</string>
-    <string name="ConversationActivity__to_call_s_signal_needs_access_to_your_microphone">برای تماس با %1$s، سیگنال به دسترسی میکروفون شما نیاز دارد.</string>
+
+    <!-- Dialog description that will explain the steps needed to give microphone permissions for a voice call -->
+    <string name="ConversationActivity__to_start_call">To start a 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">To start a call, allow Molly access to your microphone.</string>
+    <!-- Toast text explaining Signal\'s need for microphone access for a voice call -->
+    <string name="ConversationActivity_signal_needs_microphone_access_voice_call">Molly needs microphone access to start a call.</string>
 
 
     <string name="ConversationActivity_join">پیوستن</string>
+    <!-- Button text for an active group call but the call is currently full and unjoinable -->
     <string name="ConversationActivity_full">پر شده</string>
 
     <string name="ConversationActivity_error_sending_media">خطا در ارسال رسانه</string>
@@ -613,6 +636,7 @@
     <string name="ConversationListFragment_unarchive">لغو بایگانی</string>
     <string name="ConversationListFragment_delete">پاک کردن</string>
     <string name="ConversationListFragment_select_all">انتخاب همه</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 انتخاب شد</item>
         <item quantity="other">%1$d انتخاب شد</item>
@@ -864,6 +888,7 @@
         <item quantity="one">دعوت‌نامه ارسال شد</item>
         <item quantity="other">%1$d دعوت‌نامه ارسال شد</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">«%1$s» نمی‌تواند به صورت خودکار توسط شما به این گروه اضافه شود.\n\nآن‌ها برای پیوستن دعوت شده‌اند و پیام‌های گروهی را تا زمانی که دعوت را نپذیرند، نخواهند دید.</string>
     <string name="GroupManagement_invite_multiple_users">این کاربران نمی‌توانند به صورت خودکار توسط شما به این گروه اضافه شوند.\n\nآن‌ها برای پیوستن به گروه دعوت شده‌اند و پیام‌های گروهی را تا زمانی که دعوت را بپذیرند، نخواهند دید.</string>
 
@@ -1044,7 +1069,9 @@
 
     <string name="ManageGroupActivity_edit_name_and_picture">ویرایش نام و عکس</string>
     <string name="ManageGroupActivity_legacy_group">گروه موروثی</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">این یک گروه قدیمی است. قابلیت‌هایی نظیر مدیران گروه فقط در گروه‌های جدید موجود هستند.</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">این گروه یک گروه قدیمی است. برای دسترسی به قابلیت‌های جدید همانند اشاره‌ها@ و مدیران،</string>
     <string name="ManageGroupActivity_legacy_group_too_large">این گروه قدیمی نمی‌تواند به یک گروه جدید ارتقا پیدا کند چون بسیار بزرگ است. حداکثر اندازهٔ گروه %1$d است.</string>
     <string name="ManageGroupActivity_upgrade_this_group">این گروه را ارتقا دهید.</string>
@@ -1271,6 +1298,7 @@
         <item quantity="other">پاک کردن</item>
     </plurals>
 
+    <!-- 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 انتخاب شد (%2$s)</item>
         <item quantity="other">%1$d انتخاب شد (%2$s)</item>
@@ -1335,17 +1363,13 @@
     <string name="MessageRecord_left_group">شما گروه را ترک کردید.</string>
     <string name="MessageRecord_you_updated_group">شما گروه را به‌روزرسانی کردید.</string>
     <string name="MessageRecord_the_group_was_updated">گروه به‌روزرسانی شد.</string>
-    <!-- Update message shown when placing an outgoing 1:1 voice/audio call and it\'s answered by the other party -->
+    <!-- Update message shown when placing an outgoing 1:1 voice/audio call -->
     <string name="MessageRecord_outgoing_voice_call">تماس صوتی خروجی</string>
-    <!-- Update message shown when placing an outgoing 1:1 video call and it\'s answered by the other party -->
+    <!-- Update message shown when placing an outgoing 1:1 video call -->
     <string name="MessageRecord_outgoing_video_call">تماس تصویری خروجی</string>
-    <!-- Update message shown when placing an outgoing 1:1 voice/audio call and it\'s not answered by the other party -->
-    <string name="MessageRecord_unanswered_voice_call">تماس صوتی بی‌پاسخ</string>
-    <!-- Update message shown when placing an outgoing 1:1 video call and it\'s not answered by the other party -->
-    <string name="MessageRecord_unanswered_video_call">تماس تصویری بی‌پاسخ</string>
-    <!-- Update message shown when receiving an incoming 1:1 voice/audio call and it\'s answered -->
+    <!-- Update message shown when receiving an incoming 1:1 voice/audio call and it\'s answered or ringing -->
     <string name="MessageRecord_incoming_voice_call">تماس صوتی دریافتی</string>
-    <!-- Update message shown when receiving an incoming 1:1 video call and answered -->
+    <!-- Update message shown when receiving an incoming 1:1 video call and answered or ringing -->
     <string name="MessageRecord_incoming_video_call">تماس تصویری دریافتی</string>
     <!-- Update message shown when receiving an incoming 1:1 voice/audio call and not answered -->
     <string name="MessageRecord_missed_voice_call">تماس صوتی ازدست‌رفته</string>
@@ -1355,10 +1379,6 @@
     <string name="MessageRecord_missed_voice_call_notification_profile">تماس صوتی ازدست‌رفته در حالی که نمایۀ اعلان فعال است</string>
     <!-- Update message shown when receiving an incoming video call and declined due to notification profile -->
     <string name="MessageRecord_missed_video_call_notification_profile">تماس تصویری ازدست‌رفته در حالی که نمایۀ اعلان فعال است</string>
-    <!-- Update message shown when receiving an incoming 1:1 voice/audio call and explicitly declined -->
-    <string name="MessageRecord_you_declined_a_voice_call">یک تماس صوتی را رد کردید</string>
-    <!-- Update message shown when receiving an incoming 1:1 video call and explicitly declined -->
-    <string name="MessageRecord_you_declined_a_video_call">یک تماس تصویری را رد کردید</string>
     <!-- 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>
@@ -1567,28 +1587,53 @@
     <string name="MessageRecord_can_accept_payments">%1$s اکنون می‌تواند پرداخت‌ها را بپذیرد</string>
 
     <!-- Group Calling update messages -->
-    <string name="MessageRecord_s_started_a_group_call_s">%1$s یک تماس گروهی آغاز کرد · %2$s</string>
-    <string name="MessageRecord_you_started_a_group_call_s">شما یک تماس گروهی شروع کردید · %1$s</string>
-    <string name="MessageRecord_s_is_in_the_group_call_s">%1$s در تماس گروهی است · %2$s</string>
-    <string name="MessageRecord_you_are_in_the_group_call_s1">شما در تماس گروهی هستید · %1$s</string>
-    <string name="MessageRecord_s_and_s_are_in_the_group_call_s1">%1$s و %2$s در تماس گروهی هستند · %3$s</string>
-    <string name="MessageRecord_group_call_s">تماس گروهی · %1$s</string>
-
-    <string name="MessageRecord_s_started_a_group_call">%1$s یک تماس گروهی آغاز کرد</string>
-    <string name="MessageRecord_you_started_a_group_call">شما یک تماس گروهی آغاز کردید</string>
-    <string name="MessageRecord_s_is_in_the_group_call">%1$s در تماس گروهی است</string>
-    <string name="MessageRecord_you_are_in_the_group_call">شما در تماس گروهی هستید</string>
-    <string name="MessageRecord_s_and_s_are_in_the_group_call">%1$s و %2$s در تماس گروهی هستند</string>
-    <string name="MessageRecord_group_call">تماس گروهی</string>
+    <!-- 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 در این تماس است · %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">شما در این تماس هستید · %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 و %2$s در این تماس هستند · %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 در این تماس است</string>
+    <!-- Chat log text for an ongoing group call only the local user has joined -->
+    <string name="MessageRecord_you_are_in_the_call">شما در این تماس هستید</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 و %2$s در این تماس هستند</string>
+    <!-- Chat log text for a group call that ended within the last 5 minutes -->
+    <string name="MessageRecord__the_video_call_has_ended">تماس تصویری پایان یافت</string>
+    <!-- Chat log text for a group call that ended within the last 5 minutes with a placeholder for formatted time -->
+    <string name="MessageRecord__the_video_call_has_ended_s">تماس تصویری پایان یافت · %1$s</string>
+    <!-- Chat log text for a group call that ended more than 5 minutes ago and was missed -->
+    <string name="MessageRecord__missed_video_call">تماس تصویری ازدست‌رفته</string>
+    <!-- Chat log text for a group call that ended more than 5 minutes ago and was missed with a placeholder for formatted time -->
+    <string name="MessageRecord__missed_video_call_s">تماس تصویری از دست رفته · %1$s</string>
+    <!-- Chat log text for a group call that ended that the local user did not start -->
+    <string name="MessageRecord__incoming_video_call">تماس تصویری دریافتی</string>
+    <!-- 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">تماس تصویری دریافتی · %1$s</string>
+    <!-- Chat log text for a group call that ended that the local user started -->
+    <string name="MessageRecord__outgoing_video_call">تماس تصویری خروجی</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">تماس تصویری خروجی · %1$s</string>
+    <!-- Chat log text for an ongoing group call that the local user started -->
+    <string name="MessageRecord__you_started_a_video_call">یک تماس تصویری شروع کردید</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">یک تماس تصویری شروع کردید · %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 یک تماس تصویری شروع کرد</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 یک تماس تصویری شروع کرد · %2$s</string>
 
     <string name="MessageRecord_you">شما</string>
 
-    <plurals name="MessageRecord_s_s_and_d_others_are_in_the_group_call_s">
+    <!-- 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 و %3$d نفر دیگر در تماس گروهی هستند · %4$s</item>
         <item quantity="other">%1$s، %2$s و %3$d نفر دیگر در تماس گروهی هستند · %4$s</item>
     </plurals>
 
-    <plurals name="MessageRecord_s_s_and_d_others_are_in_the_group_call">
+    <!-- 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 و %3$d نفر دیگر در تماس گروهی هستند</item>
         <item quantity="other">%1$s، %2$s و %3$d نفر دیگر در تماس گروهی هستند</item>
     </plurals>
@@ -2063,6 +2108,7 @@
     <!-- Generic error when the app is unable to request an SMS code for an unknown reason. -->
     <string name="RegistrationActivity_unable_to_request_verification_code">امکان درخواست کد تأیید وجود ندارد. لطفاً اتصال شبکه خود را بررسی و دوباره امتحان کنید.</string>
     <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">سیگنال اندروید - قالب شماره تلفن</string>
     <!--    Small "toast" notification to the user confirming that they have requested a new code via voice call.-->
@@ -2207,7 +2253,7 @@
     <string name="SubmitDebugLogActivity_this_log_will_be_posted_publicly_online_for_contributors">این گزارش به صورت عمومی و آنلاین برای بازنگری مشارکت‌کنندگان منتشر خواهد شد، شما می‌توانید قبل از بارگذاری آن را بازرسی کنید.</string>
 
     <!-- SupportEmailUtil -->
-  <!-- Removed by excludeNonTranslatables <string name="SupportEmailUtil_support_email" translatable="false">support@molly.im</string> -->
+  <!-- Removed by excludeNonTranslatables <string name="SupportEmailUtil_support_email" translatable="false">support@signal.org</string> -->
     <string name="SupportEmailUtil_filter">فیلتر:</string>
     <string name="SupportEmailUtil_device_info">اطلاعات دستگاه:</string>
     <string name="SupportEmailUtil_android_version">نسخهٔ اندروید:</string>
@@ -2709,6 +2755,8 @@
     <string name="ConversationUpdateItem_loading">در حال بارگیری</string>
     <string name="ConversationUpdateItem_learn_more">بیشتر یاد بگیرید</string>
     <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_call_is_full">ظرفیت تماس تکمیل است</string>
     <string name="ConversationUpdateItem_invite_friends">دعوت دوستان</string>
@@ -2773,6 +2821,7 @@
     <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>
 
     <!-- EnableCallNotificationSettingsDialog__call_notifications_checklist -->
@@ -3086,6 +3135,7 @@
 
     <string name="arrays__default">پیش‌فرض</string>
     <string name="arrays__high">بالا</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">بالاترین</string>
 
     <!-- plurals.xml -->
@@ -3406,6 +3456,14 @@
     <!-- Storage permission row description -->
     <string name="GrantPermissionsFragment__send_photos_videos_and_files">از دستگاه‌تان عکس، ویدیو و فایل ارسال کنید.</string>
 
+    <!-- PermissionDeniedBottomSheet -->
+    <!-- Sheet describing step 1 on how to give permissions by opening settings -->
+    <string name="PermissionDeniedBottomSheet__1_tap_settings_below">1. Tap “Settings” below</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 Allow the permission</string>
+    <!-- Label for button at the bottom of the sheet which opens the system permission settings -->
+    <string name="PermissionDeniedBottomSheet__settings">Settings</string>
+
     <!-- PaymentsSecuritySetupFragment -->
     <!-- Toolbar title -->
     <string name="PaymentsSecuritySetupFragment__security_setup">راه‌اندازی امنیتی</string>
@@ -3446,6 +3504,7 @@
     <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__information">جزئیات تراکنش شامل مبلغ پرداخت و زمان تراکنش بخشی از MobileCoin Ledger هستند.</string>
@@ -3508,6 +3567,7 @@
     <string name="ConfirmPayment__confirm_payment">پرداخت را تأیید کنید</string>
     <string name="ConfirmPayment__network_fee">هزینهٔ شبکه</string>
     <string name="ConfirmPayment__estimated_s">زمان تخمین زده %1$s</string>
+    <!-- Prefix to a name to indicate who a payment will be sent to -->
     <string name="ConfirmPayment__to">به</string>
     <string name="ConfirmPayment__total_amount">کل مبلغ</string>
     <string name="ConfirmPayment__balance_s">موجودی: %1$s</string>
@@ -3658,6 +3718,14 @@
     <string name="conversation_group_options__conversation">گفتگو</string>
     <string name="conversation_group_options__broadcast">پخش</string>
 
+    <!-- DoubleTapEditEducationSheet -->
+    <!-- Displayed as the title of the education bottom sheet -->
+    <string name="DoubleTapEditEducationSheet__double_tap_edit_title">Double tap to edit</string>
+    <!-- Text on the sheet explaining how double tapping on a message will let them edit it -->
+    <string name="DoubleTapEditEducationSheet__quickly_tap_twice">Quickly tap twice on your messages to edit them. You can edit your messages up to 24hrs after they’ve been sent.</string>
+    <!-- Button label to dismiss sheet -->
+    <string name="DoubleTapEditEducationSheet__got_it">Got it</string>
+
     <!-- text_secure_normal -->
     <string name="text_secure_normal__menu_new_group">گروه جدید</string>
     <string name="text_secure_normal__menu_settings">تنظیمات</string>
@@ -4112,6 +4180,7 @@
     <string name="RecipientBottomSheet_copied_to_clipboard">روی کلیپ‌بورد کپی شد</string>
 
     <string name="GroupRecipientListItem_admin">مدیر</string>
+    <!-- Button text to approve a user that has requested to join a group -->
     <string name="GroupRecipientListItem_approve_description">موافقت</string>
     <string name="GroupRecipientListItem_deny_description">رد کردن</string>
 
@@ -4139,6 +4208,7 @@
 
     <!-- VoiceNoteMediaDescriptionCompatFactory -->
     <string name="VoiceNoteMediaItemFactory__voice_message">پیام صوتی · %1$s</string>
+    <!-- This is a title in a banner describing the conversation sender to receiver placeholders of the currently playing voice memo. -->
     <string name="VoiceNoteMediaItemFactory__s_to_s">%1$s به %2$s</string>
 
     <!-- StorageUtil -->
@@ -4152,8 +4222,16 @@
     <string name="ReviewCardDialogFragment__review_members">بازبینی اعضا</string>
     <!-- Title of a screen where the user will be prompted to review a message request matching the name of someone they already know -->
     <string name="ReviewCardDialogFragment__review_request">درخواست بازبینی</string>
-    <string name="ReviewCardDialogFragment__d_group_members_have_the_same_name">%1$d عضو گروه نام یکسان دارند، اعضا را در پایین مرور کنید و اقدام لازم را انجام دهید.</string>
-    <string name="ReviewCardDialogFragment__if_youre_not_sure">اگر مطمئن نیستید که فرستندهٔ درخواست چه کسی است، مخاطبین را در پایین مرور کنید و اقدام لازم را انجام دهید.</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="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 -->
+    <plurals name="ReviewCardDialogFragment__if_youre_not_sure">
+        <item quantity="one">If you\'re not sure who the request is from, review the contact below and take action.</item>
+        <item quantity="other">If you\'re not sure who the request is from, review the contacts below and take action.</item>
+    </plurals>
     <string name="ReviewCardDialogFragment__no_other_groups_in_common">هیچ گروه مشترک دیگری وجود ندارد.</string>
     <string name="ReviewCardDialogFragment__no_groups_in_common">هیچ گروه مشترکی وجود ندارد.</string>
     <plurals name="ReviewCardDialogFragment__d_other_groups_in_common">
@@ -4184,11 +4262,20 @@
     <string name="CallParticipantsListUpdatePopupWindow__s_joined">%1$s به تماس پیوست</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_and_s_joined">%1$s و %2$s پیوستند</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_s_and_s_joined">%1$s، %2$s و %3$s پیوستند</string>
-    <string name="CallParticipantsListUpdatePopupWindow__s_s_and_d_others_joined">%1$s، %2$s و %3$d نفر دیگر پیوستند</string>
+    <!-- Toast message shown in group call when 3 or more people join -->
+    <plurals name="CallParticipantsListUpdatePopupWindow__s_s_and_d_others_joined">
+        <item quantity="one">%1$s, %2$s and %3$d other joined</item>
+        <item quantity="other">%1$s, %2$s and %3$d others joined</item>
+    </plurals>
+    <!-- Toast/popup text shown when someone leaves a group call -->
     <string name="CallParticipantsListUpdatePopupWindow__s_left">%1$s ترک کرد</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_and_s_left">%1$s و %2$s ترک کردند</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_s_and_s_left">%1$s، %2$s و %3$s ترک کردند</string>
-    <string name="CallParticipantsListUpdatePopupWindow__s_s_and_d_others_left">%1$s، %2$s و %3$d نفر دیگر ترک کردند</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 and %3$d other left</item>
+        <item quantity="other">%1$s, %2$s and %3$d others left</item>
+    </plurals>
 
     <string name="CallParticipant__you">شما</string>
     <string name="CallParticipant__you_on_another_device">شما (روی دستگاه دیگر)</string>
@@ -4558,10 +4645,15 @@
 
     <!-- PrivacySettingsFragment -->
     <string name="PrivacySettingsFragment__blocked">مسدودشده</string>
-    <string name="PrivacySettingsFragment__d_contacts">%1$d مخاطبین</string>
+    <!-- Settings label that shows the number blocked contacts -->
+    <plurals name="PrivacySettingsFragment__d_contacts">
+        <item quantity="one">%1$d contact</item>
+        <item quantity="other">%1$d contacts</item>
+    </plurals>
     <string name="PrivacySettingsFragment__messaging">‌پیام‌رسانی</string>
     <string name="PrivacySettingsFragment__disappearing_messages">پیام‌های ناپدید شونده</string>
     <string name="PrivacySettingsFragment__app_security">امنیت برنامه</string>
+    <!-- This refers to the multi-tasking overview (recent apps) from the Android operating system.-->
     <string name="PrivacySettingsFragment__block_screenshots_in_the_recents_list_and_inside_the_app">مسدود کردن عکس از صفحه در فهرست موارد اخیر و در برنامه</string>
     <string name="PrivacySettingsFragment__signal_message_and_calls">پیام‌ها و تماس‌های سیگنال، عبور همیشگی تماس‌ها از سرور‌های سیگنال، و فرستندهٔ ناشناس</string>
     <string name="PrivacySettingsFragment__default_timer_for_new_changes">زمان‌سنج پیش‌فرض برای گفتگوهای جدید</string>
@@ -4618,11 +4710,14 @@
     <string name="DataAndStorageSettingsFragment__media_quality">کیفیت رسانه</string>
     <string name="DataAndStorageSettingsFragment__sent_media_quality">کیفیت ارسال رسانه</string>
     <string name="DataAndStorageSettingsFragment__sending_high_quality_media_will_use_more_data">ارسال رسانه با کیفیت بالا از داده‌های بیشتری استفاده خواهد کرد.</string>
+    <!-- Setting option that can be selected to default media to be sent as high quality by default -->
     <string name="DataAndStorageSettingsFragment__high">عالی</string>
+    <!-- Setting option that can be selected to default media to be sent as standard quality by default -->
     <string name="DataAndStorageSettingsFragment__standard">استاندارد</string>
     <string name="DataAndStorageSettingsFragment__calls">تماس‌ها</string>
 
     <!-- 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__use_custom_colors">استفاده از رنگ‌های سفارشی</string>
     <string name="ChatColorSelectionFragment__chat_color">رنگ گفتگو</string>
@@ -4834,6 +4929,7 @@
     <string name="AvatarPickerFragment__take_a_picture">یک عکس بگیرید</string>
     <string name="AvatarPickerFragment__choose_a_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>
     <string name="AvatarPickerFragment__clear_avatar">پاک کردن آواتار</string>
@@ -4894,7 +4990,7 @@
     <string name="MediaReviewFragment__add_a_message">افزودن یک پیام</string>
     <string name="MediaReviewFragment__add_a_reply">یک پاسخ اضافه کنید</string>
     <string name="MediaReviewFragment__send_to">ارسال به</string>
-    <string name="MediaReviewFragment__view_once_message">پیام یکبار مصرف</string>
+    <string name="MediaReviewFragment__view_once_message">فایل رسانه با قابلیت یک‌بار مشاهده</string>
     <string name="MediaReviewFragment__one_or_more_items_were_too_large">یک یا چند مورد بسیار بزرگ بودند</string>
     <string name="MediaReviewFragment__one_or_more_items_were_invalid">یک یا چند مورد نامعتبر بودند</string>
     <string name="MediaReviewFragment__too_many_items_selected">موارد بسیار زیادی انتخاب شده است</string>
@@ -5487,7 +5583,7 @@
     <string name="StoryViewerFragment__s_s">%1$s %2$s</string>
     <!-- Displayed when viewing a post you sent -->
     <string name="StoryViewerPageFragment__you">شما</string>
-    <!-- Displayed when viewing a post displayed to a group -->
+    <!-- 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 -->
     <string name="StoryViewerPageFragment__reply">پاسخ</string>
@@ -6680,7 +6776,7 @@
     <!-- Title displayed at the top of the screen -->
     <string name="NicknameActivity__nickname">نام مستعار</string>
     <!-- Subtitle displayed under title -->
-    <string name="NicknameActivity__nicknames_amp_notes">Nicknames &amp; notes are stored with Signal and end-to-end encrypted. They are only visible to you.</string>
+    <string name="NicknameActivity__nicknames_amp_notes">نام‌های مستعار و یادداشت‌ها در سیگنال ذخیره می‌شوند و سرتاسر رمزگذاری شده‌اند. این‌ها فقط برای شما قابل‌مشاهده هستند.</string>
     <!-- Field label for given name -->
     <string name="NicknameActivity__first_name">نام کوچک</string>
     <!-- Content description for first name clear button -->
@@ -6694,9 +6790,9 @@
     <!-- Button label to save -->
     <string name="NicknameActivity__save">ذخیره</string>
     <!-- Dialog title for note and name deletion -->
-    <string name="NicknameActivity__delete_nickname">Delete?</string>
+    <string name="NicknameActivity__delete_nickname">پاک شود؟</string>
     <!-- Dialog message for note and name deletion -->
-    <string name="NicknameActivity__this_will_permanently_delete_this_nickname_and_note">This will permanently delete any nickname and note you’ve set.</string>
+    <string name="NicknameActivity__this_will_permanently_delete_this_nickname_and_note">با این کار هر نام مستعار و یادداشتی که تنظیم کرده‌اید برای همیشه پاک خواهد شد.</string>
 
     <!-- ViewNoteBottomSheetDialogFragment -->
     <!-- Sheet title -->
@@ -6704,5 +6800,26 @@
     <!-- Content description for opening the note editor -->
     <string name="ViewNoteSheet__edit_note">ویرایش یادداشت</string>
 
+    <!-- BackupProgressService -->
+    <!-- Notification title shown while backup restore job is running -->
+    <string name="BackupProgressService_title">در حال بازیابی پشتیبان…</string>
+    <!-- Notification title shown while downloading backup restore data -->
+    <string name="BackupProgressService_title_downloading">در حال بارگیری داده‌های پشتیبان…</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>
+    <!-- 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 -->
+    <string name="BackupsTypeSettingsFragment__google_pay">Google Pay</string>
+    <!-- Displayed as the user\'s payment method as a label in a preference row -->
+    <string name="BackupsTypeSettingsFragment__bank_transfer">Bank transfer</string>
+    <!-- Displayed as the user\'s payment method as a label in a preference row -->
+    <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>
+
+
     <!-- 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 0c181d4365..b28f3cc381 100644
--- a/app/src/main/res/values-fi/strings.xml
+++ b/app/src/main/res/values-fi/strings.xml
@@ -1,6 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- smartling.instruction_comments_enabled = on -->
-<resources>
+<?xml version="1.0" encoding="UTF-8"?><!-- 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> -->
@@ -89,6 +87,16 @@
     <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">Allow access to your location</string>
+    <!-- Dialog description that will explain the steps needed to give location permission -->
+    <string name="AttachmentManager_signal_to_send_location">To send your location:</string>
+    <!-- Alert dialog description asking for location permission -->
+    <string name="AttachmentManager_signal_allow_signal_access_location">Allow Molly access to send your location.</string>
+    <!-- Toast text explaining Signal\'s need for location access -->
+    <string name="AttachmentManager_signal_needs_location_access">Molly needs location access to send your location.</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>
     <!-- Alert dialog description to send the recipient a request to activate payments -->
@@ -241,7 +249,7 @@
     <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>
@@ -386,8 +394,16 @@
     <string name="ConversationActivity_your_request_to_join_has_been_sent_to_the_group_admin">Liittymispyyntösi on lähetetty ryhmän ylläpitäjälle. Saat ilmoituksen, kun he tekevät päätöksen.</string>
     <string name="ConversationActivity_cancel_request">Peruuta pyyntö</string>
 
-    <string name="ConversationActivity_to_send_audio_messages_allow_signal_access_to_your_microphone">Ääniviestin lähettäminen edellyttää mikrofonin käyttöoikeuden myöntämistä Mollyille.</string>
+    <!-- Dialog title asking users for microphone permission -->
+    <string name="ConversationActivity_allow_access_microphone">Allow access to your microphone</string>
+    <!-- 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>
+    <!-- Toast text explaining Signal\'s need for microphone access -->
+    <string name="ConversationActivity_signal_needs_microphone_access_voice_message">Molly needs microphone access to record a voice message.</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">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>
@@ -411,10 +427,17 @@
     <string name="ConversationActivity_you_will_leave_this_group_and_it_will_be_deleted_from_all_of_your_devices">Poistut tästä ryhmästä ja se poistetaan kaikilta laitteiltasi.</string>
     <string name="ConversationActivity_delete">Poista</string>
     <string name="ConversationActivity_delete_and_leave">Poista ja poistu ryhmästä</string>
-    <string name="ConversationActivity__to_call_s_signal_needs_access_to_your_microphone">Jotta voit soittaa käyttäjälle %1$s, Molly tarvitsee luvan käyttää mikrofonia.</string>
+
+    <!-- Dialog description that will explain the steps needed to give microphone permissions for a voice call -->
+    <string name="ConversationActivity__to_start_call">To start a 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">To start a call, allow Molly access to your microphone.</string>
+    <!-- Toast text explaining Signal\'s need for microphone access for a voice call -->
+    <string name="ConversationActivity_signal_needs_microphone_access_voice_call">Molly needs microphone access to start a call.</string>
 
 
     <string name="ConversationActivity_join">Liity</string>
+    <!-- Button text for an active group call but the call is currently full and unjoinable -->
     <string name="ConversationActivity_full">Täynnä</string>
 
     <string name="ConversationActivity_error_sending_media">Virhe median lähettämisessä</string>
@@ -613,6 +636,7 @@
     <string name="ConversationListFragment_unarchive">Kumoa arkist.</string>
     <string name="ConversationListFragment_delete">Poista</string>
     <string name="ConversationListFragment_select_all">Valitse kaikki</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 valittu</item>
         <item quantity="other">%1$d valittu</item>
@@ -864,6 +888,7 @@
         <item quantity="one">Kutsu lähetetty</item>
         <item quantity="other">%1$d kutsua lähetetty</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">Et voi lisätä käyttäjää %1$s automaattisesti tähän ryhmään.\n\nHänet on kutsuttu liittymään ryhmään, ja hän näkee ryhmäviestit vasta hyväksyttyään kutsun.</string>
     <string name="GroupManagement_invite_multiple_users">Et voi lisätä näitä käyttäjiä automaattisesti tähän ryhmään.\n\nHeidät on kutsuttu liittymään ryhmään, ja he näkee ryhmäviestit vasta hyväksyttyään kutsun.</string>
 
@@ -1044,7 +1069,9 @@
 
     <string name="ManageGroupActivity_edit_name_and_picture">Muokkaa nimeä ja kuvaa</string>
     <string name="ManageGroupActivity_legacy_group">Vanhan tyyppinen ryhmä</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">Tämä on vanhan tyyppinen ryhmä. Ylläpitäjätoiminnot ja uudet ominaisuudet ovat käytettävissä vain uusissa ryhmissä.</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">Tämä on vanhan tyyppinen ryhmä. Käyttääksesi uusia ominaisuuksia, kuten @mainintoja ja ylläpitäjyyttä,</string>
     <string name="ManageGroupActivity_legacy_group_too_large">Tätä vanhan tyyppistä ryhmää ei voida päivittää uuden tyyppiseksi, koska se on liian suuri. Ryhmässä voi olla enintään %1$d jäsentä.</string>
     <string name="ManageGroupActivity_upgrade_this_group">päivitä tämä ryhmä.</string>
@@ -1271,6 +1298,7 @@
         <item quantity="other">Poista</item>
     </plurals>
 
+    <!-- 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 valittu (%2$s)</item>
         <item quantity="other">%1$d valittu (%2$s)</item>
@@ -1335,17 +1363,13 @@
     <string name="MessageRecord_left_group">Olet poistunut ryhmästä.</string>
     <string name="MessageRecord_you_updated_group">Päivitit ryhmää.</string>
     <string name="MessageRecord_the_group_was_updated">Ryhmä päivitettiin.</string>
-    <!-- Update message shown when placing an outgoing 1:1 voice/audio call and it\'s answered by the other party -->
+    <!-- Update message shown when placing an outgoing 1:1 voice/audio call -->
     <string name="MessageRecord_outgoing_voice_call">Lähtevä äänipuhelu</string>
-    <!-- Update message shown when placing an outgoing 1:1 video call and it\'s answered by the other party -->
+    <!-- Update message shown when placing an outgoing 1:1 video call -->
     <string name="MessageRecord_outgoing_video_call">Lähtevä videopuhelu</string>
-    <!-- Update message shown when placing an outgoing 1:1 voice/audio call and it\'s not answered by the other party -->
-    <string name="MessageRecord_unanswered_voice_call">Vastaamaton äänipuhelu</string>
-    <!-- Update message shown when placing an outgoing 1:1 video call and it\'s not answered by the other party -->
-    <string name="MessageRecord_unanswered_video_call">Vastaamaton videopuhelu</string>
-    <!-- Update message shown when receiving an incoming 1:1 voice/audio call and it\'s answered -->
+    <!-- Update message shown when receiving an incoming 1:1 voice/audio call and it\'s answered or ringing -->
     <string name="MessageRecord_incoming_voice_call">Saapuva äänipuhelu</string>
-    <!-- Update message shown when receiving an incoming 1:1 video call and answered -->
+    <!-- Update message shown when receiving an incoming 1:1 video call and answered or ringing -->
     <string name="MessageRecord_incoming_video_call">Saapuva videopuhelu</string>
     <!-- Update message shown when receiving an incoming 1:1 voice/audio call and not answered -->
     <string name="MessageRecord_missed_voice_call">Vastaamaton äänipuhelu</string>
@@ -1355,10 +1379,6 @@
     <string name="MessageRecord_missed_voice_call_notification_profile">Vastaamaton äänipuhelu ilmoitusprofiilin ollessa käytössä</string>
     <!-- Update message shown when receiving an incoming video call and declined due to notification profile -->
     <string name="MessageRecord_missed_video_call_notification_profile">Vastaamaton videopuhelu ilmoitusprofiilin ollessa käytössä</string>
-    <!-- Update message shown when receiving an incoming 1:1 voice/audio call and explicitly declined -->
-    <string name="MessageRecord_you_declined_a_voice_call">Hylkäsit äänipuhelun</string>
-    <!-- Update message shown when receiving an incoming 1:1 video call and explicitly declined -->
-    <string name="MessageRecord_you_declined_a_video_call">Hylkäsit videopuhelun</string>
     <!-- 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 päivitti ryhmää.</string>
@@ -1567,28 +1587,53 @@
     <string name="MessageRecord_can_accept_payments">%1$s voi nyt hyväksyä maksuja</string>
 
     <!-- Group Calling update messages -->
-    <string name="MessageRecord_s_started_a_group_call_s">%1$s aloitti ryhmäpuhelun · %2$s</string>
-    <string name="MessageRecord_you_started_a_group_call_s">Aloitit ryhmäpuhelun · %1$s</string>
-    <string name="MessageRecord_s_is_in_the_group_call_s">%1$s on ryhmäpuhelussa · %2$s</string>
-    <string name="MessageRecord_you_are_in_the_group_call_s1">Olet ryhmäpuhelussa · %1$s</string>
-    <string name="MessageRecord_s_and_s_are_in_the_group_call_s1">%1$s ja %2$s ovat ryhmäpuhelussa · %3$s</string>
-    <string name="MessageRecord_group_call_s">Ryhmäpuhelu · %1$s</string>
-
-    <string name="MessageRecord_s_started_a_group_call">%1$s aloitti ryhmäpuhelun</string>
-    <string name="MessageRecord_you_started_a_group_call">Aloitit ryhmäpuhelun</string>
-    <string name="MessageRecord_s_is_in_the_group_call">%1$s on ryhmäpuhelussa</string>
-    <string name="MessageRecord_you_are_in_the_group_call">Olet ryhmäpuhelussa</string>
-    <string name="MessageRecord_s_and_s_are_in_the_group_call">%1$s ja %2$s ovat ryhmäpuhelussa</string>
-    <string name="MessageRecord_group_call">Ryhmäpuhelu</string>
+    <!-- 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 on puhelussa · %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">Olet puhelussa · %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 ja %2$s ovat puhelussa · %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 on puhelussa</string>
+    <!-- Chat log text for an ongoing group call only the local user has joined -->
+    <string name="MessageRecord_you_are_in_the_call">Olet puhelussa</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 ja %2$s ovat puhelussa</string>
+    <!-- Chat log text for a group call that ended within the last 5 minutes -->
+    <string name="MessageRecord__the_video_call_has_ended">Videopuhelu on päättynyt</string>
+    <!-- Chat log text for a group call that ended within the last 5 minutes with a placeholder for formatted time -->
+    <string name="MessageRecord__the_video_call_has_ended_s">Videopuhelu on päättynyt · %1$s</string>
+    <!-- Chat log text for a group call that ended more than 5 minutes ago and was missed -->
+    <string name="MessageRecord__missed_video_call">Vastaamaton videopuhelu</string>
+    <!-- Chat log text for a group call that ended more than 5 minutes ago and was missed with a placeholder for formatted time -->
+    <string name="MessageRecord__missed_video_call_s">Vastaamaton videopuhelu · %1$s</string>
+    <!-- Chat log text for a group call that ended that the local user did not start -->
+    <string name="MessageRecord__incoming_video_call">Saapuva videopuhelu</string>
+    <!-- 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">Saapuva videopuhelu · %1$s</string>
+    <!-- Chat log text for a group call that ended that the local user started -->
+    <string name="MessageRecord__outgoing_video_call">Lähtevä videopuhelu</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">Soitettu videopuhelu · %1$s</string>
+    <!-- Chat log text for an ongoing group call that the local user started -->
+    <string name="MessageRecord__you_started_a_video_call">Aloitit videopuhelun</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">Aloitit videopuhelun · %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 aloitti videopuhelun</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 aloitti videopuhelun · %2$s</string>
 
     <string name="MessageRecord_you">Sinä</string>
 
-    <plurals name="MessageRecord_s_s_and_d_others_are_in_the_group_call_s">
+    <!-- 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 ja %3$d muu ovat ryhmäpuhelussa · %4$s</item>
         <item quantity="other">%1$s, %2$s ja %3$d muuta ovat ryhmäpuhelussa · %4$s</item>
     </plurals>
 
-    <plurals name="MessageRecord_s_s_and_d_others_are_in_the_group_call">
+    <!-- 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 ja %3$d muu ovat ryhmäpuhelussa</item>
         <item quantity="other">%1$s, %2$s ja %3$d muuta ovat ryhmäpuhelussa</item>
     </plurals>
@@ -2063,6 +2108,7 @@
     <!-- Generic error when the app is unable to request an SMS code for an unknown reason. -->
     <string name="RegistrationActivity_unable_to_request_verification_code">Vahvistuskoodia ei voida pyytää. Tarkista verkkoyhteys ja yritä uudelleen.</string>
     <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">Molly Androidille - Puhelinnumeron muoto</string>
     <!--    Small "toast" notification to the user confirming that they have requested a new code via voice call.-->
@@ -2207,7 +2253,7 @@
     <string name="SubmitDebugLogActivity_this_log_will_be_posted_publicly_online_for_contributors">Loki julkaistaan intermetissä, jossa se on kehittäjien nähtävissä. Voit tutkia sitä ennen lähettämistä.</string>
 
     <!-- SupportEmailUtil -->
-  <!-- Removed by excludeNonTranslatables <string name="SupportEmailUtil_support_email" translatable="false">support@molly.im</string> -->
+  <!-- Removed by excludeNonTranslatables <string name="SupportEmailUtil_support_email" translatable="false">support@signal.org</string> -->
     <string name="SupportEmailUtil_filter">Suodatin:</string>
     <string name="SupportEmailUtil_device_info">Laitetiedot:</string>
     <string name="SupportEmailUtil_android_version">Android-versio:</string>
@@ -2709,6 +2755,8 @@
     <string name="ConversationUpdateItem_loading">Ladataan</string>
     <string name="ConversationUpdateItem_learn_more">Lue lisää</string>
     <string name="ConversationUpdateItem_join_call">Liity puheluun</string>
+    <!-- Action button label for starting a new call in the current conversation -->
+    <string name="ConversationUpdateItem_call_back">Soita takaisin</string>
     <string name="ConversationUpdateItem_return_to_call">Palaa puheluun</string>
     <string name="ConversationUpdateItem_call_is_full">Puhelu on täynnä</string>
     <string name="ConversationUpdateItem_invite_friends">Kutsu ystäviä</string>
@@ -2773,6 +2821,7 @@
     <string name="safety_number_change_dialog__leave_call">Poistu puhelusta</string>
     <string name="safety_number_change_dialog__the_following_people_may_have_reinstalled_or_changed_devices">Seuraavat henkilöt ovat saattaneet asentaa sovelluksen uudelleen tai vaihtaa laitetta. Varmenna turvanumerosi heidän kanssaan yksityisyyden takaamiseksi.</string>
     <string name="safety_number_change_dialog__view">Näytä</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">Aikaisemmin varmennettu</string>
 
     <!-- EnableCallNotificationSettingsDialog__call_notifications_checklist -->
@@ -3086,6 +3135,7 @@
 
     <string name="arrays__default">Oletus</string>
     <string name="arrays__high">Korkea</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">Maksimi</string>
 
     <!-- plurals.xml -->
@@ -3357,7 +3407,7 @@
     <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">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>
@@ -3406,6 +3456,14 @@
     <!-- Storage permission row description -->
     <string name="GrantPermissionsFragment__send_photos_videos_and_files">Lähetä valokuvia, videoita ja tiedostoja laitteestasi.</string>
 
+    <!-- PermissionDeniedBottomSheet -->
+    <!-- Sheet describing step 1 on how to give permissions by opening settings -->
+    <string name="PermissionDeniedBottomSheet__1_tap_settings_below">1. Tap “Settings” below</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 Allow the permission</string>
+    <!-- Label for button at the bottom of the sheet which opens the system permission settings -->
+    <string name="PermissionDeniedBottomSheet__settings">Settings</string>
+
     <!-- PaymentsSecuritySetupFragment -->
     <!-- Toolbar title -->
     <string name="PaymentsSecuritySetupFragment__security_setup">Suojausasetukset</string>
@@ -3446,6 +3504,7 @@
     <string name="PaymentsDetailsFragment__sent_to_s">Lähetetty henkilölle %1$s</string>
     <string name="PaymentsDetailsFragment__you_on_s_at_s">Sinä %1$s klo %2$s</string>
     <string name="PaymentsDetailsFragment__s_on_s_at_s">%1$s %2$s klo %3$s</string>
+    <!-- Prefix to a name to indicate who a payment was sent to -->
     <string name="PaymentsDetailsFragment__to">Vastaanottajat</string>
     <string name="PaymentsDetailsFragment__from">Lähettäjä</string>
     <string name="PaymentsDetailsFragment__information">Tapahtuman tiedot, mukaan lukien maksun summa ja aika, tallennetaan MobileCoiniin.</string>
@@ -3508,6 +3567,7 @@
     <string name="ConfirmPayment__confirm_payment">Vahvista maksu</string>
     <string name="ConfirmPayment__network_fee">Verkkomaksu</string>
     <string name="ConfirmPayment__estimated_s">Arvio %1$s</string>
+    <!-- Prefix to a name to indicate who a payment will be sent to -->
     <string name="ConfirmPayment__to">Vastaanottaja:</string>
     <string name="ConfirmPayment__total_amount">Kokonaissumma</string>
     <string name="ConfirmPayment__balance_s">Saldo: %1$s</string>
@@ -3658,6 +3718,14 @@
     <string name="conversation_group_options__conversation">Keskustelu</string>
     <string name="conversation_group_options__broadcast">Lähetä</string>
 
+    <!-- DoubleTapEditEducationSheet -->
+    <!-- Displayed as the title of the education bottom sheet -->
+    <string name="DoubleTapEditEducationSheet__double_tap_edit_title">Double tap to edit</string>
+    <!-- Text on the sheet explaining how double tapping on a message will let them edit it -->
+    <string name="DoubleTapEditEducationSheet__quickly_tap_twice">Quickly tap twice on your messages to edit them. You can edit your messages up to 24hrs after they’ve been sent.</string>
+    <!-- Button label to dismiss sheet -->
+    <string name="DoubleTapEditEducationSheet__got_it">Got it</string>
+
     <!-- text_secure_normal -->
     <string name="text_secure_normal__menu_new_group">Uusi ryhmä</string>
     <string name="text_secure_normal__menu_settings">Asetukset</string>
@@ -4112,6 +4180,7 @@
     <string name="RecipientBottomSheet_copied_to_clipboard">Kopioitu leikepöydälle</string>
 
     <string name="GroupRecipientListItem_admin">Ylläpitäjä</string>
+    <!-- Button text to approve a user that has requested to join a group -->
     <string name="GroupRecipientListItem_approve_description">Hyväksy</string>
     <string name="GroupRecipientListItem_deny_description">Hylkää</string>
 
@@ -4139,6 +4208,7 @@
 
     <!-- VoiceNoteMediaDescriptionCompatFactory -->
     <string name="VoiceNoteMediaItemFactory__voice_message">Ääniviesti · %1$s</string>
+    <!-- This is a title in a banner describing the conversation sender to receiver placeholders of the currently playing voice memo. -->
     <string name="VoiceNoteMediaItemFactory__s_to_s">%1$s käyttäjälle %2$s</string>
 
     <!-- StorageUtil -->
@@ -4152,8 +4222,16 @@
     <string name="ReviewCardDialogFragment__review_members">Tarkista jäsenet</string>
     <!-- Title of a screen where the user will be prompted to review a message request matching the name of someone they already know -->
     <string name="ReviewCardDialogFragment__review_request">Tarkastuspyyntö</string>
-    <string name="ReviewCardDialogFragment__d_group_members_have_the_same_name">Ryhmän %1$d jäsenistä on käyttäjiä, joilla on sama nimi. Tarkista jäsenet alapuolelta ja korjaa ongelma.</string>
-    <string name="ReviewCardDialogFragment__if_youre_not_sure">Jos et ole varma lähettäjän henkilöllisyydestä, tarkista henkilötiedot alta.</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="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 -->
+    <plurals name="ReviewCardDialogFragment__if_youre_not_sure">
+        <item quantity="one">If you\'re not sure who the request is from, review the contact below and take action.</item>
+        <item quantity="other">If you\'re not sure who the request is from, review the contacts below and take action.</item>
+    </plurals>
     <string name="ReviewCardDialogFragment__no_other_groups_in_common">Ei muita yhteisiä ryhmiä.</string>
     <string name="ReviewCardDialogFragment__no_groups_in_common">Ei yhteisiä ryhmiä.</string>
     <plurals name="ReviewCardDialogFragment__d_other_groups_in_common">
@@ -4184,11 +4262,20 @@
     <string name="CallParticipantsListUpdatePopupWindow__s_joined">%1$s liittyi</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_and_s_joined">%1$s ja %2$s liittyivät</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_s_and_s_joined">%1$s, %2$s ja %3$s liittyivät</string>
-    <string name="CallParticipantsListUpdatePopupWindow__s_s_and_d_others_joined">%1$s, %2$s ja %3$d muuta liittyivät</string>
+    <!-- Toast message shown in group call when 3 or more people join -->
+    <plurals name="CallParticipantsListUpdatePopupWindow__s_s_and_d_others_joined">
+        <item quantity="one">%1$s, %2$s and %3$d other joined</item>
+        <item quantity="other">%1$s, %2$s and %3$d others joined</item>
+    </plurals>
+    <!-- Toast/popup text shown when someone leaves a group call -->
     <string name="CallParticipantsListUpdatePopupWindow__s_left">%1$s poistui</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_and_s_left">%1$s ja %2$s poistuivat</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_s_and_s_left">%1$s, %2$s ja %3$s poistuivat</string>
-    <string name="CallParticipantsListUpdatePopupWindow__s_s_and_d_others_left">%1$s, %2$s ja %3$d muuta poistuivat</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 and %3$d other left</item>
+        <item quantity="other">%1$s, %2$s and %3$d others left</item>
+    </plurals>
 
     <string name="CallParticipant__you">Sinä</string>
     <string name="CallParticipant__you_on_another_device">Sinä (toisella laitteella)</string>
@@ -4558,10 +4645,15 @@
 
     <!-- PrivacySettingsFragment -->
     <string name="PrivacySettingsFragment__blocked">Estetty</string>
-    <string name="PrivacySettingsFragment__d_contacts">%1$d yhteystietoa</string>
+    <!-- Settings label that shows the number blocked contacts -->
+    <plurals name="PrivacySettingsFragment__d_contacts">
+        <item quantity="one">%1$d contact</item>
+        <item quantity="other">%1$d contacts</item>
+    </plurals>
     <string name="PrivacySettingsFragment__messaging">Viestintä</string>
     <string name="PrivacySettingsFragment__disappearing_messages">Katoavat viestit</string>
     <string name="PrivacySettingsFragment__app_security">Turvallisuus</string>
+    <!-- This refers to the multi-tasking overview (recent apps) from the Android operating system.-->
     <string name="PrivacySettingsFragment__block_screenshots_in_the_recents_list_and_inside_the_app">Estä näyttökuvat Viimeisimmät-luettelosta ja sovelluksen sisältä</string>
     <string name="PrivacySettingsFragment__signal_message_and_calls">Signal-viestit ja -puhelut, välitä puhelut aina ja lähettäjäsinetti</string>
     <string name="PrivacySettingsFragment__default_timer_for_new_changes">Uusien keskustelujen oletusajastin</string>
@@ -4618,11 +4710,14 @@
     <string name="DataAndStorageSettingsFragment__media_quality">Median laatu</string>
     <string name="DataAndStorageSettingsFragment__sent_media_quality">Lähetettävän median laatu</string>
     <string name="DataAndStorageSettingsFragment__sending_high_quality_media_will_use_more_data">Korkealaatuisen median lähetys kuluttaa enemmän dataa.</string>
+    <!-- Setting option that can be selected to default media to be sent as high quality by default -->
     <string name="DataAndStorageSettingsFragment__high">Korkea</string>
+    <!-- Setting option that can be selected to default media to be sent as standard quality by default -->
     <string name="DataAndStorageSettingsFragment__standard">Vakio</string>
     <string name="DataAndStorageSettingsFragment__calls">Puhelut</string>
 
     <!-- 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__use_custom_colors">Käytä omia värejä</string>
     <string name="ChatColorSelectionFragment__chat_color">Keskustelun väri</string>
@@ -4834,6 +4929,7 @@
     <string name="AvatarPickerFragment__take_a_picture">Ota kuva</string>
     <string name="AvatarPickerFragment__choose_a_photo">Valitse kuva</string>
     <string name="AvatarPickerFragment__photo">Kuva</string>
+    <!-- Button label during avatar selection/creation that when tapped lets you generate an avatar from typed in text. -->
     <string name="AvatarPickerFragment__text">Teksti</string>
     <string name="AvatarPickerFragment__save">Tallenna</string>
     <string name="AvatarPickerFragment__clear_avatar">Poista avatar</string>
@@ -4894,7 +4990,7 @@
     <string name="MediaReviewFragment__add_a_message">Lisää viesti</string>
     <string name="MediaReviewFragment__add_a_reply">Lisää vastaus</string>
     <string name="MediaReviewFragment__send_to">Lähetä henkilölle</string>
-    <string name="MediaReviewFragment__view_once_message">Kerran katsottava viesti</string>
+    <string name="MediaReviewFragment__view_once_message">Kerran katsottava media</string>
     <string name="MediaReviewFragment__one_or_more_items_were_too_large">Yksi tai useampi valinnoista olivat liian suuria</string>
     <string name="MediaReviewFragment__one_or_more_items_were_invalid">Yksi tai useampi valinnoista olivat virheellisiä</string>
     <string name="MediaReviewFragment__too_many_items_selected">Liikaa valintoja</string>
@@ -5487,7 +5583,7 @@
     <string name="StoryViewerFragment__s_s">%1$s %2$s</string>
     <!-- Displayed when viewing a post you sent -->
     <string name="StoryViewerPageFragment__you">Sinä</string>
-    <!-- Displayed when viewing a post displayed to a group -->
+    <!-- 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 käyttäjälle %2$s</string>
     <!-- Displayed when viewing a post from another user with no replies -->
     <string name="StoryViewerPageFragment__reply">Vastaa</string>
@@ -6704,5 +6800,26 @@
     <!-- Content description for opening the note editor -->
     <string name="ViewNoteSheet__edit_note">Muokkaa huomautusta</string>
 
+    <!-- BackupProgressService -->
+    <!-- Notification title shown while backup restore job is running -->
+    <string name="BackupProgressService_title">Palautetaan varmuuskopiota…</string>
+    <!-- Notification title shown while downloading backup restore data -->
+    <string name="BackupProgressService_title_downloading">Ladataan varmuuskopion tietoja…</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>
+    <!-- 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 -->
+    <string name="BackupsTypeSettingsFragment__google_pay">Google Pay</string>
+    <!-- Displayed as the user\'s payment method as a label in a preference row -->
+    <string name="BackupsTypeSettingsFragment__bank_transfer">Bank transfer</string>
+    <!-- Displayed as the user\'s payment method as a label in a preference row -->
+    <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>
+
+
     <!-- 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 3cfdc114fb..f3a0592cf3 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -1,6 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- smartling.instruction_comments_enabled = on -->
-<resources>
+<?xml version="1.0" encoding="UTF-8"?><!-- 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 +41,7 @@
     <!-- 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">Molly et les notifications de message seront déverrouillées 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>
@@ -86,9 +84,19 @@
 
     <!-- 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, Molly doit accéder au stockage de l’appareil, 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 « Stockage ».</string>
-    <string name="AttachmentManager_signal_requires_contacts_permission_in_order_to_attach_contact_information">Molly exige l’autorisation Contacts afin de joindre des coordonnées de contact, 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="AttachmentManager_signal_requires_location_information_in_order_to_attach_a_location">Molly exige l’autorisation Position afin de joindre une position géographique, mais elle a été refusée définitivement. Veuillez accéder au menu des paramètres des applis, sélectionner « Autorisations » et activer « Position ».</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">Allow access to your location</string>
+    <!-- Dialog description that will explain the steps needed to give location permission -->
+    <string name="AttachmentManager_signal_to_send_location">To send your location:</string>
+    <!-- Alert dialog description asking for location permission -->
+    <string name="AttachmentManager_signal_allow_signal_access_location">Allow Molly access to send your location.</string>
+    <!-- Toast text explaining Signal\'s need for location access -->
+    <string name="AttachmentManager_signal_needs_location_access">Molly needs location access to send your location.</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>
     <!-- Alert dialog description to send the recipient a request to activate payments -->
@@ -221,8 +229,8 @@
     <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_cant_find_who_youre_looking_for">Éprouvez-vous des difficultés à trouver qui vous cherchiez ?</string>
-    <string name="CameraContacts_invite_a_contact_to_join_signal">Inviter un contact à se joindre à Molly</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 Molly</string>
     <string name="CameraContacts__menu_search">Rechercher</string>
 
     <!-- Censorship Circumvention Megaphone -->
@@ -241,10 +249,10 @@
     <string name="ClientDeprecatedActivity_update">Mise à jour</string>
     <string name="ClientDeprecatedActivity_dont_update">Ne pas mettre à 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">Aucun navigateur Web n’a été trouvé.</string>
+    <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_start_voice_call">Passer un appel vocal ?</string>
@@ -270,7 +278,7 @@
     <!-- Label for my stories when selecting who to send media to -->
     <string name="ContactsCursorLoader_my_stories">Mes stories</string>
     <!-- Text for a button that brings up a bottom sheet to create a new story. -->
-    <string name="ContactsCursorLoader_new">Nouvelle Story</string>
+    <string name="ContactsCursorLoader_new">Nouvelle story</string>
     <!-- Header for conversation search section labeled "Chats" -->
     <string name="ContactsCursorLoader__chats">Conversations</string>
     <!-- Header for conversation search section labeled "Messages" -->
@@ -386,8 +394,16 @@
     <string name="ConversationActivity_your_request_to_join_has_been_sent_to_the_group_admin">Votre demande de vous joindre au groupe a été envoyée à son administrateur. Vous serez averti de sa décision.</string>
     <string name="ConversationActivity_cancel_request">Annuler la demande</string>
 
-    <string name="ConversationActivity_to_send_audio_messages_allow_signal_access_to_your_microphone">Pour envoyer des messages audio, autorisez l’accès de Molly à votre microphone.</string>
+    <!-- Dialog title asking users for microphone permission -->
+    <string name="ConversationActivity_allow_access_microphone">Allow access to your microphone</string>
+    <!-- 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>
+    <!-- Toast text explaining Signal\'s need for microphone access -->
+    <string name="ConversationActivity_signal_needs_microphone_access_voice_message">Molly needs microphone access to record a voice message.</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">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>
@@ -411,10 +427,17 @@
     <string name="ConversationActivity_you_will_leave_this_group_and_it_will_be_deleted_from_all_of_your_devices">Vous quitterez ce groupe et il sera supprimé de tous vos appareils.</string>
     <string name="ConversationActivity_delete">Supprimer</string>
     <string name="ConversationActivity_delete_and_leave">Supprimer et quitter</string>
-    <string name="ConversationActivity__to_call_s_signal_needs_access_to_your_microphone">Pour appeler %1$s, Molly a besoin d’accéder à votre microphone</string>
+
+    <!-- Dialog description that will explain the steps needed to give microphone permissions for a voice call -->
+    <string name="ConversationActivity__to_start_call">To start a 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">To start a call, allow Molly access to your microphone.</string>
+    <!-- Toast text explaining Signal\'s need for microphone access for a voice call -->
+    <string name="ConversationActivity_signal_needs_microphone_access_voice_call">Molly needs microphone access to start a call.</string>
 
 
     <string name="ConversationActivity_join">Me joindre</string>
+    <!-- Button text for an active group call but the call is currently full and unjoinable -->
     <string name="ConversationActivity_full">Complet</string>
 
     <string name="ConversationActivity_error_sending_media">Erreur d’envoi du média</string>
@@ -497,7 +520,7 @@
     <string name="ConversationFragment__review_banner_body">Cette personne porte le même nom qu’un autre contact.</string>
     <string name="ConversationFragment_contact_us">Nous contacter</string>
     <string name="ConversationFragment_verify">Confirmer</string>
-    <string name="ConversationFragment_not_now">Pas maintenant</string>
+    <string name="ConversationFragment_not_now">Plus tard</string>
     <string name="ConversationFragment_your_safety_number_with_s_changed">Votre numéro de sécurité avec %1$s a changé</string>
     <string name="ConversationFragment_your_safety_number_with_s_changed_likey_because_they_reinstalled_signal">Votre numéro de sécurité avec %1$s a changé, car cette personne a probablement réinstallé Signal ou changé d’appareil. Touchez Confirmer pour valider le nouveau numéro de sécurité. Cette action est facultative.</string>
     <!-- Dialog title for block group link join requests -->
@@ -613,6 +636,7 @@
     <string name="ConversationListFragment_unarchive">Désarchiver</string>
     <string name="ConversationListFragment_delete">Supprimer</string>
     <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>
@@ -676,7 +700,7 @@
 
     <!-- ChooseBackupFragment -->
     <string name="ChooseBackupFragment__restore_from_backup">Restaurer d’une sauvegarde ?</string>
-    <string name="ChooseBackupFragment__restore_your_messages_and_media">Restaurez vos messages et médias d’une sauvegarde locale. Si vous ne les restaurez pas maintenant, vous ne pourrez pas le faire plus tard.</string>
+    <string name="ChooseBackupFragment__restore_your_messages_and_media">Restaurez vos messages et médias depuis une sauvegarde locale. Si vous ne les restaurez pas maintenant, vous ne pourrez pas le faire plus tard.</string>
     <string name="ChooseBackupFragment__icon_content_description">Restaurez à partir de l’icône de sauvegarde</string>
     <string name="ChooseBackupFragment__choose_backup">Choisir une sauvegarde</string>
     <string name="ChooseBackupFragment__learn_more">En savoir plus</string>
@@ -686,7 +710,7 @@
     <string name="RestoreBackupFragment__restore_complete">La restauration est terminée.</string>
     <string name="RestoreBackupFragment__to_continue_using_backups_please_choose_a_folder">Pour continuer à utiliser les sauvegardes, veuillez choisir un dossier. Les nouvelles sauvegardes seront enregistrées dans cet emplacement.</string>
     <string name="RestoreBackupFragment__choose_folder">Sélectionner un dossier</string>
-    <string name="RestoreBackupFragment__not_now">Pas maintenant</string>
+    <string name="RestoreBackupFragment__not_now">Plus tard</string>
     <!-- Couldn\'t find the selected backup -->
     <string name="RestoreBackupFragment__backup_not_found">Sauvegarde non trouvée.</string>
     <!-- Couldn\'t read the selected backup -->
@@ -794,7 +818,7 @@
 
     <!-- DeviceListItem -->
     <string name="DeviceListItem_unnamed_device">Appareil sans nom</string>
-    <string name="DeviceListItem_linked_s">A été relié le %1$s</string>
+    <string name="DeviceListItem_linked_s">Associé le %1$s</string>
     <string name="DeviceListItem_last_active_s">Dernière activité %1$s</string>
     <string name="DeviceListItem_today">Aujourd’hui</string>
 
@@ -864,6 +888,7 @@
         <item quantity="one">Invitation envoyée</item>
         <item quantity="other">%1$d invitations envoyées</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">« %1$s » ne peut pas être ajouté automatiquement par vous à ce groupe.\n\nUne invitation a été envoyée et l’utilisateur ne verra aucun message du groupe tant que l’invitation n’aura pas été acceptée.</string>
     <string name="GroupManagement_invite_multiple_users">Ces utilisateurs ne peuvent pas être ajoutés automatiquement par vous à ce groupe.\n\nDes invitations ont été envoyées et ces utilisateurs ne verront aucun message du groupe tant que les invitations n’auront pas été acceptées.</string>
 
@@ -1044,7 +1069,9 @@
 
     <string name="ManageGroupActivity_edit_name_and_picture">Modifier le nom et l’image</string>
     <string name="ManageGroupActivity_legacy_group">Groupe hérité</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">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_upgrade_this_group">convertissez ce groupe</string>
@@ -1271,6 +1298,7 @@
         <item quantity="other">Supprimer</item>
     </plurals>
 
+    <!-- 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>
@@ -1289,9 +1317,9 @@
 
     <!-- Megaphones -->
     <string name="Megaphones_remind_me_later">Me le rappeler plus tard</string>
-    <string name="Megaphones_verify_your_signal_pin">Confirmer votre NIP Signal</string>
-    <string name="Megaphones_well_occasionally_ask_you_to_verify_your_pin">Nous vous demanderons de temps en temps de confirmer votre NIP afin que vous vous en souveniez.</string>
-    <string name="Megaphones_verify_pin">Confirmer le NIP</string>
+    <string name="Megaphones_verify_your_signal_pin">Confirmer votre code PIN Signal</string>
+    <string name="Megaphones_well_occasionally_ask_you_to_verify_your_pin">Nous vous demanderons occasionnellement de confirmer votre code PIN pour vous aider à le mémoriser.</string>
+    <string name="Megaphones_verify_pin">Confirmer le PIN</string>
     <string name="Megaphones_get_started">Commençons</string>
     <string name="Megaphones_new_group">Nouveau groupe</string>
     <string name="Megaphones_invite_friends">Inviter des amis</string>
@@ -1312,7 +1340,7 @@
     <string name="NotificationsMegaphone_turn_on_notifications">Activer les notifications ?</string>
     <string name="NotificationsMegaphone_never_miss_a_message">Ne manquez jamais un message de vos contacts ni de vos groupes.</string>
     <string name="NotificationsMegaphone_turn_on">Activer</string>
-    <string name="NotificationsMegaphone_not_now">Pas maintenant</string>
+    <string name="NotificationsMegaphone_not_now">Plus tard</string>
 
     <!-- NotificationMmsMessageRecord -->
     <string name="NotificationMmsMessageRecord_multimedia_message">Message multimédia</string>
@@ -1335,17 +1363,13 @@
     <string name="MessageRecord_left_group">Vous avez quitté le groupe</string>
     <string name="MessageRecord_you_updated_group">Vous avez mis le groupe à jour.</string>
     <string name="MessageRecord_the_group_was_updated">Le groupe a été mis à jour.</string>
-    <!-- Update message shown when placing an outgoing 1:1 voice/audio call and it\'s answered by the other party -->
+    <!-- Update message shown when placing an outgoing 1:1 voice/audio call -->
     <string name="MessageRecord_outgoing_voice_call">Appel vocal sortant</string>
-    <!-- Update message shown when placing an outgoing 1:1 video call and it\'s answered by the other party -->
+    <!-- Update message shown when placing an outgoing 1:1 video call -->
     <string name="MessageRecord_outgoing_video_call">Appel vidéo sortant</string>
-    <!-- Update message shown when placing an outgoing 1:1 voice/audio call and it\'s not answered by the other party -->
-    <string name="MessageRecord_unanswered_voice_call">Appel vocal sans réponse</string>
-    <!-- Update message shown when placing an outgoing 1:1 video call and it\'s not answered by the other party -->
-    <string name="MessageRecord_unanswered_video_call">Appel vidéo sans réponse</string>
-    <!-- Update message shown when receiving an incoming 1:1 voice/audio call and it\'s answered -->
+    <!-- Update message shown when receiving an incoming 1:1 voice/audio call and it\'s answered or ringing -->
     <string name="MessageRecord_incoming_voice_call">Appel vocal entrant</string>
-    <!-- Update message shown when receiving an incoming 1:1 video call and answered -->
+    <!-- Update message shown when receiving an incoming 1:1 video call and answered or ringing -->
     <string name="MessageRecord_incoming_video_call">Appel vidéo entrant</string>
     <!-- Update message shown when receiving an incoming 1:1 voice/audio call and not answered -->
     <string name="MessageRecord_missed_voice_call">Appel vocal manqué</string>
@@ -1355,10 +1379,6 @@
     <string name="MessageRecord_missed_voice_call_notification_profile">Appel vocal manqué lorsque le profil de notification était activé</string>
     <!-- Update message shown when receiving an incoming video call and declined due to notification profile -->
     <string name="MessageRecord_missed_video_call_notification_profile">Appel vidéo manqué lorsque le profil de notification était activé</string>
-    <!-- Update message shown when receiving an incoming 1:1 voice/audio call and explicitly declined -->
-    <string name="MessageRecord_you_declined_a_voice_call">Vous avez refusé un appel vocal</string>
-    <!-- Update message shown when receiving an incoming 1:1 video call and explicitly declined -->
-    <string name="MessageRecord_you_declined_a_video_call">Vous avez refusé un appel vidéo</string>
     <!-- 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 a mis le groupe à jour.</string>
@@ -1567,30 +1587,55 @@
     <string name="MessageRecord_can_accept_payments">%1$s accepte désormais les paiements</string>
 
     <!-- Group Calling update messages -->
-    <string name="MessageRecord_s_started_a_group_call_s">%1$s a lancé un appel de groupe · %2$s</string>
-    <string name="MessageRecord_you_started_a_group_call_s">Vous avez lancé un appel de groupe · %1$s</string>
-    <string name="MessageRecord_s_is_in_the_group_call_s">%1$s fait partie de l’appel de groupe · %2$s</string>
-    <string name="MessageRecord_you_are_in_the_group_call_s1">Vous faites partie de l’appel de groupe · %1$s</string>
-    <string name="MessageRecord_s_and_s_are_in_the_group_call_s1">%1$s et %2$s font partie de l’appel de groupe · %3$s</string>
-    <string name="MessageRecord_group_call_s">Appel de groupe · %1$s</string>
-
-    <string name="MessageRecord_s_started_a_group_call">%1$s a lancé un appel de groupe</string>
-    <string name="MessageRecord_you_started_a_group_call">Vous avez lancé un appel de groupe</string>
-    <string name="MessageRecord_s_is_in_the_group_call">%1$s fait partie de l’appel de groupe</string>
-    <string name="MessageRecord_you_are_in_the_group_call">Vous faites partie de l’appel de groupe</string>
-    <string name="MessageRecord_s_and_s_are_in_the_group_call">%1$s et %2$s font partie de l’appel de groupe</string>
-    <string name="MessageRecord_group_call">Appel de groupe</string>
+    <!-- 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 a rejoint l’appel · %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">Vous avez rejoint l’appel · %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 et %2$s ont rejoint l’appel · %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 a rejoint l’appel</string>
+    <!-- Chat log text for an ongoing group call only the local user has joined -->
+    <string name="MessageRecord_you_are_in_the_call">Vous avez rejoint l’appel</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 et %2$s ont rejoint l’appel</string>
+    <!-- Chat log text for a group call that ended within the last 5 minutes -->
+    <string name="MessageRecord__the_video_call_has_ended">L’appel vidéo est terminé</string>
+    <!-- Chat log text for a group call that ended within the last 5 minutes with a placeholder for formatted time -->
+    <string name="MessageRecord__the_video_call_has_ended_s">L’appel vidéo est terminé · %1$s</string>
+    <!-- Chat log text for a group call that ended more than 5 minutes ago and was missed -->
+    <string name="MessageRecord__missed_video_call">Appel vidéo manqué</string>
+    <!-- Chat log text for a group call that ended more than 5 minutes ago and was missed with a placeholder for formatted time -->
+    <string name="MessageRecord__missed_video_call_s">Appel vidéo manqué – %1$s</string>
+    <!-- Chat log text for a group call that ended that the local user did not start -->
+    <string name="MessageRecord__incoming_video_call">Appel vidéo entrant</string>
+    <!-- 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">Appel vidéo entrant · %1$s</string>
+    <!-- Chat log text for a group call that ended that the local user started -->
+    <string name="MessageRecord__outgoing_video_call">Appel vidéo sortant</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">Appel vidéo sortant · %1$s</string>
+    <!-- Chat log text for an ongoing group call that the local user started -->
+    <string name="MessageRecord__you_started_a_video_call">Vous avez démarré un appel vidéo</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">Vous avez démarré un appel vidéo · %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 a démarré un appel vidéo</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 a démarré un appel vidéo · %2$s</string>
 
     <string name="MessageRecord_you">Vous</string>
 
-    <plurals name="MessageRecord_s_s_and_d_others_are_in_the_group_call_s">
-        <item quantity="one">%1$s, %2$s, et %3$d autre personne font partie de l’appel de groupe · %4$s</item>
-        <item quantity="other">%1$s, %2$s, et %3$d autres personnes font partie de l’appel de groupe · %4$s</item>
+    <!-- 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 et %3$d autre personne participent à l’appel de groupe · %4$s</item>
+        <item quantity="other">%1$s, %2$s et %3$d autres personnes participent à l’appel de groupe · %4$s</item>
     </plurals>
 
-    <plurals name="MessageRecord_s_s_and_d_others_are_in_the_group_call">
-        <item quantity="one">%1$s, %2$s, et %3$d autre personne font partie de l’appel de groupe</item>
-        <item quantity="other">%1$s, %2$s, et %3$d autres personnes font partie de l’appel de groupe</item>
+    <!-- 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 et %3$d autre personne participent à l’appel de groupe</item>
+        <item quantity="other">%1$s, %2$s et %3$d autres personnes participent à l’appel de groupe</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. -->
@@ -1622,7 +1667,7 @@
     <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_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">Vous joindre à ce groupe et partager votre nom et votre photo avec ses membres ? Ils ne sauront pas que vous avez vu leurs messages tant que vous n’aurez pas accepté.</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>
     <string name="MessageRequestBottomView_join_this_group_they_wont_know_youve_seen_their_messages_until_you_accept">Vous joindre à ce groupe ? Ses membres ne sauront pas que vous avez lu leurs messages tant que vous n’aurez pas accepté.</string>
     <string name="MessageRequestBottomView_unblock_this_group_and_share_your_name_and_photo_with_its_members">Débloquer ce groupe et partager vos nom et photo avec ses membres ? Vous ne recevrez aucun message tant que vous ne l’aurez pas débloqué.</string>
@@ -1671,7 +1716,7 @@
     <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">Désolé, trop d’appareils sont déjà reliés. Essayez d’en supprimer</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_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>
@@ -1705,12 +1750,12 @@
     <string name="PlayServicesProblemFragment_the_version_of_google_play_services_you_have_installed_is_not_functioning">La version des services Google Play installée ne fonctionne pas correctement. Veuillez réinstaller les Services Google Play et réessayer.</string>
 
     <!-- PinRestoreEntryFragment -->
-    <string name="PinRestoreEntryFragment_incorrect_pin">Le NIP est erroné</string>
-    <string name="PinRestoreEntryFragment_skip_pin_entry">Ignorer la saisie du NIP ?</string>
+    <string name="PinRestoreEntryFragment_incorrect_pin">Code PIN incorrect.</string>
+    <string name="PinRestoreEntryFragment_skip_pin_entry">Ne pas saisir de code PIN ?</string>
     <string name="PinRestoreEntryFragment_need_help">Besoin d’aide ?</string>
-    <string name="PinRestoreEntryFragment_your_pin_is_a_d_digit_code">Votre NIP est un code à %1$d chiffres ou plus que vous avez créé et qui peut être numérique ou alphanumérique. Si vous avez oublié votre NIP, vous pouvez en créer un nouveau. Vous pouvez vous inscrire et utiliser votre compte, mais vous perdrez certains paramètres enregistrés tels que les informations de votre profil.</string>
-    <string name="PinRestoreEntryFragment_if_you_cant_remember_your_pin">Si vous ne vous souvenez pas de votre NIP, vous pouvez en créer un nouveau. Vous pouvez vous inscrire et utiliser votre compte, mais vous perdrez certains paramètres enregistrés tels que les informations de votre profil.</string>
-    <string name="PinRestoreEntryFragment_create_new_pin">Créer un nouveau NIP</string>
+    <string name="PinRestoreEntryFragment_your_pin_is_a_d_digit_code">Votre code PIN est un code numérique ou alphanumérique que vous avez créé et qui comporte %1$d caractères ou plus.\n\n Si vous l’avez oublié, vous pouvez en créer un nouveau. Vous pourrez vous inscrire et utiliser votre compte, mais vous perdrez certains paramètres enregistrés, tels que les informations de profil.</string>
+    <string name="PinRestoreEntryFragment_if_you_cant_remember_your_pin">Si vous ne vous souvenez pas de votre code PIN, vous pouvez en créer un nouveau. Vous pourrez vous inscrire et utiliser votre compte, mais vous perdrez certains paramètres enregistrés, tels que les informations de profil.</string>
+    <string name="PinRestoreEntryFragment_create_new_pin">Créer un nouveau PIN</string>
     <string name="PinRestoreEntryFragment_contact_support">Contacter l’assistance</string>
     <string name="PinRestoreEntryFragment_cancel">Annuler</string>
     <string name="PinRestoreEntryFragment_skip">Ignorer</string>
@@ -1718,12 +1763,12 @@
         <item quantity="one">Il vous reste %1$d essai. Si vous épuisez le nombre limite d’essais, vous pouvez créer un nouveau PIN. Vous pouvez vous inscrire et utiliser votre compte, mais vous perdrez certains paramètres enregistrés tels que les informations de votre profil.</item>
         <item quantity="other">Il vous reste %1$d essais. Si vous épuisez le nombre limite d’essais, vous pouvez créer un nouveau PIN. Vous pouvez vous inscrire et utiliser votre compte, mais vous perdrez certains paramètres enregistrés tels que les informations de votre profil.</item>
     </plurals>
-    <string name="PinRestoreEntryFragment_signal_registration_need_help_with_pin">Inscription à Signal – Besoin d’aide avec le NIP sur Android</string>
+    <string name="PinRestoreEntryFragment_signal_registration_need_help_with_pin">Inscription à Signal – Besoin d’aide : code PIN sous Android</string>
 
     <!-- PinRestoreLockedFragment -->
-    <string name="PinRestoreLockedFragment_create_your_pin">Créer votre NIP</string>
-    <string name="PinRestoreLockedFragment_youve_run_out_of_pin_guesses">Vous avez épuisé tous vos essais de NIP, mais vous pouvez encore accéder à votre compte Signal en créant un nouveau NIP. Afin de protéger vos données personnelles et votre sécurité, votre compte sera restauré sans informations de profil enregistrées ni préférences.</string>
-    <string name="PinRestoreLockedFragment_create_new_pin">Créer un nouveau NIP</string>
+    <string name="PinRestoreLockedFragment_create_your_pin">Créer un code PIN</string>
+    <string name="PinRestoreLockedFragment_youve_run_out_of_pin_guesses">Vous avez dépassé le nombre de tentatives autorisées. Pour accéder à votre compte Signal, vous devez créer un nouveau code PIN. Afin de protéger vos données personnelles et votre sécurité, votre compte sera restauré sans informations de profil, ni paramètres enregistrés.</string>
+    <string name="PinRestoreLockedFragment_create_new_pin">Créer un nouveau PIN</string>
   <!-- Removed by excludeNonTranslatables <string name="PinRestoreLockedFragment_learn_more_url" translatable="false">https://support.signal.org/hc/articles/360007059792</string> -->
 
     <!-- Dialog button text indicating user wishes to send an sms code isntead of skipping it -->
@@ -1739,8 +1784,8 @@
 
     <!-- PinOptOutDialog -->
     <string name="PinOptOutDialog_warning">Avertissement</string>
-    <string name="PinOptOutDialog_if_you_disable_the_pin_you_will_lose_all_data">Si vous désactivez le PIN, vous perdrez toutes vos données lors de votre réinscription sur Signal, à moins que vous ne les sauvegardiez et les restauriez manuellement. Vous ne pouvez pas activer le blocage de l’inscription si le PIN est désactivé.</string>
-    <string name="PinOptOutDialog_disable_pin">Désactiver le NIP</string>
+    <string name="PinOptOutDialog_if_you_disable_the_pin_you_will_lose_all_data">La désactivation du code PIN entraînera la perte de toutes vos données lors de votre réinscription sur Signal, à moins de procéder à une sauvegarde et une restauration manuelles. Vous ne pouvez pas activer le blocage d’inscription si le code PIN est désactivé.</string>
+    <string name="PinOptOutDialog_disable_pin">Désactiver le code PIN</string>
 
     <!-- RatingManager -->
     <string name="RatingManager_rate_this_app">Notez cette appli</string>
@@ -1766,7 +1811,7 @@
     <!-- Recipient -->
     <string name="Recipient_you">Vous</string>
     <!-- Name of recipient representing user\'s \'My Story\' -->
-    <string name="Recipient_my_story">Ma Story</string>
+    <string name="Recipient_my_story">Ma story</string>
     <!-- Name of recipient for a call link without a name -->
     <string name="Recipient_signal_call">Appel Molly</string>
 
@@ -1785,7 +1830,7 @@
     <string name="RedPhone_network_failed">Erreur du réseau.</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">Compris</string>
+    <string name="RedPhone_got_it">J’ai compris</string>
 
     <!-- Valentine\'s Day Megaphone -->
     <!-- Title text for the Valentine\'s Day donation megaphone. The placeholder will always be a heart emoji. Needs to be a placeholder for Android reasons. -->
@@ -1805,7 +1850,7 @@
     <!-- Positive action for bluetooth warning dialog to open settings -->
     <string name="WebRtcCallActivity__open_settings">Ouvrir les paramètres</string>
     <!-- Negative action for bluetooth warning dialog to dismiss dialog -->
-    <string name="WebRtcCallActivity__not_now">Pas maintenant</string>
+    <string name="WebRtcCallActivity__not_now">Plus tard</string>
     <!-- Title for dialog to approve all requests -->
     <plurals name="WebRtcCallActivity__approve_d_requests">
         <item quantity="one">Accepter %1$d demande ?</item>
@@ -2063,6 +2108,7 @@
     <!-- Generic error when the app is unable to request an SMS code for an unknown reason. -->
     <string name="RegistrationActivity_unable_to_request_verification_code">Demande de code de vérification impossible. Vérifiez votre connexion réseau puis réessayez.</string>
     <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">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.-->
@@ -2106,9 +2152,9 @@
     <string name="RegistrationActivity_support_bottom_sheet_cta_contact_support_substring">Contacter l’assistance</string>
 
     <!-- RegistrationLockV2Dialog -->
-    <string name="RegistrationLockV2Dialog_turn_on_registration_lock">Activer le blocage de l’inscription ?</string>
-    <string name="RegistrationLockV2Dialog_turn_off_registration_lock">Désactiver le blocage de l’inscription ?</string>
-    <string name="RegistrationLockV2Dialog_if_you_forget_your_signal_pin_when_registering_again">Si vous oubliez votre NIP Signal lors d’une nouvelle inscription à Signal, vous ne pourrez pas accéder à votre compte pendant sept jours.</string>
+    <string name="RegistrationLockV2Dialog_turn_on_registration_lock">Activer le blocage d’inscription ?</string>
+    <string name="RegistrationLockV2Dialog_turn_off_registration_lock">Désactiver le blocage d’inscription ?</string>
+    <string name="RegistrationLockV2Dialog_if_you_forget_your_signal_pin_when_registering_again">Si vous ne vous souvenez plus de votre code PIN au moment de vous réinscrire à Signal, vous ne pourrez pas accéder à votre compte pendant sept jours.</string>
     <string name="RegistrationLockV2Dialog_turn_on">Activer</string>
     <string name="RegistrationLockV2Dialog_turn_off">Désactiver</string>
 
@@ -2150,12 +2196,12 @@
     <string name="SignalBottomActionBar_more">Plus</string>
 
     <!-- SignalPinReminders -->
-    <string name="SignalPinReminders_well_remind_you_again_later">Le NIP a été confirmé avec succès. Nous vous le rappellerons plus tard.</string>
-    <string name="SignalPinReminders_well_remind_you_again_tomorrow">Le NIP a été confirmé avec succès. Nous vous le rappellerons demain.</string>
-    <string name="SignalPinReminders_well_remind_you_again_in_a_few_days">Le NIP a été confirmé avec succès. Nous vous le rappellerons dans quelques jours.</string>
-    <string name="SignalPinReminders_well_remind_you_again_in_a_week">Le NIP a été confirmé avec succès. Nous vous le rappellerons dans une semaine.</string>
-    <string name="SignalPinReminders_well_remind_you_again_in_a_couple_weeks">Le NIP a été confirmé avec succès. Nous vous le rappellerons dans quelques semaines.</string>
-    <string name="SignalPinReminders_well_remind_you_again_in_a_month">Le NIP a été confirmé avec succès. Nous vous le rappellerons dans un mois.</string>
+    <string name="SignalPinReminders_well_remind_you_again_later">Vous avez bien confirmé votre code PIN. Nous vous le redemanderons plus tard.</string>
+    <string name="SignalPinReminders_well_remind_you_again_tomorrow">Vous avez bien confirmé votre code•PIN. Nous vous le redemanderons demain.</string>
+    <string name="SignalPinReminders_well_remind_you_again_in_a_few_days">Vous avez bien confirmé votre code•PIN. Nous vous le redemanderons dans quelques jours.</string>
+    <string name="SignalPinReminders_well_remind_you_again_in_a_week">Vous avez bien confirmé votre code•PIN. Nous vous le redemanderons dans une semaine.</string>
+    <string name="SignalPinReminders_well_remind_you_again_in_a_couple_weeks">Vous avez bien confirmé votre code•PIN. Nous vous le redemanderons dans quelques semaines.</string>
+    <string name="SignalPinReminders_well_remind_you_again_in_a_month">Vous avez bien confirmé votre code•PIN. Nous vous le redemanderons dans un mois.</string>
 
     <!-- Slide -->
     <string name="Slide_image">Image</string>
@@ -2207,13 +2253,13 @@
     <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>
 
     <!-- SupportEmailUtil -->
-  <!-- Removed by excludeNonTranslatables <string name="SupportEmailUtil_support_email" translatable="false">support@molly.im</string> -->
+  <!-- Removed by excludeNonTranslatables <string name="SupportEmailUtil_support_email" translatable="false">support@signal.org</string> -->
     <string name="SupportEmailUtil_filter">Filtre :</string>
     <string name="SupportEmailUtil_device_info">Info sur l’appareil :</string>
     <string name="SupportEmailUtil_android_version">Version d’Android :</string>
     <string name="SupportEmailUtil_signal_version">Version de Molly :</string>
     <string name="SupportEmailUtil_signal_package">Package Molly :</string>
-    <string name="SupportEmailUtil_registration_lock">Blocage de l’inscription :</string>
+    <string name="SupportEmailUtil_registration_lock">Blocage d’inscription :</string>
     <string name="SupportEmailUtil_locale">Paramètres régionaux :</string>
 
     <!-- ThreadRecord -->
@@ -2245,7 +2291,7 @@
     <string name="ThreadRecord_you_marked_unverified">Vous avez marqué comme non confirmé</string>
     <string name="ThreadRecord_message_could_not_be_processed">Le message n’a pas pu être traité</string>
     <string name="ThreadRecord_delivery_issue">Problème de remise</string>
-    <string name="ThreadRecord_message_request">Demande de message</string>
+    <string name="ThreadRecord_message_request">Invitation par message</string>
     <!-- Thread preview for a recipient that has been hidden -->
     <string name="ThreadRecord_hidden_recipient">Vous avez masqué ce contact. Écrivez-lui de nouveau pour l’ajouter à votre liste.</string>
     <string name="ThreadRecord_photo">Photo</string>
@@ -2311,7 +2357,7 @@
     <string name="UsernameEditFragment__usernames_let_others_message">Les noms d’utilisateur sont toujours associés à une série de chiffres.</string>
     <!-- Dialog title for explanation about numbers at the end of the username -->
     <string name="UsernameEditFragment__what_is_this_number">Qu\'est-ce que ce numéro ?</string>
-    <string name="UsernameEditFragment__these_digits_help_keep">Ces chiffres servent à préserver la confidentialité de votre identité correspondant au nom d\'utilisatuer choisi et ainsi d\'éviter les messages indésirables. Ne partagez votre nom d’utilisateur qu\'avec les personnes et les groupes avec lesquels vous souhaitez échanger. Si vous changez votre nom d’utilisateur, un nouvel ensemble de chiffres vous sera attribué.</string>
+    <string name="UsernameEditFragment__these_digits_help_keep">Ces chiffres servent à protéger la confidentialité de votre nom d\'utilisateur, vous évitant ainsi de recevoir des messages indésirables. Ne partagez votre nom d’utilisateur qu’avec les personnes et les groupes avec lesquels vous voulez discuter. Si vous changez de nom d’utilisateur, une nouvelle série de chiffres vous sera attribuée.</string>
     <!-- Button to allow user to skip -->
     <string name="UsernameEditFragment__skip">Ignorer</string>
     <!-- Content description for done button -->
@@ -2513,7 +2559,7 @@
     <!-- SingleRecipientNotificationBuilder -->
     <string name="SingleRecipientNotificationBuilder_signal">Molly</string>
     <string name="SingleRecipientNotificationBuilder_new_message">Nouveau message</string>
-    <string name="SingleRecipientNotificationBuilder_message_request">Demande d’échange de messages</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>
@@ -2522,7 +2568,7 @@
     <!-- Fragment title, displayed at the top of the content -->
     <string name="NewWaysToConnectDialogFragment__new_ways_to_connect">De nouvelles façons de rester en contact</string>
     <!-- Row item title for phone number privacy explainer -->
-    <string name="NewWaysToConnectDialogFragment__phone_number_privacy">Numéro de téléphone protégé</string>
+    <string name="NewWaysToConnectDialogFragment__phone_number_privacy">Confidentialité du numéro de téléphone</string>
     <!-- Row item description for phone number privacy explainer -->
     <string name="NewWaysToConnectDialogFragment__your_phone_number_is_no_longer_shared">Votre numéro de téléphone ne s’affiche plus dans les conversations. Il reste cependant visible aux utilisateurs qui l’ont déjà enregistré dans leurs contacts.</string>
     <!-- Row item title for usernames explainer -->
@@ -2534,7 +2580,7 @@
     <!-- Row item description for qr code and links explainer -->
     <string name="NewWaysToConnectDialogFragment__usernames_have_a_unique_qr_code">Les noms d’utilisateur sont associés à des codes QR uniques et des liens que vous pouvez envoyer à vos amis afin de démarrer rapidement une conversation.</string>
     <!-- Button label for not right now -->
-    <string name="NewWaysToConnectDialogFragment__not_now">Pas maintenant</string>
+    <string name="NewWaysToConnectDialogFragment__not_now">Plus tard</string>
     <!-- Button label for continue -->
     <string name="NewWaysToConnectDialogFragment__set_up_your_username">Configurer le nom d’utilisateur</string>
 
@@ -2574,9 +2620,9 @@
     <!-- 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 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">L’appel a été pris sur un appareil relié.</string>
-    <string name="WebRtcCallActivity__declined_on_a_linked_device">L’appel a été refusé sur un appareil relié.</string>
-    <string name="WebRtcCallActivity__busy_on_a_linked_device">Occupé sur un appareil relié.</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>
 
@@ -2669,8 +2715,8 @@
     </plurals>
     <!-- Displays number of viewers for a story -->
     <plurals name="contact_selection_list_item__number_of_viewers">
-        <item quantity="one">%1$d spectateur</item>
-        <item quantity="other">%1$d spectateurs</item>
+        <item quantity="one">%1$d personne</item>
+        <item quantity="other">%1$d personnes</item>
     </plurals>
 
     <!-- conversation_activity -->
@@ -2709,6 +2755,8 @@
     <string name="ConversationUpdateItem_loading">Chargement</string>
     <string name="ConversationUpdateItem_learn_more">En savoir plus</string>
     <string name="ConversationUpdateItem_join_call">Me joindre à l’appel</string>
+    <!-- Action button label for starting a new call in the current conversation -->
+    <string name="ConversationUpdateItem_call_back">Rappeler</string>
     <string name="ConversationUpdateItem_return_to_call">Revenir à l’appel</string>
     <string name="ConversationUpdateItem_call_is_full">L’appel est complet</string>
     <string name="ConversationUpdateItem_invite_friends">Inviter des amis</string>
@@ -2760,7 +2808,7 @@
     <!-- 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 Molly.</string>
     <!-- Button to dismiss the tooltip for opting out of using Android bubbles -->
-    <string name="BubbleOptOutTooltip__not_now">Pas maintenant</string>
+    <string name="BubbleOptOutTooltip__not_now">Plus tard</string>
     <!-- Button to move to the system settings to control the use of Android bubbles -->
     <string name="BubbleOptOutTooltip__turn_off">Désactiver</string>
 
@@ -2773,6 +2821,7 @@
     <string name="safety_number_change_dialog__leave_call">Quitter l’appel</string>
     <string name="safety_number_change_dialog__the_following_people_may_have_reinstalled_or_changed_devices">Les personnes suivantes ont peut-être réinstallé Signal ou changé d’appareil. Pour assurer la confidentialité, confirmez votre numéro de sécurité avec elles.</string>
     <string name="safety_number_change_dialog__view">Afficher</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">Confirmé précédemment</string>
 
     <!-- EnableCallNotificationSettingsDialog__call_notifications_checklist -->
@@ -2781,11 +2830,11 @@
     <string name="EnableCallNotificationSettingsDialog__enable_background_activity">Activer l’activité d’arrière-plan</string>
     <string name="EnableCallNotificationSettingsDialog__everything_looks_good_now">Tout semble en ordre maintenant !</string>
     <string name="EnableCallNotificationSettingsDialog__to_receive_call_notifications_tap_here_and_turn_on_show_notifications">Pour recevoir les notifications d’appel, appuyez ici et activez l’option « Afficher les notifications ».</string>
-    <string name="EnableCallNotificationSettingsDialog__to_receive_call_notifications_tap_here_and_turn_on_notifications">Pour recevoir les notifications d\'appel, touchez ici, activez les notifications et assurez-vous que le son et les fenêtres surgissantes sont activées.</string>
+    <string name="EnableCallNotificationSettingsDialog__to_receive_call_notifications_tap_here_and_turn_on_notifications">Pour recevoir les notifications d’appel, touchez cette option, activez les notifications et vérifiez que le son et les pop-ups sont bien activés.</string>
     <string name="EnableCallNotificationSettingsDialog__to_receive_call_notifications_tap_here_and_enable_background_activity_in_battery_settings">Pour recevoir les notifications d’appel, touchez ici et activez l’activité d’arrière-plan dans la section « Batterie/Pile » des paramètres. </string>
     <string name="EnableCallNotificationSettingsDialog__settings">Paramètres</string>
     <string name="EnableCallNotificationSettingsDialog__to_receive_call_notifications_tap_settings_and_turn_on_show_notifications">Pour recevoir les notifications d’appel, appuyez sur Réglages et activez l’option « Afficher les notifications ».</string>
-    <string name="EnableCallNotificationSettingsDialog__to_receive_call_notifications_tap_settings_and_turn_on_notifications">Pour recevoir les notifications d\'appel, touchez Paramètres, activez les notifications et assurez-vous que le son et les fenêtres surgissantes sont activées.</string>
+    <string name="EnableCallNotificationSettingsDialog__to_receive_call_notifications_tap_settings_and_turn_on_notifications">Pour recevoir les notifications d\'appel, touchez Paramètres, activez les notifications et vérifiez que le son et les pop-ups sont bien activés.</string>
     <string name="EnableCallNotificationSettingsDialog__to_receive_call_notifications_tap_settings_and_enable_background_activity_in_battery_settings">Pour recevoir les notifications d’appel, touchez Paramètres et activez l’activité d’arrière-plan dans la section « Batterie/Pile » des paramètres.</string>
 
     <!-- country_selection_fragment -->
@@ -2800,7 +2849,7 @@
     <string name="device_link_fragment__link_device">Associer l’appareil</string>
 
     <!-- device_list_fragment -->
-    <string name="device_list_fragment__no_devices_linked">Aucun appareil n’est relié</string>
+    <string name="device_list_fragment__no_devices_linked">Aucun appareil associé</string>
     <string name="device_list_fragment__link_new_device">Associer un nouvel appareil</string>
 
     <!-- expiration -->
@@ -2951,7 +3000,7 @@
 
     <!-- verify_display_fragment -->
     <!-- 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">Pour vérifier le chiffrement de bout en bout avec %1$s, comparez les chiffres ci-dessus avec leur appareil. Vous pouvez aussi scanner le code sur leur appareil.</string>
+    <string name="verify_display_fragment__pnp_verify_safety_numbers_explanation_with_s">Pour vérifier le chiffrement de bout en bout de vos communications avec %1$s, comparez les chiffres ci-dessus avec ceux de son appareil. Vous pouvez aussi scanner le code QR qui s’affiche sur son appareil.</string>
     <string name="verify_display_fragment__tap_to_scan">Touchez pour lire</string>
     <string name="verify_display_fragment__successful_match">Correspondance effective</string>
     <string name="verify_display_fragment__failed_to_verify_safety_number">Échec de la confirmation du numéro de sécurité.</string>
@@ -3086,6 +3135,7 @@
 
     <string name="arrays__default">Valeur par défaut</string>
     <string name="arrays__high">Élevée</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">Maximale</string>
 
     <!-- plurals.xml -->
@@ -3191,14 +3241,14 @@
     <string name="preferences__app_icon_learn_more">En savoir plus</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">Graphique illustrant l’endroit où l’icône de l’application de remplacement sera visible.</string>
-    <string name="preferences__disable_pin">Désactiver le NIP</string>
-    <string name="preferences__enable_pin">Activer le NIP</string>
-    <string name="preferences__if_you_disable_the_pin_you_will_lose_all_data">Si vous désactivez le NIP, vous perdrez toutes vos données lors de votre réinscription sur Signal, à moins que vous ne les sauvegardiez et les restauriez manuellement. Vous ne pouvez pas activer le blocage de l’inscription si le NIP est désactivé.</string>
-    <string name="preferences__pins_keep_information_stored_with_signal_encrypted_so_only_you_can_access_it">Les NIP font en sorte que les informations sont enregistrées chiffrées dans Signal afin que vous seul puissiez y accéder. Votre profil, vos paramètres et vos contacts seront restaurés quand vous réinstallerez Signal. Vous n’aurez pas besoin de votre NIP pour ouvrir l’appli.</string>
+    <string name="preferences__disable_pin">Désactiver le code PIN</string>
+    <string name="preferences__enable_pin">Activer le code PIN</string>
+    <string name="preferences__if_you_disable_the_pin_you_will_lose_all_data">La désactivation du code PIN entraînera la perte de toutes vos données lors de votre réinscription sur Signal, à moins de procéder à une sauvegarde et une restauration manuelles. Vous ne pouvez pas activer le blocage d’inscription si le code PIN est désactivé.</string>
+    <string name="preferences__pins_keep_information_stored_with_signal_encrypted_so_only_you_can_access_it">Avec un code PIN, les informations stockées dans Signal sont chiffrées, et vous seul y avez accès. Votre profil, vos contacts et vos paramètres sont restaurés si vous réinstallez Signal. Vous n’avez pas besoin du code PIN pour ouvrir l’appli.</string>
     <string name="preferences__system_default">Valeur par défaut du système</string>
     <string name="preferences__language">Langue</string>
     <string name="preferences__signal_messages_and_calls">Appels et messages Signal</string>
-    <string name="preferences__advanced_pin_settings">Paramètres de NIP avancés</string>
+    <string name="preferences__advanced_pin_settings">Paramètres de PIN avancés</string>
     <string name="preferences__free_private_messages_and_calls">Messages et appels gratuits et confidentiels vers les utilisateurs de Signal</string>
     <string name="preferences__submit_debug_log">Envoyer le journal de débogage</string>
     <string name="preferences__delete_account">Supprimer le compte</string>
@@ -3357,7 +3407,7 @@
     <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 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>
@@ -3370,7 +3420,7 @@
     <!-- Alert dialog button to enable payment lock -->
     <string name="PaymentsHomeFragment__enable">Activer</string>
     <!-- Alert dialog button to not enable payment lock for now -->
-    <string name="PaymentsHomeFragment__not_now">Pas maintenant</string>
+    <string name="PaymentsHomeFragment__not_now">Plus tard</string>
     <!-- Alert dialog title which shows up to update app to send payments -->
     <string name="PaymentsHomeFragment__update_required">Mise à jour requise</string>
     <!-- Alert dialog description that app update is required to send payments-->
@@ -3382,7 +3432,7 @@
 
     <!-- GrantPermissionsFragment -->
     <!-- Displayed as a text-only action button at the bottom start of the screen -->
-    <string name="GrantPermissionsFragment__not_now">Pas maintenant</string>
+    <string name="GrantPermissionsFragment__not_now">Plus tard</string>
     <!-- Displayed as an action button at the bottom end of the screen -->
     <string name="GrantPermissionsFragment__next">Suivant</string>
     <!-- Displayed as a title at the top of the screen -->
@@ -3406,6 +3456,14 @@
     <!-- Storage permission row description -->
     <string name="GrantPermissionsFragment__send_photos_videos_and_files">Envoyez des photos, vidéos et fichiers depuis votre appareil.</string>
 
+    <!-- PermissionDeniedBottomSheet -->
+    <!-- Sheet describing step 1 on how to give permissions by opening settings -->
+    <string name="PermissionDeniedBottomSheet__1_tap_settings_below">1. Tap “Settings” below</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 Allow the permission</string>
+    <!-- Label for button at the bottom of the sheet which opens the system permission settings -->
+    <string name="PermissionDeniedBottomSheet__settings">Settings</string>
+
     <!-- PaymentsSecuritySetupFragment -->
     <!-- Toolbar title -->
     <string name="PaymentsSecuritySetupFragment__security_setup">Paramètres de sécurité</string>
@@ -3416,7 +3474,7 @@
     <!-- Option to enable payment lock -->
     <string name="PaymentsSecuritySetupFragment__enable_payment_lock">Activer le verrouillage des paiements</string>
     <!-- Option to cancel -->
-    <string name="PaymentsSecuritySetupFragment__not_now">Pas maintenant</string>
+    <string name="PaymentsSecuritySetupFragment__not_now">Plus tard</string>
     <!-- Dialog title to confirm skipping the step -->
     <string name="PaymentsSecuritySetupFragment__skip_this_step">Passer cette étape ?</string>
     <!-- Dialog description to let users know why payment lock is required -->
@@ -3446,6 +3504,7 @@
     <string name="PaymentsDetailsFragment__sent_to_s">Envoyé à %1$s</string>
     <string name="PaymentsDetailsFragment__you_on_s_at_s">Vous, le %1$s à %2$s</string>
     <string name="PaymentsDetailsFragment__s_on_s_at_s">%1$s, le %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">De</string>
     <string name="PaymentsDetailsFragment__information">Le détail des transactions, dont le montant des paiements et l’heure des transactions font partie du Grand-livre MobileCoin.</string>
@@ -3508,6 +3567,7 @@
     <string name="ConfirmPayment__confirm_payment">Confirmer le paiement</string>
     <string name="ConfirmPayment__network_fee">Frais de réseau</string>
     <string name="ConfirmPayment__estimated_s">%1$s estimés</string>
+    <!-- Prefix to a name to indicate who a payment will be sent to -->
     <string name="ConfirmPayment__to">À</string>
     <string name="ConfirmPayment__total_amount">Montant total</string>
     <string name="ConfirmPayment__balance_s">Solde : %1$s</string>
@@ -3615,7 +3675,7 @@
     <!-- conversation_list_fragment -->
     <string name="conversation_list_fragment__fab_content_description">Nouvelle conversation</string>
     <string name="conversation_list_fragment__open_camera_description">Ouvrir l’appareil photo</string>
-    <string name="conversation_list_fragment__no_chats_yet_get_started_by_messaging_a_friend">Aucune conversation pour l’instant.\nCommencez en envoyant un message à un ami.</string>
+    <string name="conversation_list_fragment__no_chats_yet_get_started_by_messaging_a_friend">Aucune conversation pour le moment.\nPour commencer, envoyez un message à un ami.</string>
 
 
     <!-- conversation_secure_verified -->
@@ -3658,6 +3718,14 @@
     <string name="conversation_group_options__conversation">Conversation</string>
     <string name="conversation_group_options__broadcast">Diffusion</string>
 
+    <!-- DoubleTapEditEducationSheet -->
+    <!-- Displayed as the title of the education bottom sheet -->
+    <string name="DoubleTapEditEducationSheet__double_tap_edit_title">Double tap to edit</string>
+    <!-- Text on the sheet explaining how double tapping on a message will let them edit it -->
+    <string name="DoubleTapEditEducationSheet__quickly_tap_twice">Quickly tap twice on your messages to edit them. You can edit your messages up to 24hrs after they’ve been sent.</string>
+    <!-- Button label to dismiss sheet -->
+    <string name="DoubleTapEditEducationSheet__got_it">Got it</string>
+
     <!-- text_secure_normal -->
     <string name="text_secure_normal__menu_new_group">Nouveau groupe</string>
     <string name="text_secure_normal__menu_settings">Paramètres</string>
@@ -3702,9 +3770,9 @@
     <!-- BaseKbsPinFragment -->
     <string name="BaseKbsPinFragment__next">Suivant</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">Créer un NIP alphanumérique</string>
+    <string name="BaseKbsPinFragment__create_alphanumeric_pin">Créer un code PIN alphanumérique</string>
     <!-- Button label to prompt them to return to creating a numbers-only password ("PIN") -->
-    <string name="BaseKbsPinFragment__create_numeric_pin">Créer un NIP numérique</string>
+    <string name="BaseKbsPinFragment__create_numeric_pin">Créer un code PIN numérique</string>
   <!-- Removed by excludeNonTranslatables <string name="BaseKbsPinFragment__learn_more_url" translatable="false">https://support.signal.org/hc/articles/360007059792</string> -->
 
     <!-- CreateKbsPinFragment -->
@@ -3716,42 +3784,42 @@
         <item quantity="one">Votre PIN doit comporter au moins %1$d chiffre</item>
         <item quantity="other">Votre PIN doit comporter au moins %1$d chiffres</item>
     </plurals>
-    <string name="CreateKbsPinFragment__create_a_new_pin">Créer un nouveau NIP</string>
-    <string name="CreateKbsPinFragment__you_can_choose_a_new_pin_as_long_as_this_device_is_registered">Vous pouvez changer votre NIP tant que cet appareil est inscrit.</string>
-    <string name="CreateKbsPinFragment__create_your_pin">Créer votre NIP</string>
+    <string name="CreateKbsPinFragment__create_a_new_pin">Créer un nouveau code PIN</string>
+    <string name="CreateKbsPinFragment__you_can_choose_a_new_pin_as_long_as_this_device_is_registered">Vous pouvez changer de code PIN tant que cet appareil est enregistré.</string>
+    <string name="CreateKbsPinFragment__create_your_pin">Créer un code PIN</string>
     <string name="CreateKbsPinFragment__pins_can_help_you_restore_your_account">Les PIN peuvent vous aider à restaurer votre compte et garder vos données chiffrées avec Signal. </string>
-    <string name="CreateKbsPinFragment__choose_a_stronger_pin">Choisissez une NIP plus robuste</string>
+    <string name="CreateKbsPinFragment__choose_a_stronger_pin">Choisissez un code PIN plus complexe</string>
 
     <!-- ConfirmKbsPinFragment -->
-    <string name="ConfirmKbsPinFragment__pins_dont_match">Les NIP ne correspondent pas. Veuillez réessayez.</string>
+    <string name="ConfirmKbsPinFragment__pins_dont_match">Les codes PIN ne correspondent pas. Veuillez réessayez.</string>
     <!-- Prompt for the user to repeat entering the PIN in order to help them remember it correctly.   -->
     <string name="ConfirmKbsPinFragment__re_enter_the_pin_you_just_created">Saisissez à nouveau le PIN que vous venez de créer.</string>
-    <string name="ConfirmKbsPinFragment__confirm_your_pin">Confirmez votre NIP</string>
-    <string name="ConfirmKbsPinFragment__pin_creation_failed">Échec de création du NIP</string>
-    <string name="ConfirmKbsPinFragment__your_pin_was_not_saved">Votre NIP n’a pas été enregistré. Nous vous inviterons à en créer un plus tard.</string>
-    <string name="ConfirmKbsPinFragment__pin_created">Le NIP a été créé.</string>
-    <string name="ConfirmKbsPinFragment__re_enter_your_pin">Saisissez votre NIP de nouveau.</string>
-    <string name="ConfirmKbsPinFragment__creating_pin">Création du NIP…</string>
+    <string name="ConfirmKbsPinFragment__confirm_your_pin">Confirmez votre code PIN</string>
+    <string name="ConfirmKbsPinFragment__pin_creation_failed">Impossible de créer le code PIN.</string>
+    <string name="ConfirmKbsPinFragment__your_pin_was_not_saved">Votre code PIN n’a pas été enregistré. Nous vous inviterons à en créer un plus tard.</string>
+    <string name="ConfirmKbsPinFragment__pin_created">Code PIN créé.</string>
+    <string name="ConfirmKbsPinFragment__re_enter_your_pin">Saisissez de nouveau votre PIN.</string>
+    <string name="ConfirmKbsPinFragment__creating_pin">Création du code PIN…</string>
 
     <!-- KbsSplashFragment -->
-    <string name="KbsSplashFragment__introducing_pins">Nous présentons les NIP</string>
-    <string name="KbsSplashFragment__pins_keep_information_stored_with_signal_encrypted">Les NIP font en sorte que les informations sont enregistrées chiffrées dans Signal afin que vous seul puissiez y accéder. Votre profil, vos paramètres et vos contacts seront restaurés quand vous réinstallerez Signal. Vous n’aurez pas besoin de votre NIP pour ouvrir l’appli.</string>
+    <string name="KbsSplashFragment__introducing_pins">Lancement des codes PIN</string>
+    <string name="KbsSplashFragment__pins_keep_information_stored_with_signal_encrypted">Avec un code PIN, les informations stockées dans Signal sont chiffrées, et vous seul y avez accès. Votre profil, vos contacts et vos paramètres sont restaurés si vous réinstallez Signal. Vous n’avez pas besoin du code PIN pour ouvrir l’appli.</string>
     <string name="KbsSplashFragment__learn_more">En savoir plus</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">Blocage de l’inscription = NIP</string>
-    <string name="KbsSplashFragment__your_registration_lock_is_now_called_a_pin">Votre blocage de l’inscription s’appelle désormais un NIP et il accomplit encore plus. Mettez-le à jour maintenant.</string>
-    <string name="KbsSplashFragment__update_pin">Mettre le NIP à jour</string>
-    <string name="KbsSplashFragment__create_your_pin">Créer votre NIP</string>
+    <string name="KbsSplashFragment__registration_lock_equals_pin">Blocage d’inscription = PIN</string>
+    <string name="KbsSplashFragment__your_registration_lock_is_now_called_a_pin">Le blocage d’inscription fait peau neuve : il dépend désormais du code PIN et gagne en efficacité. Mettez-le à jour.</string>
+    <string name="KbsSplashFragment__update_pin">Mettre le code PIN à jour</string>
+    <string name="KbsSplashFragment__create_your_pin">Créer un code PIN</string>
     <string name="KbsSplashFragment__learn_more_about_pins">En savoir plus sur les codes PIN</string>
-    <string name="KbsSplashFragment__disable_pin">Désactiver le NIP</string>
+    <string name="KbsSplashFragment__disable_pin">Désactiver le code PIN</string>
 
     <!-- KBS Reminder Dialog -->
-    <string name="KbsReminderDialog__enter_your_signal_pin">Saisissez votre NIP Signal</string>
-    <string name="KbsReminderDialog__to_help_you_memorize_your_pin">Pour vous aider à mémoriser votre NIP, nous vous demanderons de le saisir régulièrement. Nous vous le demanderons de moins en moins souvent.</string>
+    <string name="KbsReminderDialog__enter_your_signal_pin">Saisissez votre code PIN Signal</string>
+    <string name="KbsReminderDialog__to_help_you_memorize_your_pin">Pour vous aider à mémoriser votre code PIN, nous vous demanderons de le saisir régulièrement. Nous vous le demanderons moins souvent au fil du temps.</string>
     <string name="KbsReminderDialog__skip">Ignorer</string>
     <string name="KbsReminderDialog__submit">Envoyer</string>
-    <string name="KbsReminderDialog__forgot_pin">Avez-vous oublié votre NIP ?</string>
-    <string name="KbsReminderDialog__incorrect_pin_try_again">Le NIP est erroné. Veuillez réessayer.</string>
+    <string name="KbsReminderDialog__forgot_pin">Code PIN oublié ?</string>
+    <string name="KbsReminderDialog__incorrect_pin_try_again">Code PIN incorrect. Veuillez réessayer.</string>
 
     <!-- AccountLockedFragment -->
     <string name="AccountLockedFragment__account_locked">Le compte est verrouillé</string>
@@ -3761,18 +3829,18 @@
   <!-- Removed by excludeNonTranslatables <string name="AccountLockedFragment__learn_more_url" translatable="false">https://support.signal.org/hc/articles/360007059792</string> -->
 
     <!-- KbsLockFragment -->
-    <string name="RegistrationLockFragment__enter_your_pin">Saisissez votre NIP</string>
-    <string name="RegistrationLockFragment__enter_the_pin_you_created">Saisissez le NIP que vous avez créé pour votre compte. Il est différent de votre code de confirmation reçu par texto.</string>
+    <string name="RegistrationLockFragment__enter_your_pin">Saisissez votre PIN</string>
+    <string name="RegistrationLockFragment__enter_the_pin_you_created">Saisissez le code PIN que vous avez créé pour votre compte. Il ne s’agit pas du code de confirmation reçu par SMS.</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">Saisissez le PIN choisi pour votre compte.</string>
     <!-- Button label to prompt the user to switch between an alphanumeric and numeric-only keyboards -->
     <string name="RegistrationLockFragment__switch_keyboard">Changer de clavier</string>
-    <string name="RegistrationLockFragment__incorrect_pin_try_again">Le NIP est erroné. Veuillez réessayer.</string>
-    <string name="RegistrationLockFragment__forgot_pin">Avez-vous oublié votre NIP ?</string>
-    <string name="RegistrationLockFragment__incorrect_pin">Le NIP est erroné</string>
-    <string name="RegistrationLockFragment__forgot_your_pin">Avez-vous oublié votre NIP ?</string>
+    <string name="RegistrationLockFragment__incorrect_pin_try_again">Code PIN incorrect. Veuillez réessayer.</string>
+    <string name="RegistrationLockFragment__forgot_pin">Code PIN oublié ?</string>
+    <string name="RegistrationLockFragment__incorrect_pin">Code PIN incorrect.</string>
+    <string name="RegistrationLockFragment__forgot_your_pin">Code•PIN oublié ?</string>
     <string name="RegistrationLockFragment__not_many_tries_left">Il vous reste peu d’essais</string>
-    <string name="RegistrationLockFragment__signal_registration_need_help_with_pin_for_android_v2_pin">Inscription à Signal – Besoin d’aide avec le NIP sur Android (NIP v2)</string>
+    <string name="RegistrationLockFragment__signal_registration_need_help_with_pin_for_android_v2_pin">Inscription à Signal – Besoin d’aide : code PIN sous Android (PIN v2)</string>
 
     <plurals name="RegistrationLockFragment__for_your_privacy_and_security_there_is_no_way_to_recover">
         <item quantity="one">Pour des raisons de sécurité et de protection de vos données personnelles, votre PIN ne peut pas être récupéré. Si vous avez oublié votre PIN, vous pourrez reconfirmer votre numéro par texto après %1$d jour d’inactivité. Dans ce cas, votre compte sera effacé et toutes ses données supprimées.</item>
@@ -3800,12 +3868,12 @@
     </plurals>
 
     <!-- CalleeMustAcceptMessageRequestDialogFragment -->
-    <string name="CalleeMustAcceptMessageRequestDialogFragment__s_will_get_a_message_request_from_you">%1$s recevra une demande de message de votre part. Vous pourrez appeler une fois la demande de message acceptée.</string>
+    <string name="CalleeMustAcceptMessageRequestDialogFragment__s_will_get_a_message_request_from_you">%1$s recevra une invitation par message. Vous pourrez l’appeler une fois votre invitation acceptée.</string>
 
     <!-- KBS Megaphone -->
-    <string name="KbsMegaphone__create_a_pin">Créer un NIP</string>
-    <string name="KbsMegaphone__pins_keep_information_thats_stored_with_signal_encrytped">Les NIP font en sorte que les informations sont enregistrées chiffrées dans Signal.</string>
-    <string name="KbsMegaphone__create_pin">Créer un NIP</string>
+    <string name="KbsMegaphone__create_a_pin">Créer un code PIN</string>
+    <string name="KbsMegaphone__pins_keep_information_thats_stored_with_signal_encrytped">Avec un code PIN, les informations stockées dans Signal sont chiffrées.</string>
+    <string name="KbsMegaphone__create_pin">Créer un code PIN</string>
 
     <!-- CallNotificationBuilder -->
     <!-- Displayed in a notification when a Signal voice call is ringing -->
@@ -3826,7 +3894,7 @@
     <string name="CallNotificationBuilder_connecting">Connexion…</string>
     <string name="Permissions_permission_required">Une autorisation est requise</string>
     <string name="Permissions_continue">Poursuivre</string>
-    <string name="Permissions_not_now">Pas maintenant</string>
+    <string name="Permissions_not_now">Plus tard</string>
     <string name="SQLCipherMigrationHelper_migrating_signal_database">Migration de la base de données de Signal</string>
     <string name="enter_backup_passphrase_dialog__backup_passphrase">Phrase de passe de la sauvegarde</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">Les sauvegardes sont enregistrées dans l\'espace de stockage externe et chiffrées avec la phrase de passe ci-dessous. Vous devez avoir cette phrase de passe afin de restaurer la sauvegarde.</string>
@@ -3849,7 +3917,7 @@
     <string name="RegistrationActivity_checking">Confirmation…</string>
     <string name="RegistrationActivity_d_messages_so_far">%1$d messages jusqu’à présent…</string>
     <string name="RegistrationActivity_restore_from_backup">Restaurer de la sauvegarde ?</string>
-    <string name="RegistrationActivity_restore_your_messages_and_media_from_a_local_backup">Restaurez vos messages et médias d’une sauvegarde locale. Si vous ne les restaurez pas maintenant, vous ne pourrez pas le faire plus tard.</string>
+    <string name="RegistrationActivity_restore_your_messages_and_media_from_a_local_backup">Restaurez vos messages et médias depuis une sauvegarde locale. Si vous ne les restaurez pas maintenant, vous ne pourrez pas le faire plus tard.</string>
     <string name="RegistrationActivity_backup_size_s">Taille de la sauvegarde : %1$s</string>
     <string name="RegistrationActivity_backup_timestamp_s">Estampille temporelle de la sauvegarde : %1$s</string>
     <string name="BackupDialog_enable_local_backups">Activer les sauvegardes locales ?</string>
@@ -3891,7 +3959,7 @@
     <!-- 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 vous contacter sur Molly avec celui-ci.</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 -->
@@ -3919,23 +3987,23 @@
     <string name="preferences_app_protection__screen_lock">Verrou d’écran</string>
     <string name="preferences_app_protection__lock_signal_access_with_android_screen_lock_or_fingerprint">Verrouiller l’accès à Signal avec le verrou d’écran d’Android ou avec une empreinte</string>
     <string name="preferences_app_protection__screen_lock_inactivity_timeout">Délai d’inactivité avant verrouillage de l’écran</string>
-    <string name="preferences_app_protection__signal_pin">NIP Signal</string>
-    <string name="preferences_app_protection__create_a_pin">Créer un NIP</string>
-    <string name="preferences_app_protection__change_your_pin">Changer votre NIP</string>
-    <string name="preferences_app_protection__pin_reminders">Rappels du NIP</string>
+    <string name="preferences_app_protection__signal_pin">Code PIN Signal</string>
+    <string name="preferences_app_protection__create_a_pin">Créer un code PIN</string>
+    <string name="preferences_app_protection__change_your_pin">Changer de code PIN</string>
+    <string name="preferences_app_protection__pin_reminders">Rappels de code PIN</string>
     <string name="preferences_app_protection__turn_off">Désactiver</string>
-    <string name="preferences_app_protection__confirm_pin">Confirmer le NIP</string>
-    <string name="preferences_app_protection__confirm_your_signal_pin">Confirmer votre NIP Signal</string>
-    <string name="preferences_app_protection__make_sure_you_memorize_or_securely_store_your_pin">Assurez-vous de mémoriser votre NIP ou de le conserver à l’abri, car il ne peut pas être récupéré. Si vous oubliez votre NIP, vous risquez de perdre des données lors de la réinscription de votre compte Signal.</string>
-    <string name="preferences_app_protection__incorrect_pin_try_again">Le NIP est erroné. Veuillez réessayer.</string>
-    <string name="preferences_app_protection__failed_to_enable_registration_lock">Échec d’activation du blocage de l’inscription.</string>
-    <string name="preferences_app_protection__failed_to_disable_registration_lock">Échec de désactivation du blocage de l’inscription.</string>
+    <string name="preferences_app_protection__confirm_pin">Confirmer le PIN</string>
+    <string name="preferences_app_protection__confirm_your_signal_pin">Confirmer votre code PIN Signal</string>
+    <string name="preferences_app_protection__make_sure_you_memorize_or_securely_store_your_pin">Mémorisez bien votre code PIN ou gardez-le en lieu sûr, car il est impossible de le récupérer. En cas d’oubli, vous risquez de perdre des données lorsque vous réinscrirez votre compte Signal.</string>
+    <string name="preferences_app_protection__incorrect_pin_try_again">Code PIN incorrect. Veuillez réessayer.</string>
+    <string name="preferences_app_protection__failed_to_enable_registration_lock">Impossible d’activer le blocage d’inscription.</string>
+    <string name="preferences_app_protection__failed_to_disable_registration_lock">Impossible de désactiver le blocage d’inscription.</string>
     <string name="AppProtectionPreferenceFragment_none">Aucun</string>
-    <string name="preferences_app_protection__registration_lock">Blocage de l’inscription</string>
-    <string name="RegistrationActivity_you_must_enter_your_registration_lock_PIN">Vous devez saisir votre NIP de blocage de l’inscription</string>
-    <string name="RegistrationActivity_your_pin_has_at_least_d_digits_or_characters">Votre NIP comporte au moins %1$d chiffres ou caractères</string>
+    <string name="preferences_app_protection__registration_lock">Blocage d’inscription</string>
+    <string name="RegistrationActivity_you_must_enter_your_registration_lock_PIN">Saisissez le PIN du blocage d’inscription</string>
+    <string name="RegistrationActivity_your_pin_has_at_least_d_digits_or_characters">Votre code PIN comporte au moins %1$d chiffres ou caractères</string>
     <string name="RegistrationActivity_too_many_attempts">Trop d’essais</string>
-    <string name="RegistrationActivity_you_have_made_too_many_incorrect_registration_lock_pin_attempts_please_try_again_in_a_day">Vous avez fait trop d’essais infructueux de saisie du NIP de blocage de l’inscription. Veuillez réessayer dans un jour.</string>
+    <string name="RegistrationActivity_you_have_made_too_many_incorrect_registration_lock_pin_attempts_please_try_again_in_a_day">Trop grand nombre de tentatives de saisie du code PIN. Veuillez réessayer dans un jour.</string>
     <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>
@@ -3969,7 +4037,7 @@
     <string name="TransferOrRestoreFragment__transfer_your_account_and_messages_from_your_old_android_device">Transférez votre compte et vos messages d’un ancien appareil Android. Vous devez avoir accès à votre ancien appareil.</string>
     <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 d’une sauvegarde locale. Si vous ne les restaurez pas maintenant, vous ne pourrez pas le faire plus tard.</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>
     <!-- Button label for more options -->
     <string name="TransferOrRestoreFragment__more_options">Plus d’options</string>
 
@@ -4112,6 +4180,7 @@
     <string name="RecipientBottomSheet_copied_to_clipboard">A été copié dans le presse-papiers</string>
 
     <string name="GroupRecipientListItem_admin">Administrateur</string>
+    <!-- Button text to approve a user that has requested to join a group -->
     <string name="GroupRecipientListItem_approve_description">Approuver</string>
     <string name="GroupRecipientListItem_deny_description">Refuser</string>
 
@@ -4139,6 +4208,7 @@
 
     <!-- VoiceNoteMediaDescriptionCompatFactory -->
     <string name="VoiceNoteMediaItemFactory__voice_message">Message vocal · %1$s</string>
+    <!-- This is a title in a banner describing the conversation sender to receiver placeholders of the currently playing voice memo. -->
     <string name="VoiceNoteMediaItemFactory__s_to_s">%1$s à %2$s</string>
 
     <!-- StorageUtil -->
@@ -4152,8 +4222,16 @@
     <string name="ReviewCardDialogFragment__review_members">Examiner les membres</string>
     <!-- Title of a screen where the user will be prompted to review a message request matching the name of someone they already know -->
     <string name="ReviewCardDialogFragment__review_request">Examiner la demande</string>
-    <string name="ReviewCardDialogFragment__d_group_members_have_the_same_name">%1$d membres du groupe portent le même nom. Examinez-les ci-dessous et choisissez l’action appropriée.</string>
-    <string name="ReviewCardDialogFragment__if_youre_not_sure">Si vous n’êtes pas certain de qui la demande provient, examinez les contacts ci-dessous et agissez en conséquence.</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="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 -->
+    <plurals name="ReviewCardDialogFragment__if_youre_not_sure">
+        <item quantity="one">If you\'re not sure who the request is from, review the contact below and take action.</item>
+        <item quantity="other">If you\'re not sure who the request is from, review the contacts below and take action.</item>
+    </plurals>
     <string name="ReviewCardDialogFragment__no_other_groups_in_common">Aucun autre groupe en commun.</string>
     <string name="ReviewCardDialogFragment__no_groups_in_common">Aucun groupe en commun.</string>
     <plurals name="ReviewCardDialogFragment__d_other_groups_in_common">
@@ -4184,11 +4262,20 @@
     <string name="CallParticipantsListUpdatePopupWindow__s_joined">%1$s s’est joint</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_and_s_joined">%1$s et %2$s se sont joints</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_s_and_s_joined">%1$s, %2$s et %3$s se sont joints</string>
-    <string name="CallParticipantsListUpdatePopupWindow__s_s_and_d_others_joined">%1$s, %2$s et %3$d se sont joints</string>
+    <!-- Toast message shown in group call when 3 or more people join -->
+    <plurals name="CallParticipantsListUpdatePopupWindow__s_s_and_d_others_joined">
+        <item quantity="one">%1$s, %2$s and %3$d other joined</item>
+        <item quantity="other">%1$s, %2$s and %3$d others joined</item>
+    </plurals>
+    <!-- Toast/popup text shown when someone leaves a group call -->
     <string name="CallParticipantsListUpdatePopupWindow__s_left">%1$s a quitté l’appel</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_and_s_left">%1$s et %2$s ont quitté l’appel</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_s_and_s_left">%1$s, %2$s et %3$s ont quitté l’appel</string>
-    <string name="CallParticipantsListUpdatePopupWindow__s_s_and_d_others_left">%1$s, %2$s et %3$d autres ont quitté l’appel</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 and %3$d other left</item>
+        <item quantity="other">%1$s, %2$s and %3$d others left</item>
+    </plurals>
 
     <string name="CallParticipant__you">Vous</string>
     <string name="CallParticipant__you_on_another_device">Vous (sur un autre appareil)</string>
@@ -4305,9 +4392,9 @@
     <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>
     <!-- Button in save recovery phrase card -->
     <string name="payment_info_card_save_your_phrase">Enregistrer votre phrase</string>
-    <string name="payment_info_card_update_your_pin">Mettez votre NIP à jour</string>
-    <string name="payment_info_card_with_a_high_balance">Si votre solde est élevé, vous pouvez opter pour un NIP alphanumérique afin de renforcer la protection de votre compte.</string>
-    <string name="payment_info_card_update_pin">Mettre le NIP à jour</string>
+    <string name="payment_info_card_update_your_pin">Mettez à jour votre code PIN</string>
+    <string name="payment_info_card_with_a_high_balance">Si votre solde est élevé, vous pouvez opter pour un code PIN alphanumérique afin de renforcer la protection de votre compte.</string>
+    <string name="payment_info_card_update_pin">Mettre à jour le code 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> -->
   <!-- Removed by excludeNonTranslatables <string name="payment_info_card__learn_more__adding_to_your_wallet" translatable="false">https://support.signal.org/hc/articles/360057625692#payments_transfer_from_exchange</string> -->
@@ -4332,8 +4419,8 @@
     <string name="PaymentsRecoveryStartFragment__save_recovery_phrase">Enregistrer une phrase de récupération</string>
     <string name="PaymentsRecoveryStartFragment__enter_recovery_phrase">Saisissez la phrase de récupération</string>
     <plurals name="PaymentsRecoveryStartFragment__your_balance_will_automatically_restore">
-        <item quantity="one">Après avoir réinstallé Signal, votre solde sera restauré automatiquement si vous confirmez votre PIN Signal. Vous pouvez aussi restaurer votre solde grâce à une phrase de récupération, une phrase de %1$d mot qui vous est propre. Notez-la et conservez-la dans un endroit sûr.</item>
-        <item quantity="other">Après avoir réinstallé Signal, votre solde sera restauré automatiquement si vous confirmez votre PIN Signal. Vous pouvez aussi restaurer votre solde grâce à une phrase de récupération, une phrase de %1$d mots qui vous est propre. Notez-la et conservez-la dans un endroit sûr.</item>
+        <item quantity="one">Votre solde est automatiquement restauré lorsque vous réinstallez Signal et confirmez votre code PIN Signal. Vous pouvez aussi le restaurer grâce à une phrase de récupération unique comportant %1$d mot. Notez-la et conservez-la en lieu sûr.</item>
+        <item quantity="other">Votre solde est automatiquement restauré lorsque vous réinstallez Signal et confirmez votre code PIN Signal. Vous pouvez aussi le restaurer grâce à une phrase de récupération unique comportant %1$d mots. Notez-la et conservez-la en lieu sûr.</item>
     </plurals>
     <!-- Description in save recovery phrase screen which shows up when user has non zero balance -->
     <string name="PaymentsRecoveryStartFragment__got_balance">Le solde de votre compte est disponible Il est temps d\'enregistrer votre phrase de récupération, une clé de 24 mots que vous pouvez utiliser pour rétablir votre solde.</string>
@@ -4397,13 +4484,13 @@
 
     <!-- CanNotSendPaymentDialog -->
     <string name="CanNotSendPaymentDialog__cant_send_payment">Impossible d’envoyer le paiement</string>
-    <string name="CanNotSendPaymentDialog__to_send_a_payment_to_this_user">Pour envoyer un paiement à cet utilisateur, la personne doit accepter votre demande d’échange de messages. Envoyez-lui un message pour créer une demande d’échange de messages.</string>
+    <string name="CanNotSendPaymentDialog__to_send_a_payment_to_this_user">Pour envoyer un paiement à cet utilisateur, celui-ci doit d’abord accepter une invitation par message de votre part. Envoyez-lui un message pour l’inviter à discuter avec vous sur Signal.</string>
     <string name="CanNotSendPaymentDialog__send_a_message">Envoyez un message</string>
 
     <!-- GroupsInCommonMessageRequest -->
     <string name="GroupsInCommonMessageRequest__you_have_no_groups_in_common_with_this_person">Vous n’avez aucun groupe en commun avec cette personne. Examinez attentivement les demandes avant d’accepter pour éviter les messages indésirés.</string>
     <string name="GroupsInCommonMessageRequest__none_of_your_contacts_or_people_you_chat_with_are_in_this_group">Aucun de vos contacts ou des personnes avec lesquelles vous discutez n’est dans ce groupe. Examinez attentivement les demandes avant d’accepter pour éviter les messages indésirés.</string>
-    <string name="GroupsInCommonMessageRequest__about_message_requests">À propos des demandes d’échange de messages</string>
+    <string name="GroupsInCommonMessageRequest__about_message_requests">À propos des invitations par message</string>
     <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>
@@ -4430,15 +4517,15 @@
 
     <!-- AccountSettingsFragment -->
     <string name="AccountSettingsFragment__account">Compte</string>
-    <string name="AccountSettingsFragment__youll_be_asked_less_frequently">On vous le demandera moins souvent au fil du temps</string>
-    <string name="AccountSettingsFragment__require_your_signal_pin">Exige votre NIP Signal pour réinscrire votre numéro de téléphone avec Signal</string>
+    <string name="AccountSettingsFragment__youll_be_asked_less_frequently">Les rappels deviennent moins fréquents au fil du temps</string>
+    <string name="AccountSettingsFragment__require_your_signal_pin">Exiger le code PIN Signal pour réenregistrer votre numéro de téléphone sur Signal</string>
     <string name="AccountSettingsFragment__change_phone_number">Changer de numéro de téléphone</string>
     <!-- Account setting that allows user to request and export their signal account data -->
-    <string name="AccountSettingsFragment__request_account_data">Données de votre compte</string>
+    <string name="AccountSettingsFragment__request_account_data">Données du compte</string>
 
     <!-- ExportAccountDataFragment -->
     <!-- Part of requesting account data flow, this is the section title for requesting that account data -->
-    <string name="ExportAccountDataFragment__your_account_data">Données de votre compte</string>
+    <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>
     <!-- Learn more link to more information about requesting account data -->
@@ -4508,14 +4595,14 @@
     <string name="ChangeNumberConfirmFragment__edit_number">Modifier le numéro</string>
 
     <!-- ChangeNumberRegistrationLockFragment -->
-    <string name="ChangeNumberRegistrationLockFragment__signal_change_number_need_help_with_pin_for_android_v2_pin">Signal changer numéro – Besoin d’aide avec le NIP sur Android (NIP v2)</string>
+    <string name="ChangeNumberRegistrationLockFragment__signal_change_number_need_help_with_pin_for_android_v2_pin">Changement de numéro Signal – Besoin d’aide : code PIN sous Android (PIN v2)</string>
 
     <!-- ChangeNumberPinDiffersFragment -->
-    <string name="ChangeNumberPinDiffersFragment__pins_do_not_match">Les NIP ne correspondent pas</string>
-    <string name="ChangeNumberPinDiffersFragment__the_pin_associated_with_your_new_number_is_different_from_the_pin_associated_with_your_old_one">Le NIP associé à votre nouveau numéro est différent de celui associé à votre ancien. Voulez-vous conserver votre ancien NIP ou le mettre à jour ?</string>
-    <string name="ChangeNumberPinDiffersFragment__keep_old_pin">Conserver l’ancien NIP</string>
-    <string name="ChangeNumberPinDiffersFragment__update_pin">Mettre le NIP à jour</string>
-    <string name="ChangeNumberPinDiffersFragment__keep_old_pin_question">Conserver l’ancien NIP ?</string>
+    <string name="ChangeNumberPinDiffersFragment__pins_do_not_match">Les codes PIN ne correspondent pas.</string>
+    <string name="ChangeNumberPinDiffersFragment__the_pin_associated_with_your_new_number_is_different_from_the_pin_associated_with_your_old_one">Le code PIN associé à votre nouveau numéro est différent de celui associé à votre ancien numéro. Voulez-vous conserver l’ancien code PIN ou le mettre à jour ?</string>
+    <string name="ChangeNumberPinDiffersFragment__keep_old_pin">Conserver l’ancien code PIN</string>
+    <string name="ChangeNumberPinDiffersFragment__update_pin">Mettre à jour le code PIN</string>
+    <string name="ChangeNumberPinDiffersFragment__keep_old_pin_question">Conserver l’ancien code PIN ?</string>
 
     <!-- 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 -->
@@ -4558,10 +4645,15 @@
 
     <!-- PrivacySettingsFragment -->
     <string name="PrivacySettingsFragment__blocked">Bloqué</string>
-    <string name="PrivacySettingsFragment__d_contacts">%1$d contacts</string>
+    <!-- Settings label that shows the number blocked contacts -->
+    <plurals name="PrivacySettingsFragment__d_contacts">
+        <item quantity="one">%1$d contact</item>
+        <item quantity="other">%1$d contacts</item>
+    </plurals>
     <string name="PrivacySettingsFragment__messaging">Messagerie</string>
     <string name="PrivacySettingsFragment__disappearing_messages">Messages éphémères</string>
     <string name="PrivacySettingsFragment__app_security">Sécurité de l’appli</string>
+    <!-- This refers to the multi-tasking overview (recent apps) from the Android operating system.-->
     <string name="PrivacySettingsFragment__block_screenshots_in_the_recents_list_and_inside_the_app">Bloquer les captures d’écran dans la liste des récents et dans l’appli</string>
     <string name="PrivacySettingsFragment__signal_message_and_calls">Messages et appels Signal, toujours relayer les appels et expéditeur scellé</string>
     <string name="PrivacySettingsFragment__default_timer_for_new_changes">Minuterie par défaut pour les nouvelles conversations</string>
@@ -4618,11 +4710,14 @@
     <string name="DataAndStorageSettingsFragment__media_quality">Qualité des médias</string>
     <string name="DataAndStorageSettingsFragment__sent_media_quality">Qualité des médias envoyés</string>
     <string name="DataAndStorageSettingsFragment__sending_high_quality_media_will_use_more_data">Envoyer des médias de haute qualité demande plus de données.</string>
+    <!-- Setting option that can be selected to default media to be sent as high quality by default -->
     <string name="DataAndStorageSettingsFragment__high">Élevée</string>
+    <!-- Setting option that can be selected to default media to be sent as standard quality by default -->
     <string name="DataAndStorageSettingsFragment__standard">Standard</string>
     <string name="DataAndStorageSettingsFragment__calls">Appels</string>
 
     <!-- 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__use_custom_colors">Utiliser des couleurs personnalisées</string>
     <string name="ChatColorSelectionFragment__chat_color">Couleur de la conversation</string>
@@ -4659,7 +4754,7 @@
     <!-- 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. -->
-    <string name="Donate2022Q2Megaphone_not_now">Pas maintenant</string>
+    <string name="Donate2022Q2Megaphone_not_now">Plus tard</string>
 
     <!-- EditReactionsFragment -->
     <string name="EditReactionsFragment__customize_reactions">Personnaliser les réactions</string>
@@ -4672,14 +4767,14 @@
     <!-- AddAProfilePhotoMegaphone -->
     <string name="AddAProfilePhotoMegaphone__add_a_profile_photo">Ajouter une photo de profil</string>
     <string name="AddAProfilePhotoMegaphone__choose_a_look_and_color">Choisissez une apparence et une couleur ou personnalisez vos initiales.</string>
-    <string name="AddAProfilePhotoMegaphone__not_now">Pas maintenant</string>
+    <string name="AddAProfilePhotoMegaphone__not_now">Plus tard</string>
     <string name="AddAProfilePhotoMegaphone__add_photo">Ajouter une photo</string>
 
     <!-- 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__not_now">Pas maintenant</string>
+    <string name="BecomeASustainerMegaphone__not_now">Plus tard</string>
     <string name="BecomeASustainerMegaphone__donate">Faire un don</string>
 
     <!-- KeyboardPagerFragment -->
@@ -4795,7 +4890,7 @@
     <!-- Dialog title when removing a contact -->
     <string name="NewConversationActivity__remove_s">Supprimer %1$s ?</string>
     <!-- Dialog message when removing a contact -->
-    <string name="NewConversationActivity__you_wont_see_this_person">Vous ne verrez pas cette personne lors d\'une recherche. Vous recevrez une demande si cette personne essaye de vous envoyer un message à l\'avenir.</string>
+    <string name="NewConversationActivity__you_wont_see_this_person">Cette personne n’apparaîtra plus dans vos résultats de recherche, mais pourra toujours vous envoyer une invitation par message si elle décide de vous écrire.</string>
     <!-- Snackbar message after removing a contact -->
     <string name="NewConversationActivity__s_has_been_removed">%1$s a été supprimé</string>
     <!-- Snackbar message after blocking a contact -->
@@ -4834,6 +4929,7 @@
     <string name="AvatarPickerFragment__take_a_picture">Prendre une photo</string>
     <string name="AvatarPickerFragment__choose_a_photo">Choisir une photo</string>
     <string name="AvatarPickerFragment__photo">Photo</string>
+    <!-- Button label during avatar selection/creation that when tapped lets you generate an avatar from typed in text. -->
     <string name="AvatarPickerFragment__text">Texte</string>
     <string name="AvatarPickerFragment__save">Enregistrer</string>
     <string name="AvatarPickerFragment__clear_avatar">Supprimer l’avatar</string>
@@ -4894,7 +4990,7 @@
     <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">Message éphémère</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_invalid">Un élément ou plus étaient invalides</string>
     <string name="MediaReviewFragment__too_many_items_selected">Trop d’éléments sélectionnés</string>
@@ -4984,7 +5080,7 @@
     <string name="SubscribeFragment__cancel_subscription">Annuler l’abonnement</string>
     <string name="SubscribeFragment__confirm_cancellation">Confirmer l’annulation ?</string>
     <string name="SubscribeFragment__you_wont_be_charged_again">Vous ne serez plus facturé. Votre macaron sera supprimé de votre profil à la fin de votre période de facturation.</string>
-    <string name="SubscribeFragment__not_now">Pas maintenant</string>
+    <string name="SubscribeFragment__not_now">Plus tard</string>
     <string name="SubscribeFragment__confirm">Confirmer</string>
     <string name="SubscribeFragment__update_subscription">Mettre à jour l’abonnement</string>
     <string name="SubscribeFragment__your_subscription_has_been_cancelled">Votre abonnement a été annulé.</string>
@@ -5089,7 +5185,7 @@
     <string name="ExpiredBadgeBottomSheetDialogFragment__you_can_keep">Vous pouvez continuer à utiliser Signal, mais pour soutenir une technologie conçue pour vous, envisagez de devenir un donateur mensuel en faisant un don chaque mois.</string>
     <string name="ExpiredBadgeBottomSheetDialogFragment__become_a_sustainer">Devenir donateur mensuel</string>
     <string name="ExpiredBadgeBottomSheetDialogFragment__add_a_boost">Donner un Coup de pouce</string>
-    <string name="ExpiredBadgeBottomSheetDialogFragment__not_now">Pas maintenant</string>
+    <string name="ExpiredBadgeBottomSheetDialogFragment__not_now">Plus tard</string>
     <!-- Copy displayed when badge expires after user inactivity -->
     <string name="ExpiredBadgeBottomSheetDialogFragment__your_recurring_monthly_donation_was_automatically">Votre don mensuel récurrent a été automatiquement annulé car vous êtes resté inactif trop longtemps. Votre macaron %1$s n’est plus visible sur votre profil.</string>
     <!-- Copy displayed when badge expires after payment failure -->
@@ -5487,7 +5583,7 @@
     <string name="StoryViewerFragment__s_s">%1$s %2$s</string>
     <!-- Displayed when viewing a post you sent -->
     <string name="StoryViewerPageFragment__you">Vous</string>
-    <!-- Displayed when viewing a post displayed to a group -->
+    <!-- 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 -->
     <string name="StoryViewerPageFragment__reply">Répondre</string>
@@ -5531,7 +5627,7 @@
     <!-- Context menu item to delete a story response -->
     <string name="StoryGroupReplyItem__delete">Effacer</string>
     <!-- Page title for My Story options -->
-    <string name="MyStorySettingsFragment__my_story">Ma Story</string>
+    <string name="MyStorySettingsFragment__my_story">Ma story</string>
     <!-- Number of total signal connections displayed in "All connections" row item -->
     <plurals name="MyStorySettingsFragment__viewers">
         <item quantity="one">%1$d spectateur</item>
@@ -5540,13 +5636,13 @@
     <!-- Button on all signal connections row to view all signal connections. Please keep as short as possible. -->
     <string name="MyStorySettingsFragment__view">Afficher</string>
     <!-- Section heading for story visibility -->
-    <string name="MyStorySettingsFragment__who_can_view_this_story">Qui peut voir cette Story ?</string>
+    <string name="MyStorySettingsFragment__who_can_view_this_story">Qui peut voir cette story ?</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">Tous les contacts Signal</string>
+    <string name="MyStorySettingsFragment__all_signal_connections">Tous mes contacts 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">Tout sauf…</string>
+    <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>
     <!-- Summary of clickable option displaying how many people you have excluded from your story -->
@@ -5555,34 +5651,34 @@
         <item quantity="other">%1$d personnes exclues</item>
     </plurals>
     <!-- Privacy setting title for only sharing your story with specified connections -->
-    <string name="MyStorySettingsFragment__only_share_with">Partager uniquement avec…</string>
+    <string name="MyStorySettingsFragment__only_share_with">Ne partager qu’avec…</string>
     <!-- Privacy setting description for only sharing your story with specified connections -->
-    <string name="MyStorySettingsFragment__only_share_with_selected_people">Partager uniquement avec les contacts sélectionnés</string>
+    <string name="MyStorySettingsFragment__only_share_with_selected_people">Ne partager qu’avec les contacts sélectionnés</string>
     <!-- Summary of clickable option displaying how many people you have included to send to in your story -->
     <plurals name="MyStorySettingsFragment__d_people">
         <item quantity="one">%1$d personne</item>
         <item quantity="other">%1$d personnes</item>
     </plurals>
     <!-- My story privacy fine print about what the privacy settings are for -->
-    <string name="MyStorySettingsFragment__choose_who_can_view_your_story">Choisissez qui peut voir votre Story. Les modifications n\'affecteront pas les Stories déjà postées.</string>
+    <string name="MyStorySettingsFragment__choose_who_can_view_your_story">Choisissez qui peut voir votre story. Cela ne modifiera pas l’audience des stories déjà publiées.</string>
     <!-- Section header for options related to replies and reactions -->
     <string name="MyStorySettingsFragment__replies_amp_reactions">Réponses et réactions</string>
     <!-- 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">Laisser les personnes qui peuvent voir votre Story réagir et y répondre</string>
+    <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>
     <!-- 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. -->
     <string name="SignalConnectionsBottomSheet__signal_connections_are_people">Les contacts Signal sont des personnes en qui vous avez confiance pour au moins une des raisons suivantes :</string>
     <!-- Signal connections sheet bullet point 1 -->
-    <string name="SignalConnectionsBottomSheet__starting_a_conversation">Commencer une conversation</string>
+    <string name="SignalConnectionsBottomSheet__starting_a_conversation">Vous avez démarré une conversation avec eux</string>
     <!-- Signal connections sheet bullet point 2 -->
     <string name="SignalConnectionsBottomSheet__accepting_a_message_request">Vous avez accepté leur invitation par message</string>
     <!-- Signal connections sheet bullet point 3 -->
     <string name="SignalConnectionsBottomSheet__having_them_in_your_system_contacts">Il s’agit de contacts enregistrés sur votre téléphone</string>
     <!-- Note at the bottom of the Signal connections sheet -->
-    <string name="SignalConnectionsBottomSheet__your_connections_can_see_your_name">"Vos connexions peuvent voir vos nom et photo ainsi que vos publications dans « Mes stories » à moins que vous ne cachiez ces publications pour elles."</string>
+    <string name="SignalConnectionsBottomSheet__your_connections_can_see_your_name">"Vos contacts Signal peuvent voir votre nom et votre photo. Ils peuvent aussi afficher vos stories, sauf si vous décidez de les masquer."</string>
     <!-- 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 -->
@@ -5621,9 +5717,9 @@
     <!-- 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">Veuillez saisir un lien valide.</string>
     <!-- Title for screen allowing user to exclude "My Story" entries from specific people -->
-    <string name="ChangeMyStoryMembershipFragment__all_except">Tout sauf…</string>
+    <string name="ChangeMyStoryMembershipFragment__all_except">Tous mes contacts Signal, sauf…</string>
     <!-- Title for screen allowing user to only share "My Story" entries with specific people -->
-    <string name="ChangeMyStoryMembershipFragment__only_share_with">Partager uniquement avec…</string>
+    <string name="ChangeMyStoryMembershipFragment__only_share_with">Ne partager qu’avec…</string>
     <!-- Done button label for hide story from screen -->
     <string name="HideStoryFromFragment__done">Terminé</string>
     <!-- Dialog title for removing a group story -->
@@ -5768,7 +5864,7 @@
     <!-- Primary action for pending gift sheet to redeem badge now -->
     <string name="ViewReceivedGiftSheet__redeem">Échanger</string>
     <!-- Primary action for pending gift sheet to redeem badge later -->
-    <string name="ViewReceivedGiftSheet__not_now">Pas maintenant</string>
+    <string name="ViewReceivedGiftSheet__not_now">Plus tard</string>
     <!-- Dialog text while redeeming a gift -->
     <string name="ViewReceivedGiftSheet__redeeming_badge">Récupération du macaron…</string>
     <!-- Description text in gift thanks sheet -->
@@ -5782,7 +5878,7 @@
     <!-- Expired gift sheet make a monthly donation button -->
     <string name="ExpiredGiftSheetConfiguration__make_a_monthly_donation">Faire un don mensuel</string>
     <!-- Expired gift sheet not now button -->
-    <string name="ExpiredGiftSheetConfiguration__not_now">Pas maintenant</string>
+    <string name="ExpiredGiftSheetConfiguration__not_now">Plus tard</string>
     <!-- My Story label designating that we will only share with the selected viewers. -->
     <string name="ContactSearchItems__only_share_with">Ne partager qu\'avec</string>
     <!-- Label under name for custom stories -->
@@ -5855,7 +5951,7 @@
     <!-- Label indicating swipe direction to exit story viewer -->
     <string name="StoryFirstTimeNavigationView__swipe_right_to_exit">Balayez vers la droite pour quitter</string>
     <!-- Button label to confirm understanding of story navigation -->
-    <string name="StoryFirstTimeNagivationView__got_it">Compris</string>
+    <string name="StoryFirstTimeNagivationView__got_it">J’ai compris</string>
     <!-- Content description for vertical context menu button in safety number sheet rows -->
     <string name="SafetyNumberRecipientRowItem__open_context_menu">Ouvrir le menu contextuel</string>
     <!-- Sub-line when a user is verified. -->
@@ -5908,11 +6004,11 @@
     <!-- 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>
     <!-- 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 les contacts Signal</string>
+    <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 -->
-    <string name="ChooseInitialMyStoryMembershipFragment__all_except">Tout sauf…</string>
+    <string name="ChooseInitialMyStoryMembershipFragment__all_except">Tous mes contacts Signal, sauf…</string>
     <!-- Only with selected connections option for initial My Story settings configuration shown when sending to My Story for the first time -->
-    <string name="ChooseInitialMyStoryMembershipFragment__only_share_with">Partager uniquement avec…</string>
+    <string name="ChooseInitialMyStoryMembershipFragment__only_share_with">Ne partager qu’avec…</string>
 
     <!-- Story info header sent heading -->
     <string name="StoryInfoHeader__sent">Envoyé</string>
@@ -5955,7 +6051,7 @@
 
     <!-- GroupStorySettingsFragment -->
     <!-- Section header for who can view a group story -->
-    <string name="GroupStorySettingsFragment__who_can_view_this_story">Qui peut voir cette Story ?</string>
+    <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>
     <!-- Preference label for removing this group story -->
@@ -5980,7 +6076,7 @@
     <!-- The text on a button in an alert window that, when clicked, will take the user to a screen to re-enable backups -->
     <string name="BackupSchedulePermissionMegaphone__back_up_chats">Sauvegarder les conversations</string>
     <!-- The text on a button in an alert window that, when clicked, will take the user to a screen to re-enable backups -->
-    <string name="BackupSchedulePermissionMegaphone__not_now">Pas maintenant</string>
+    <string name="BackupSchedulePermissionMegaphone__not_now">Plus tard</string>
     <!-- Re-enable backup permission bottom sheet title -->
     <string name="BackupSchedulePermissionMegaphone__to_reenable_backups">Pour réactiver les sauvegardes :</string>
     <!-- Re-enable backups permission bottom sheet instruction 1 text -->
@@ -6167,7 +6263,7 @@
     <!-- Button label for retry button of donation error sheet displayed after making a bank transfer that fails -->
     <string name="DonationErrorBottomSheet__try_again">Réessayer</string>
     <!-- Button label for not now button of donation error sheet displayed after making a bank transfer that fails -->
-    <string name="DonationErrorBottomSheet__not_now">Pas maintenant</string>
+    <string name="DonationErrorBottomSheet__not_now">Plus tard</string>
 
     <!-- Title of \'Donation Complete\' sheet displayed after a bank transfer completes and the badge is redeemed -->
     <string name="DonationCompletedBottomSheet__donation_complete">Don effectué</string>
@@ -6244,7 +6340,7 @@
     <!-- Displayed as a title on a megaphone which prompts user to set up a username -->
     <string name="SetUpYourUsername__set_up_your_signal_username">Configurer votre nom d\'utilisateur Signal</string>
     <!-- Displayed as a description on a megaphone which prompts user to set up a username -->
-    <string name="SetUpYourUsername__introducing_phone_number_privacy">Protégez votre numéro de téléphone, choisissez un nom d’utilisateur facultatif et découvrez les liens de conversation.</string>
+    <string name="SetUpYourUsername__introducing_phone_number_privacy">Protégez la confidentialité de votre numéro de téléphone, choisissez un nom d’utilisateur facultatif et découvrez les liens de conversation.</string>
     <!-- Displayed as an action on a megaphone which prompts user to set up a username -->
     <string name="SetUpYourUsername__dismiss">Fermer</string>
     <!-- Displayed as an action on a megaphone which prompts user to set up a username -->
@@ -6253,7 +6349,7 @@
     <!-- Displayed as a title on a megaphone which prompts user to set up a username -->
     <string name="PnpLaunchMegaphone_title">De nouvelles façons de rester en contact</string>
     <!-- Displayed as a description on a megaphone which prompts user to set up a username -->
-    <string name="PnpLaunchMegaphone_body">Protégez votre numéro de téléphone, choisissez un nom d’utilisateur facultatif et découvrez les liens de conversation.</string>
+    <string name="PnpLaunchMegaphone_body">Protégez la confidentialité de votre numéro de téléphone, choisissez un nom d’utilisateur facultatif et découvrez les liens de conversation.</string>
     <!-- Displayed as an action on a megaphone which prompts user to set up a username. Clicking it will dismiss the megaphone. -->
     <string name="PnpLaunchMegaphone_dismiss">Fermer</string>
     <!-- Displayed as an action on a megaphone which prompts user to set up a username. Clicking it will open a link. -->
@@ -6373,7 +6469,7 @@
     <!-- Shown during empty state -->
     <string name="CallLogFragment__no_calls">Aucun appel.</string>
     <!-- Shown during empty state -->
-    <string name="CallLogFragment__get_started_by_calling_a_friend">Commencez en appelant un ami.</string>
+    <string name="CallLogFragment__get_started_by_calling_a_friend">Pour commencer, appelez un ami.</string>
     <!-- Displayed as a message in a dialog when deleting multiple items -->
     <string name="CallLogFragment__call_links_youve_created">Les liens d’appel que vous avez créés ne fonctionneront plus.</string>
 
@@ -6605,7 +6701,7 @@
     <!-- Button on the megaphone megaphone shown at the bottom of the chat list when a user has disable the system setting for showing full screen notifications used showing incoming calls that starts the fix process -->
     <string name="GrantFullScreenIntentPermission_megaphone_turn_on">Activer</string>
     <!-- Button on the megaphone shown at the bottom of the chatlist when a user has disabled the system setting for showing full screen notifications used showing incoming calls that dismisses the megaphone -->
-    <string name="GrantFullScreenIntentPermission_megaphone_not_now">Pas maintenant</string>
+    <string name="GrantFullScreenIntentPermission_megaphone_not_now">Plus tard</string>
     <!-- Title of bottom sheet shown after tapping "Turn on" from the megaphone to re-enable full screen notifications for incoming call notifications -->
     <string name="GrantFullScreenIntentPermission_bottomsheet_title">Activer les notifications en plein écran</string>
     <!-- Subtitle of bottom sheet shown after tapping "Turn on" from the megaphone to re-enable full screen notifications for incoming call notifications -->
@@ -6622,7 +6718,7 @@
     <!-- Bottom sheet dialog shown when a monthly donation fails to renew, primary button to renew subscription with new data -->
     <string name="MonthlyDonationCanceled__renew_button">Renouveler l’abonnement</string>
     <!-- Bottom sheet dialog shown when a monthly donation fails to renew, second button to dismiss the dialog entirely -->
-    <string name="MonthlyDonationCanceled__not_now_button">Pas maintenant</string>
+    <string name="MonthlyDonationCanceled__not_now_button">Plus tard</string>
 
     <!-- FindByActivity -->
     <!-- Title of activity when finding by username -->
@@ -6680,7 +6776,7 @@
     <!-- Title displayed at the top of the screen -->
     <string name="NicknameActivity__nickname">Pseudo</string>
     <!-- Subtitle displayed under title -->
-    <string name="NicknameActivity__nicknames_amp_notes">Nicknames &amp; notes are stored with Signal and end-to-end encrypted. They are only visible to you.</string>
+    <string name="NicknameActivity__nicknames_amp_notes">Les pseudos et les notes sont stockés dans Signal et chiffrés de bout en bout. Vous seul y avez accès.</string>
     <!-- Field label for given name -->
     <string name="NicknameActivity__first_name">Prénom</string>
     <!-- Content description for first name clear button -->
@@ -6694,9 +6790,9 @@
     <!-- Button label to save -->
     <string name="NicknameActivity__save">Enregistrer</string>
     <!-- Dialog title for note and name deletion -->
-    <string name="NicknameActivity__delete_nickname">Delete?</string>
+    <string name="NicknameActivity__delete_nickname">Supprimer ?</string>
     <!-- Dialog message for note and name deletion -->
-    <string name="NicknameActivity__this_will_permanently_delete_this_nickname_and_note">This will permanently delete any nickname and note you’ve set.</string>
+    <string name="NicknameActivity__this_will_permanently_delete_this_nickname_and_note">Cette action supprimera définitivement les pseudos et les notes que vous avez ajoutés.</string>
 
     <!-- ViewNoteBottomSheetDialogFragment -->
     <!-- Sheet title -->
@@ -6704,5 +6800,26 @@
     <!-- Content description for opening the note editor -->
     <string name="ViewNoteSheet__edit_note">Modifier les notes</string>
 
+    <!-- BackupProgressService -->
+    <!-- Notification title shown while backup restore job is running -->
+    <string name="BackupProgressService_title">Restauration de la sauvegarde…</string>
+    <!-- Notification title shown while downloading backup restore data -->
+    <string name="BackupProgressService_title_downloading">Téléchargement des données sauvegardées…</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>
+    <!-- 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 -->
+    <string name="BackupsTypeSettingsFragment__google_pay">Google Pay</string>
+    <!-- Displayed as the user\'s payment method as a label in a preference row -->
+    <string name="BackupsTypeSettingsFragment__bank_transfer">Bank transfer</string>
+    <!-- Displayed as the user\'s payment method as a label in a preference row -->
+    <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>
+
+
     <!-- 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 f9ba214f21..af8a388e8e 100644
--- a/app/src/main/res/values-ga/strings.xml
+++ b/app/src/main/res/values-ga/strings.xml
@@ -1,6 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- smartling.instruction_comments_enabled = on -->
-<resources>
+<?xml version="1.0" encoding="UTF-8"?><!-- 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> -->
@@ -89,6 +87,16 @@
     <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">Allow access to your location</string>
+    <!-- Dialog description that will explain the steps needed to give location permission -->
+    <string name="AttachmentManager_signal_to_send_location">To send your location:</string>
+    <!-- Alert dialog description asking for location permission -->
+    <string name="AttachmentManager_signal_allow_signal_access_location">Allow Molly access to send your location.</string>
+    <!-- Toast text explaining Signal\'s need for location access -->
+    <string name="AttachmentManager_signal_needs_location_access">Molly needs location access to send your location.</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>
     <!-- Alert dialog description to send the recipient a request to activate payments -->
@@ -244,7 +252,7 @@
     <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>
@@ -395,8 +403,16 @@
     <string name="ConversationActivity_your_request_to_join_has_been_sent_to_the_group_admin">Seoladh d\'iarratas chun a bheith mar bhall chuig riarthóir na baicle. Seolfar fógra chugat nuair a dhéanfaidh sé beart faoi d\'iarratas.</string>
     <string name="ConversationActivity_cancel_request">Cealaigh an tIarratas</string>
 
-    <string name="ConversationActivity_to_send_audio_messages_allow_signal_access_to_your_microphone">Ceadaigh Molly do mhicreafón a úsáid chun teachtaireachtaí fuaime a sheoladh.</string>
+    <!-- Dialog title asking users for microphone permission -->
+    <string name="ConversationActivity_allow_access_microphone">Allow access to your microphone</string>
+    <!-- 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>
+    <!-- Toast text explaining Signal\'s need for microphone access -->
+    <string name="ConversationActivity_signal_needs_microphone_access_voice_message">Molly needs microphone access to record a voice message.</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 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>
@@ -420,10 +436,17 @@
     <string name="ConversationActivity_you_will_leave_this_group_and_it_will_be_deleted_from_all_of_your_devices">Imeoidh tú as an ngrúpa seo, agus scriosfar ó gach gléas leat é.</string>
     <string name="ConversationActivity_delete">Scrios</string>
     <string name="ConversationActivity_delete_and_leave">Scrios agus imigh as</string>
-    <string name="ConversationActivity__to_call_s_signal_needs_access_to_your_microphone">Chun glaoch ar %1$s, ní mór do Molly rochtain a fháil ar do mhicreafón</string>
+
+    <!-- Dialog description that will explain the steps needed to give microphone permissions for a voice call -->
+    <string name="ConversationActivity__to_start_call">To start a 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">To start a call, allow Molly access to your microphone.</string>
+    <!-- Toast text explaining Signal\'s need for microphone access for a voice call -->
+    <string name="ConversationActivity_signal_needs_microphone_access_voice_call">Molly needs microphone access to start a call.</string>
 
 
     <string name="ConversationActivity_join">Téigh le</string>
+    <!-- Button text for an active group call but the call is currently full and unjoinable -->
     <string name="ConversationActivity_full">Lán</string>
 
     <string name="ConversationActivity_error_sending_media">Tharla botún fad agus a bhí an meán á sheoladh</string>
@@ -661,6 +684,7 @@
     <string name="ConversationListFragment_unarchive">Díchartlannú</string>
     <string name="ConversationListFragment_delete">Scrios</string>
     <string name="ConversationListFragment_select_all">Roghnaigh uile</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 roghnaithe</item>
         <item quantity="two">%1$d roghnaithe</item>
@@ -921,6 +945,7 @@
         <item quantity="many">%1$d gcuireadh seolta</item>
         <item quantity="other">%1$d cuireadh seolta</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">Ní féidir leat “%1$s” a chur leis an ngrúpa seo go huathoibríoch.\n\nFuair an duine sin cuireadh le dul isteach ann, agus ní fheicfidh sé/sí aon teachtaireachtaí grúpa go dtí go nglacfar é.</string>
     <string name="GroupManagement_invite_multiple_users">Ní féidir leat na húsáideoirí seo a chur leis an ngrúpa seo go huathoibríoch.\n\nFuair siad cuireadh le dul isteach sa ghrúpa, agus ní fheicfidh siad aon teachtaireachtaí grúpa go dtí go nglacfar é.</string>
 
@@ -1149,7 +1174,9 @@
 
     <string name="ManageGroupActivity_edit_name_and_picture">Cuir an t-ainm agus pictiúr in eagar</string>
     <string name="ManageGroupActivity_legacy_group">Grúpa Oidhreachta</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">Seanleagan de Ghrúpa é seo. Níl gnéithe amhail riarthóirí grúpa ar fáil ach i nGrúpaí Nua.</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">Seanleagan de Ghrúpa é seo. Chun gnéithe nua amhail @tráchtanna agus riarthóirí a rochtain,</string>
     <string name="ManageGroupActivity_legacy_group_too_large">Ní féidir an seanleagan seo den Ghrúpa a uasghrádú chuig Grúpa Nua toisc go bhfuil sé rómhór. Is í %1$d uasmhéid an ghrúpa.</string>
     <string name="ManageGroupActivity_upgrade_this_group">uasghrádaigh an grúpa seo.</string>
@@ -1403,6 +1430,7 @@
         <item quantity="other">Scrios</item>
     </plurals>
 
+    <!-- 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 roghnaithe (%2$s)</item>
         <item quantity="two">%1$d roghnaithe (%2$s)</item>
@@ -1470,17 +1498,13 @@
     <string name="MessageRecord_left_group">D\'fhág tú an bhaicle.</string>
     <string name="MessageRecord_you_updated_group">Nuashonraigh tú an bhaicle</string>
     <string name="MessageRecord_the_group_was_updated">Nuashonraíodh an grúpa.</string>
-    <!-- Update message shown when placing an outgoing 1:1 voice/audio call and it\'s answered by the other party -->
+    <!-- Update message shown when placing an outgoing 1:1 voice/audio call -->
     <string name="MessageRecord_outgoing_voice_call">Guthghlao amach</string>
-    <!-- Update message shown when placing an outgoing 1:1 video call and it\'s answered by the other party -->
+    <!-- Update message shown when placing an outgoing 1:1 video call -->
     <string name="MessageRecord_outgoing_video_call">Físghlao amach</string>
-    <!-- Update message shown when placing an outgoing 1:1 voice/audio call and it\'s not answered by the other party -->
-    <string name="MessageRecord_unanswered_voice_call">Guthghlao nár freagraíodh</string>
-    <!-- Update message shown when placing an outgoing 1:1 video call and it\'s not answered by the other party -->
-    <string name="MessageRecord_unanswered_video_call">Físghlao nár freagraíodh</string>
-    <!-- Update message shown when receiving an incoming 1:1 voice/audio call and it\'s answered -->
+    <!-- Update message shown when receiving an incoming 1:1 voice/audio call and it\'s answered or ringing -->
     <string name="MessageRecord_incoming_voice_call">Guthghlao isteach</string>
-    <!-- Update message shown when receiving an incoming 1:1 video call and answered -->
+    <!-- Update message shown when receiving an incoming 1:1 video call and answered or ringing -->
     <string name="MessageRecord_incoming_video_call">Físghlao isteach</string>
     <!-- Update message shown when receiving an incoming 1:1 voice/audio call and not answered -->
     <string name="MessageRecord_missed_voice_call">Guthghlao caillte</string>
@@ -1490,10 +1514,6 @@
     <string name="MessageRecord_missed_voice_call_notification_profile">Guthghlao caillte agus an phróifíl fógraí casta uirthi</string>
     <!-- Update message shown when receiving an incoming video call and declined due to notification profile -->
     <string name="MessageRecord_missed_video_call_notification_profile">Físghlao caillte agus an phróifíl fógraí casta uirthi</string>
-    <!-- Update message shown when receiving an incoming 1:1 voice/audio call and explicitly declined -->
-    <string name="MessageRecord_you_declined_a_voice_call">Dhiúltaigh tú do ghuthghlao</string>
-    <!-- Update message shown when receiving an incoming 1:1 video call and explicitly declined -->
-    <string name="MessageRecord_you_declined_a_video_call">Dhiúltaigh tú d\'fhísghlao</string>
     <!-- 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">Nuashonraigh %1$s an bhaicle</string>
@@ -1726,23 +1746,47 @@
     <string name="MessageRecord_can_accept_payments">Is féidir le %1$s glacadh le hÍocaíochtaí anois</string>
 
     <!-- Group Calling update messages -->
-    <string name="MessageRecord_s_started_a_group_call_s">Thosaigh %1$s ar ghlao grúpa · %2$s</string>
-    <string name="MessageRecord_you_started_a_group_call_s">Thosaigh tú ar ghrúpghlao · %1$s</string>
-    <string name="MessageRecord_s_is_in_the_group_call_s">Tá %1$s sa ghlao grúpa · %2$s</string>
-    <string name="MessageRecord_you_are_in_the_group_call_s1">Tá tusa sa ghlao grúpa · %1$s</string>
-    <string name="MessageRecord_s_and_s_are_in_the_group_call_s1">Tá %1$s agus %2$s sa ghlao grúpa · %3$s</string>
-    <string name="MessageRecord_group_call_s">Glao grúpa · %1$s</string>
-
-    <string name="MessageRecord_s_started_a_group_call">%1$s started a group call</string>
-    <string name="MessageRecord_you_started_a_group_call">You started a group call</string>
-    <string name="MessageRecord_s_is_in_the_group_call">Tá %1$s sa ghlao grúpa</string>
-    <string name="MessageRecord_you_are_in_the_group_call">You are in the group call</string>
-    <string name="MessageRecord_s_and_s_are_in_the_group_call">Tá %1$s agus %2$s sa ghlao grúpa</string>
-    <string name="MessageRecord_group_call">Glao grúpa</string>
+    <!-- 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">Tá %1$s sa ghlao · %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">Tá tusa sa ghlao · %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">Tá %1$s agus %2$s sa ghlao · %3$s</string>
+    <!-- Chat log text for an ongoing group call that has one participant -->
+    <string name="MessageRecord_s_is_in_the_call">Tá %1$s sa ghlao</string>
+    <!-- Chat log text for an ongoing group call only the local user has joined -->
+    <string name="MessageRecord_you_are_in_the_call">Tá tusa sa ghlao</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">Tá %1$s agus %2$s sa ghlao</string>
+    <!-- Chat log text for a group call that ended within the last 5 minutes -->
+    <string name="MessageRecord__the_video_call_has_ended">Tá an físghlao críochnaithe</string>
+    <!-- Chat log text for a group call that ended within the last 5 minutes with a placeholder for formatted time -->
+    <string name="MessageRecord__the_video_call_has_ended_s">Tá an físghlao críochnaithe · %1$s</string>
+    <!-- Chat log text for a group call that ended more than 5 minutes ago and was missed -->
+    <string name="MessageRecord__missed_video_call">Físghlao caillte</string>
+    <!-- Chat log text for a group call that ended more than 5 minutes ago and was missed with a placeholder for formatted time -->
+    <string name="MessageRecord__missed_video_call_s">Físghlao caillte · %1$s</string>
+    <!-- Chat log text for a group call that ended that the local user did not start -->
+    <string name="MessageRecord__incoming_video_call">Físghlao isteach</string>
+    <!-- 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">Físghlao isteach · %1$s</string>
+    <!-- Chat log text for a group call that ended that the local user started -->
+    <string name="MessageRecord__outgoing_video_call">Físghlao amach</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">Físghlao amach · %1$s</string>
+    <!-- Chat log text for an ongoing group call that the local user started -->
+    <string name="MessageRecord__you_started_a_video_call">Chuir tú tús le físghlao</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">Chuir tú tús le físghlao · %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">Chuir %1$s tús le físghlao</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">Chuir %1$s tús le físghlao · %2$s</string>
 
     <string name="MessageRecord_you">Tusa</string>
 
-    <plurals name="MessageRecord_s_s_and_d_others_are_in_the_group_call_s">
+    <!-- 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">Tá %1$s, %2$s agus %3$d duine eile sa ghlao grúpa · %4$s</item>
         <item quantity="two">Tá %1$s, %2$s agus %3$d dhuine eile sa ghlao grúpa · %4$s</item>
         <item quantity="few">Tá %1$s, %2$s agus %3$d dhuine eile sa ghlao grúpa · %4$s</item>
@@ -1750,7 +1794,8 @@
         <item quantity="other">Tá %1$s, %2$s agus %3$d duine eile sa ghlao grúpa · %4$s</item>
     </plurals>
 
-    <plurals name="MessageRecord_s_s_and_d_others_are_in_the_group_call">
+    <!-- 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">Tá %1$s, %2$s agus %3$d duine eile sa ghlao grúpa</item>
         <item quantity="two">Tá %1$s, %2$s agus %3$d dhuine eile sa ghlao grúpa</item>
         <item quantity="few">Tá %1$s, %2$s agus %3$d dhuine eile sa ghlao grúpa</item>
@@ -2300,6 +2345,7 @@
     <!-- Generic error when the app is unable to request an SMS code for an unknown reason. -->
     <string name="RegistrationActivity_unable_to_request_verification_code">Ní féidir cód fíoraithe a iarraidh. Seiceáil an nasc líonra agus triail arís.</string>
     <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">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.-->
@@ -2447,7 +2493,7 @@
     <string name="SubmitDebugLogActivity_this_log_will_be_posted_publicly_online_for_contributors">Postálfar an loga seo go poiblí ar líne le go mbeidh rannpháirtithe in ann amharc air. Is féidir leat é a scrúdú roimh uaslódáil.</string>
 
     <!-- SupportEmailUtil -->
-  <!-- Removed by excludeNonTranslatables <string name="SupportEmailUtil_support_email" translatable="false">support@molly.im</string> -->
+  <!-- Removed by excludeNonTranslatables <string name="SupportEmailUtil_support_email" translatable="false">support@signal.org</string> -->
     <string name="SupportEmailUtil_filter">Scagaire:</string>
     <string name="SupportEmailUtil_device_info">Faisnéis faoin ngléas:</string>
     <string name="SupportEmailUtil_android_version">Leagan Android:</string>
@@ -2970,6 +3016,8 @@
     <string name="ConversationUpdateItem_loading">Ag Lódáil</string>
     <string name="ConversationUpdateItem_learn_more">Foghlaim tuilleadh</string>
     <string name="ConversationUpdateItem_join_call">Téigh isteach sa ghlao</string>
+    <!-- Action button label for starting a new call in the current conversation -->
+    <string name="ConversationUpdateItem_call_back">Glaoigh ar ais</string>
     <string name="ConversationUpdateItem_return_to_call">Return To Call</string>
     <string name="ConversationUpdateItem_call_is_full">Call is Full</string>
     <string name="ConversationUpdateItem_invite_friends">Tabhair cuirí do chairde</string>
@@ -3034,6 +3082,7 @@
     <string name="safety_number_change_dialog__leave_call">Leave Call</string>
     <string name="safety_number_change_dialog__the_following_people_may_have_reinstalled_or_changed_devices">Seans go bhfuair na daoine seo a leanas gléasanna nua nó go ndearna siad athshuiteáil ar an aip. Deimhnigh d\'uimhir shábháilteachta leo ar eagla na heagla.</string>
     <string name="safety_number_change_dialog__view">Amharc</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">Fíoraithe roimhe</string>
 
     <!-- EnableCallNotificationSettingsDialog__call_notifications_checklist -->
@@ -3368,6 +3417,7 @@
 
     <string name="arrays__default">An réamhshocrú</string>
     <string name="arrays__high">Ard</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">Uasmhéid</string>
 
     <!-- plurals.xml -->
@@ -3648,7 +3698,7 @@
     <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 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>
@@ -3697,6 +3747,14 @@
     <!-- Storage permission row description -->
     <string name="GrantPermissionsFragment__send_photos_videos_and_files">Seol grianghraif, físeáin agus comhaid ó do ghléas.</string>
 
+    <!-- PermissionDeniedBottomSheet -->
+    <!-- Sheet describing step 1 on how to give permissions by opening settings -->
+    <string name="PermissionDeniedBottomSheet__1_tap_settings_below">1. Tap “Settings” below</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 Allow the permission</string>
+    <!-- Label for button at the bottom of the sheet which opens the system permission settings -->
+    <string name="PermissionDeniedBottomSheet__settings">Settings</string>
+
     <!-- PaymentsSecuritySetupFragment -->
     <!-- Toolbar title -->
     <string name="PaymentsSecuritySetupFragment__security_setup">Socrú slándála</string>
@@ -3737,6 +3795,7 @@
     <string name="PaymentsDetailsFragment__sent_to_s">Sent to %1$s</string>
     <string name="PaymentsDetailsFragment__you_on_s_at_s">Tusa ar %1$s ar %2$s</string>
     <string name="PaymentsDetailsFragment__s_on_s_at_s">%1$s ar %2$s ar %3$s</string>
+    <!-- Prefix to a name to indicate who a payment was sent to -->
     <string name="PaymentsDetailsFragment__to">Chuig</string>
     <string name="PaymentsDetailsFragment__from">Ó</string>
     <string name="PaymentsDetailsFragment__information">Tá sonraí idirbhirt, méid na híocaíochta agus am an idirbhirt san áireamh, mar chuid de MobileCoin Ledger.</string>
@@ -3799,6 +3858,7 @@
     <string name="ConfirmPayment__confirm_payment">Confirm Payment</string>
     <string name="ConfirmPayment__network_fee">Network Fee</string>
     <string name="ConfirmPayment__estimated_s">Estimated %1$s</string>
+    <!-- Prefix to a name to indicate who a payment will be sent to -->
     <string name="ConfirmPayment__to">Chuig</string>
     <string name="ConfirmPayment__total_amount">Méid iomlán</string>
     <string name="ConfirmPayment__balance_s">Iarmhéid: %1$s</string>
@@ -3955,6 +4015,14 @@
     <string name="conversation_group_options__conversation">Déan comhrá</string>
     <string name="conversation_group_options__broadcast">Craoladh</string>
 
+    <!-- DoubleTapEditEducationSheet -->
+    <!-- Displayed as the title of the education bottom sheet -->
+    <string name="DoubleTapEditEducationSheet__double_tap_edit_title">Double tap to edit</string>
+    <!-- Text on the sheet explaining how double tapping on a message will let them edit it -->
+    <string name="DoubleTapEditEducationSheet__quickly_tap_twice">Quickly tap twice on your messages to edit them. You can edit your messages up to 24hrs after they’ve been sent.</string>
+    <!-- Button label to dismiss sheet -->
+    <string name="DoubleTapEditEducationSheet__got_it">Got it</string>
+
     <!-- text_secure_normal -->
     <string name="text_secure_normal__menu_new_group">Baicle nua</string>
     <string name="text_secure_normal__menu_settings">Socruithe</string>
@@ -4430,6 +4498,7 @@
     <string name="RecipientBottomSheet_copied_to_clipboard">Macasamhlaithe chuig an ngearrthaisce</string>
 
     <string name="GroupRecipientListItem_admin">Riarthóir</string>
+    <!-- Button text to approve a user that has requested to join a group -->
     <string name="GroupRecipientListItem_approve_description">Ceadaigh í</string>
     <string name="GroupRecipientListItem_deny_description">Diúltaigh dó</string>
 
@@ -4457,6 +4526,7 @@
 
     <!-- VoiceNoteMediaDescriptionCompatFactory -->
     <string name="VoiceNoteMediaItemFactory__voice_message">Glórphost · %1$s</string>
+    <!-- This is a title in a banner describing the conversation sender to receiver placeholders of the currently playing voice memo. -->
     <string name="VoiceNoteMediaItemFactory__s_to_s">%1$s chuig %2$s</string>
 
     <!-- StorageUtil -->
@@ -4470,8 +4540,22 @@
     <string name="ReviewCardDialogFragment__review_members">Review Members</string>
     <!-- Title of a screen where the user will be prompted to review a message request matching the name of someone they already know -->
     <string name="ReviewCardDialogFragment__review_request">Review Request</string>
-    <string name="ReviewCardDialogFragment__d_group_members_have_the_same_name">Tá an t-ainm céanna ag an líon seo ball den ghrúpa: %1$d, athbhreithnigh na baill thíos agus déan gníomh.</string>
-    <string name="ReviewCardDialogFragment__if_youre_not_sure">Mura bhfuil tú cinnte faoin duine a sheol an t-iarratas, déan athbhreithniú ar na teagmhálaithe thíos agus déan gníomh.</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="two">%1$d group members have the same name, review the members below and choose to take action.</item>
+        <item quantity="few">%1$d group members have the same name, review the members below and choose to take action.</item>
+        <item quantity="many">%1$d group members have the same name, review the members 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 -->
+    <plurals name="ReviewCardDialogFragment__if_youre_not_sure">
+        <item quantity="one">If you\'re not sure who the request is from, review the contact below and take action.</item>
+        <item quantity="two">If you\'re not sure who the request is from, review the contacts below and take action.</item>
+        <item quantity="few">If you\'re not sure who the request is from, review the contacts below and take action.</item>
+        <item quantity="many">If you\'re not sure who the request is from, review the contacts below and take action.</item>
+        <item quantity="other">If you\'re not sure who the request is from, review the contacts below and take action.</item>
+    </plurals>
     <string name="ReviewCardDialogFragment__no_other_groups_in_common">No other groups in common.</string>
     <string name="ReviewCardDialogFragment__no_groups_in_common">Níl aon ghrúpaí i bpáirt.</string>
     <plurals name="ReviewCardDialogFragment__d_other_groups_in_common">
@@ -4508,11 +4592,26 @@
     <string name="CallParticipantsListUpdatePopupWindow__s_joined">Chuaigh %1$s isteach ann</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_and_s_joined">Chuaigh %1$s agus %2$s isteach ann</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_s_and_s_joined">Chuaigh %1$s, %2$s agus %3$s isteach ann</string>
-    <string name="CallParticipantsListUpdatePopupWindow__s_s_and_d_others_joined">Chuaigh %1$s, %2$s agus %3$d eile isteach ann</string>
+    <!-- Toast message shown in group call when 3 or more people join -->
+    <plurals name="CallParticipantsListUpdatePopupWindow__s_s_and_d_others_joined">
+        <item quantity="one">%1$s, %2$s and %3$d other joined</item>
+        <item quantity="two">%1$s, %2$s and %3$d others joined</item>
+        <item quantity="few">%1$s, %2$s and %3$d others joined</item>
+        <item quantity="many">%1$s, %2$s and %3$d others joined</item>
+        <item quantity="other">%1$s, %2$s and %3$d others joined</item>
+    </plurals>
+    <!-- Toast/popup text shown when someone leaves a group call -->
     <string name="CallParticipantsListUpdatePopupWindow__s_left">D\'fhág %1$s</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_and_s_left">D\'fhág %1$s agus %2$s</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_s_and_s_left">D\'imigh %1$s, %2$s agus %3$s as</string>
-    <string name="CallParticipantsListUpdatePopupWindow__s_s_and_d_others_left">D\'imigh %1$s, %2$s agus %3$d eile as</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 and %3$d other left</item>
+        <item quantity="two">%1$s, %2$s and %3$d others left</item>
+        <item quantity="few">%1$s, %2$s and %3$d others left</item>
+        <item quantity="many">%1$s, %2$s and %3$d others left</item>
+        <item quantity="other">%1$s, %2$s and %3$d others left</item>
+    </plurals>
 
     <string name="CallParticipant__you">Tusa</string>
     <string name="CallParticipant__you_on_another_device">Tú (ar ghléas eile)</string>
@@ -4888,10 +4987,18 @@
 
     <!-- PrivacySettingsFragment -->
     <string name="PrivacySettingsFragment__blocked">Bac curtha</string>
-    <string name="PrivacySettingsFragment__d_contacts">Líon teagmhálaithe: %1$d</string>
+    <!-- Settings label that shows the number blocked contacts -->
+    <plurals name="PrivacySettingsFragment__d_contacts">
+        <item quantity="one">%1$d contact</item>
+        <item quantity="two">%1$d contacts</item>
+        <item quantity="few">%1$d contacts</item>
+        <item quantity="many">%1$d contacts</item>
+        <item quantity="other">%1$d contacts</item>
+    </plurals>
     <string name="PrivacySettingsFragment__messaging">Ag seoladh teachtaireachtaí</string>
     <string name="PrivacySettingsFragment__disappearing_messages">Teachtaireachtaí a imíonn as amharc</string>
     <string name="PrivacySettingsFragment__app_security">App Security</string>
+    <!-- This refers to the multi-tasking overview (recent apps) from the Android operating system.-->
     <string name="PrivacySettingsFragment__block_screenshots_in_the_recents_list_and_inside_the_app">Cuir bac ar ghabhálacha scáileáin sa liosta le déanaí agus laistigh den aip</string>
     <string name="PrivacySettingsFragment__signal_message_and_calls">Teachtaireachtaí agus glaonna Signal, atreoraigh glaonna i gcónaí, agus seoltóir séalaithe</string>
     <string name="PrivacySettingsFragment__default_timer_for_new_changes">Amadóir réamhshocraithe ar chomhráite nua</string>
@@ -4948,11 +5055,14 @@
     <string name="DataAndStorageSettingsFragment__media_quality">Media Quality</string>
     <string name="DataAndStorageSettingsFragment__sent_media_quality">Sent Media Quality</string>
     <string name="DataAndStorageSettingsFragment__sending_high_quality_media_will_use_more_data">Sending high quality media will use more data.</string>
+    <!-- Setting option that can be selected to default media to be sent as high quality by default -->
     <string name="DataAndStorageSettingsFragment__high">Ard</string>
+    <!-- Setting option that can be selected to default media to be sent as standard quality by default -->
     <string name="DataAndStorageSettingsFragment__standard">Caighdeánach</string>
     <string name="DataAndStorageSettingsFragment__calls">Glaonna</string>
 
     <!-- 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__use_custom_colors">Úsáid dathanna saincheaptha</string>
     <string name="ChatColorSelectionFragment__chat_color">Dath an chomhrá</string>
@@ -5173,6 +5283,7 @@
     <string name="AvatarPickerFragment__take_a_picture">Glac grianghraf</string>
     <string name="AvatarPickerFragment__choose_a_photo">Roghnaigh grianghraf</string>
     <string name="AvatarPickerFragment__photo">Grianghraf</string>
+    <!-- Button label during avatar selection/creation that when tapped lets you generate an avatar from typed in text. -->
     <string name="AvatarPickerFragment__text">Téacs</string>
     <string name="AvatarPickerFragment__save">Sábháil</string>
     <string name="AvatarPickerFragment__clear_avatar">Glan an tAbhatár</string>
@@ -5245,7 +5356,7 @@
     <string name="MediaReviewFragment__add_a_message">Cuir teachtaireacht leis</string>
     <string name="MediaReviewFragment__add_a_reply">Cuir freagra leis</string>
     <string name="MediaReviewFragment__send_to">Seol chuig</string>
-    <string name="MediaReviewFragment__view_once_message">Teachtaireacht amhairc aonuaire</string>
+    <string name="MediaReviewFragment__view_once_message">Meáin amhairc aonuaire</string>
     <string name="MediaReviewFragment__one_or_more_items_were_too_large">Bhí mír amháin nó níos mó rómhór</string>
     <string name="MediaReviewFragment__one_or_more_items_were_invalid">Bhí mír amháin nó níos mó neamhbhailí</string>
     <string name="MediaReviewFragment__too_many_items_selected">Roghnaíodh an iomarca nithe</string>
@@ -5853,7 +5964,7 @@
     <string name="StoryViewerFragment__s_s">%1$s %2$s</string>
     <!-- Displayed when viewing a post you sent -->
     <string name="StoryViewerPageFragment__you">Tusa</string>
-    <!-- Displayed when viewing a post displayed to a group -->
+    <!-- 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 chuig %2$s</string>
     <!-- Displayed when viewing a post from another user with no replies -->
     <string name="StoryViewerPageFragment__reply">Freagair</string>
@@ -7118,7 +7229,7 @@
     <!-- Title displayed at the top of the screen -->
     <string name="NicknameActivity__nickname">Leasainm</string>
     <!-- Subtitle displayed under title -->
-    <string name="NicknameActivity__nicknames_amp_notes">Nicknames &amp; notes are stored with Signal and end-to-end encrypted. They are only visible to you.</string>
+    <string name="NicknameActivity__nicknames_amp_notes">Stóráiltear leasainmneacha agus nótaí le Signal agus iad criptithe ó cheann ceann. Níl siad infheicthe ach agatsa amháin.</string>
     <!-- Field label for given name -->
     <string name="NicknameActivity__first_name">Ainm</string>
     <!-- Content description for first name clear button -->
@@ -7132,9 +7243,9 @@
     <!-- Button label to save -->
     <string name="NicknameActivity__save">Sábháil</string>
     <!-- Dialog title for note and name deletion -->
-    <string name="NicknameActivity__delete_nickname">Delete?</string>
+    <string name="NicknameActivity__delete_nickname">Scrios?</string>
     <!-- Dialog message for note and name deletion -->
-    <string name="NicknameActivity__this_will_permanently_delete_this_nickname_and_note">This will permanently delete any nickname and note you’ve set.</string>
+    <string name="NicknameActivity__this_will_permanently_delete_this_nickname_and_note">Scriosfar aon leasainm agus nóta a shocraigh tú.</string>
 
     <!-- ViewNoteBottomSheetDialogFragment -->
     <!-- Sheet title -->
@@ -7142,5 +7253,26 @@
     <!-- Content description for opening the note editor -->
     <string name="ViewNoteSheet__edit_note">Cuir nóta in eagar</string>
 
+    <!-- BackupProgressService -->
+    <!-- Notification title shown while backup restore job is running -->
+    <string name="BackupProgressService_title">Cúltaca á chur ar ais…</string>
+    <!-- Notification title shown while downloading backup restore data -->
+    <string name="BackupProgressService_title_downloading">Sonraí cúltaca á n-í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">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 -->
+    <string name="BackupsTypeSettingsFragment__google_pay">Google Pay</string>
+    <!-- Displayed as the user\'s payment method as a label in a preference row -->
+    <string name="BackupsTypeSettingsFragment__bank_transfer">Bank transfer</string>
+    <!-- Displayed as the user\'s payment method as a label in a preference row -->
+    <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>
+
+
     <!-- 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 9d6fd26190..46d35ab3a1 100644
--- a/app/src/main/res/values-gl/strings.xml
+++ b/app/src/main/res/values-gl/strings.xml
@@ -1,6 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- smartling.instruction_comments_enabled = on -->
-<resources>
+<?xml version="1.0" encoding="UTF-8"?><!-- 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> -->
@@ -89,6 +87,16 @@
     <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">Allow access to your location</string>
+    <!-- Dialog description that will explain the steps needed to give location permission -->
+    <string name="AttachmentManager_signal_to_send_location">To send your location:</string>
+    <!-- Alert dialog description asking for location permission -->
+    <string name="AttachmentManager_signal_allow_signal_access_location">Allow Molly access to send your location.</string>
+    <!-- Toast text explaining Signal\'s need for location access -->
+    <string name="AttachmentManager_signal_needs_location_access">Molly needs location access to send your location.</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>
     <!-- Alert dialog description to send the recipient a request to activate payments -->
@@ -241,7 +249,7 @@
     <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>
@@ -386,8 +394,16 @@
     <string name="ConversationActivity_your_request_to_join_has_been_sent_to_the_group_admin">Enviouse a solicitude á administración do grupo. Recibirás unha notificación cando a resolvan.</string>
     <string name="ConversationActivity_cancel_request">Cancelar solicitude</string>
 
-    <string name="ConversationActivity_to_send_audio_messages_allow_signal_access_to_your_microphone">Para enviar mensaxes de son, Molly necesita acceder ao teu micrófono.</string>
+    <!-- Dialog title asking users for microphone permission -->
+    <string name="ConversationActivity_allow_access_microphone">Allow access to your microphone</string>
+    <!-- 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>
+    <!-- Toast text explaining Signal\'s need for microphone access -->
+    <string name="ConversationActivity_signal_needs_microphone_access_voice_message">Molly needs microphone access to record a voice message.</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">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>
@@ -411,10 +427,17 @@
     <string name="ConversationActivity_you_will_leave_this_group_and_it_will_be_deleted_from_all_of_your_devices">Abandonarás este grupo e eliminarase de todos os teus dispositivos.</string>
     <string name="ConversationActivity_delete">Eliminar</string>
     <string name="ConversationActivity_delete_and_leave">Eliminar e saír</string>
-    <string name="ConversationActivity__to_call_s_signal_needs_access_to_your_microphone">Para chamar a %1$s, Molly necesita acceder ao teu micrófono.</string>
+
+    <!-- Dialog description that will explain the steps needed to give microphone permissions for a voice call -->
+    <string name="ConversationActivity__to_start_call">To start a 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">To start a call, allow Molly access to your microphone.</string>
+    <!-- Toast text explaining Signal\'s need for microphone access for a voice call -->
+    <string name="ConversationActivity_signal_needs_microphone_access_voice_call">Molly needs microphone access to start a call.</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">Completo</string>
 
     <string name="ConversationActivity_error_sending_media">Erro ao enviar o multimedia</string>
@@ -613,6 +636,7 @@
     <string name="ConversationListFragment_unarchive">Desarquivar</string>
     <string name="ConversationListFragment_delete">Borrar</string>
     <string name="ConversationListFragment_select_all">Marcar todo</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 seleccionado</item>
         <item quantity="other">%1$d seleccionados</item>
@@ -864,6 +888,7 @@
         <item quantity="one">Invitación enviada</item>
         <item quantity="other">%1$d invitacións 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">Non podes engadir a «%1$s» automaticamente a este grupo.\n\nRecibiron invitacións para participar e non verán ningunha mensaxe do grupo ata que acepten.</string>
     <string name="GroupManagement_invite_multiple_users">Estes usuarios non se poden engadir automaticamente a este grupo.\n\nRecibiron unha invitación para participar no grupo e non verán ningunha mensaxe do grupo ata que acepten.</string>
 
@@ -1044,7 +1069,9 @@
 
     <string name="ManageGroupActivity_edit_name_and_picture">Editar nome e imaxe</string>
     <string name="ManageGroupActivity_legacy_group">Grupo Clásico</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 é un Grupo Clásico. Características como a administración de grupos só están dispoñibles nos Novos Grupos.</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 é un Grupo Clásico. Para ter novas características como @mencións e adminitradores,</string>
     <string name="ManageGroupActivity_legacy_group_too_large">Este Grupo Clásico non pode actualizarse a Novos Grupos porque é demasiado grande. O tamaño máximo do grupo é %1$d.</string>
     <string name="ManageGroupActivity_upgrade_this_group">actualizar este grupo.</string>
@@ -1271,6 +1298,7 @@
         <item quantity="other">Borrar</item>
     </plurals>
 
+    <!-- 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 seleccionados (%2$s)</item>
         <item quantity="other">%1$d seleccionado (%2$s)</item>
@@ -1335,17 +1363,13 @@
     <string name="MessageRecord_left_group">Abandonaches o grupo.</string>
     <string name="MessageRecord_you_updated_group">Actualizaches o grupo.</string>
     <string name="MessageRecord_the_group_was_updated">Actualizouse o grupo.</string>
-    <!-- Update message shown when placing an outgoing 1:1 voice/audio call and it\'s answered by the other party -->
+    <!-- Update message shown when placing an outgoing 1:1 voice/audio call -->
     <string name="MessageRecord_outgoing_voice_call">Chamada de voz saínte</string>
-    <!-- Update message shown when placing an outgoing 1:1 video call and it\'s answered by the other party -->
+    <!-- Update message shown when placing an outgoing 1:1 video call -->
     <string name="MessageRecord_outgoing_video_call">Chamada de vídeo saínte</string>
-    <!-- Update message shown when placing an outgoing 1:1 voice/audio call and it\'s not answered by the other party -->
-    <string name="MessageRecord_unanswered_voice_call">Chamada de voz non respondida</string>
-    <!-- Update message shown when placing an outgoing 1:1 video call and it\'s not answered by the other party -->
-    <string name="MessageRecord_unanswered_video_call">Chamada de vídeo non respondida</string>
-    <!-- Update message shown when receiving an incoming 1:1 voice/audio call and it\'s answered -->
+    <!-- Update message shown when receiving an incoming 1:1 voice/audio call and it\'s answered or ringing -->
     <string name="MessageRecord_incoming_voice_call">Chamada de voz entrante</string>
-    <!-- Update message shown when receiving an incoming 1:1 video call and answered -->
+    <!-- Update message shown when receiving an incoming 1:1 video call and answered or ringing -->
     <string name="MessageRecord_incoming_video_call">Chamada de vídeo entrante</string>
     <!-- Update message shown when receiving an incoming 1:1 voice/audio call and not answered -->
     <string name="MessageRecord_missed_voice_call">Chamada de voz perdida</string>
@@ -1355,10 +1379,6 @@
     <string name="MessageRecord_missed_voice_call_notification_profile">Chamada de voz perdida mentres o perfil de notificación estaba activado</string>
     <!-- Update message shown when receiving an incoming video call and declined due to notification profile -->
     <string name="MessageRecord_missed_video_call_notification_profile">Videochamada perdida mentres o perfil de notificación estaba activado</string>
-    <!-- Update message shown when receiving an incoming 1:1 voice/audio call and explicitly declined -->
-    <string name="MessageRecord_you_declined_a_voice_call">Rexeitaches unha chamada de voz</string>
-    <!-- Update message shown when receiving an incoming 1:1 video call and explicitly declined -->
-    <string name="MessageRecord_you_declined_a_video_call">Rexeitaches unha chamada de vídeo</string>
     <!-- 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 actualizou o grupo.</string>
@@ -1567,28 +1587,53 @@
     <string name="MessageRecord_can_accept_payments">%1$s agora pode aceptar Pagamentos</string>
 
     <!-- Group Calling update messages -->
-    <string name="MessageRecord_s_started_a_group_call_s">%1$s iniciou unha chamada en grupo · %2$s</string>
-    <string name="MessageRecord_you_started_a_group_call_s">Iniciaches unha chamada de grupo · %1$s</string>
-    <string name="MessageRecord_s_is_in_the_group_call_s">%1$s está na chamada en grupo · %2$s</string>
-    <string name="MessageRecord_you_are_in_the_group_call_s1">Estás na chamada en grupo - %1$s</string>
-    <string name="MessageRecord_s_and_s_are_in_the_group_call_s1">%1$s e %2$s están na chamada en grupo · %3$s</string>
-    <string name="MessageRecord_group_call_s">Chamada en grupo · %1$s</string>
-
-    <string name="MessageRecord_s_started_a_group_call">%1$s iniciou unha chamada en grupo</string>
-    <string name="MessageRecord_you_started_a_group_call">Iniciaches unha chamada de grupo</string>
-    <string name="MessageRecord_s_is_in_the_group_call">%1$s está na chamada en grupo</string>
-    <string name="MessageRecord_you_are_in_the_group_call">Estás na chamada en grupo</string>
-    <string name="MessageRecord_s_and_s_are_in_the_group_call">%1$s e %2$s están na chamada en grupo</string>
-    <string name="MessageRecord_group_call">Chamada en grupo</string>
+    <!-- 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 está na chamada · %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">Estás na chamada · %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 e %2$s están na chamada · %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 está na chamada</string>
+    <!-- Chat log text for an ongoing group call only the local user has joined -->
+    <string name="MessageRecord_you_are_in_the_call">Estás na chamada</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 e %2$s están na chamada</string>
+    <!-- Chat log text for a group call that ended within the last 5 minutes -->
+    <string name="MessageRecord__the_video_call_has_ended">A videochamada rematou</string>
+    <!-- Chat log text for a group call that ended within the last 5 minutes with a placeholder for formatted time -->
+    <string name="MessageRecord__the_video_call_has_ended_s">A videochamada rematou · %1$s</string>
+    <!-- Chat log text for a group call that ended more than 5 minutes ago and was missed -->
+    <string name="MessageRecord__missed_video_call">Chamada de vídeo perdida</string>
+    <!-- Chat log text for a group call that ended more than 5 minutes ago and was missed with a placeholder for formatted time -->
+    <string name="MessageRecord__missed_video_call_s">Chamada perdida de vídeo · %1$s</string>
+    <!-- Chat log text for a group call that ended that the local user did not start -->
+    <string name="MessageRecord__incoming_video_call">Chamada de vídeo entrante</string>
+    <!-- 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">Videochamada entrante · %1$s</string>
+    <!-- Chat log text for a group call that ended that the local user started -->
+    <string name="MessageRecord__outgoing_video_call">Chamada de vídeo saínte</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">Videochamada saínte · %1$s</string>
+    <!-- Chat log text for an ongoing group call that the local user started -->
+    <string name="MessageRecord__you_started_a_video_call">Iniciaches unha videochamada</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">Iniciaches unha videochamada · %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 iniciou unha videochamada</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 iniciou unha videochamada · %2$s</string>
 
     <string name="MessageRecord_you">Ti</string>
 
-    <plurals name="MessageRecord_s_s_and_d_others_are_in_the_group_call_s">
+    <!-- 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 e %3$d máis están na chamada en grupo · %4$s</item>
         <item quantity="other">%1$s, %2$se %3$d máis están na chamada en grupo · %4$s</item>
     </plurals>
 
-    <plurals name="MessageRecord_s_s_and_d_others_are_in_the_group_call">
+    <!-- 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 e %3$d máis están na chamada en grupo</item>
         <item quantity="other">%1$s, %2$s e %3$d máis están na chamada en grupo</item>
     </plurals>
@@ -2063,6 +2108,7 @@
     <!-- Generic error when the app is unable to request an SMS code for an unknown reason. -->
     <string name="RegistrationActivity_unable_to_request_verification_code">Non foi posible solicitar un código de verificación. Comproba a conexión a Internet e inténtao de novo.</string>
     <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">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.-->
@@ -2207,7 +2253,7 @@
     <string name="SubmitDebugLogActivity_this_log_will_be_posted_publicly_online_for_contributors">Este informe será publicado de xeito público para que os desenvolvedores poidan velo. Podes examinar o seu contido antes de subilo.</string>
 
     <!-- SupportEmailUtil -->
-  <!-- Removed by excludeNonTranslatables <string name="SupportEmailUtil_support_email" translatable="false">support@molly.im</string> -->
+  <!-- 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 do dispositivo:</string>
     <string name="SupportEmailUtil_android_version">Versión de Android:</string>
@@ -2709,6 +2755,8 @@
     <string name="ConversationUpdateItem_loading">Cargando</string>
     <string name="ConversationUpdateItem_learn_more">Saber máis</string>
     <string name="ConversationUpdateItem_join_call">Unirse á chamada</string>
+    <!-- Action button label for starting a new call in the current conversation -->
+    <string name="ConversationUpdateItem_call_back">Devolver chamada</string>
     <string name="ConversationUpdateItem_return_to_call">Volver chamar</string>
     <string name="ConversationUpdateItem_call_is_full">A chamada está completa</string>
     <string name="ConversationUpdateItem_invite_friends">Convidar amizades</string>
@@ -2773,6 +2821,7 @@
     <string name="safety_number_change_dialog__leave_call">Deixar a chamada</string>
     <string name="safety_number_change_dialog__the_following_people_may_have_reinstalled_or_changed_devices">As seguintes persoas pode que reinstalasen ou cambiasen de dispositivo. Comproba o número de seguranza con elas para garantir a privacidade.</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">Verificado previamente</string>
 
     <!-- EnableCallNotificationSettingsDialog__call_notifications_checklist -->
@@ -3086,6 +3135,7 @@
 
     <string name="arrays__default">Por defecto</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 -->
@@ -3357,7 +3407,7 @@
     <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 Molly xa non están dispoñibles. Podes seguir transferindo fondos para intercambiar pero non podes enviar e recibir pagamentos nin engadir fondos.</string>
@@ -3406,6 +3456,14 @@
     <!-- Storage permission row description -->
     <string name="GrantPermissionsFragment__send_photos_videos_and_files">Envía fotos, vídeos e arquivos dende o teu dispositivo.</string>
 
+    <!-- PermissionDeniedBottomSheet -->
+    <!-- Sheet describing step 1 on how to give permissions by opening settings -->
+    <string name="PermissionDeniedBottomSheet__1_tap_settings_below">1. Tap “Settings” below</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 Allow the permission</string>
+    <!-- Label for button at the bottom of the sheet which opens the system permission settings -->
+    <string name="PermissionDeniedBottomSheet__settings">Settings</string>
+
     <!-- PaymentsSecuritySetupFragment -->
     <!-- Toolbar title -->
     <string name="PaymentsSecuritySetupFragment__security_setup">Configuración de seguranza</string>
@@ -3446,6 +3504,7 @@
     <string name="PaymentsDetailsFragment__sent_to_s">Enviado a %1$s</string>
     <string name="PaymentsDetailsFragment__you_on_s_at_s">Ti o %1$s ás %2$s</string>
     <string name="PaymentsDetailsFragment__s_on_s_at_s">%1$s o %2$s á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">Os detalles da transacción, nos que se inclúen a cantidade que se paga e a hora, forman parte do Libro de contas de MobileCoin.</string>
@@ -3508,6 +3567,7 @@
     <string name="ConfirmPayment__confirm_payment">Confirmar pagamento</string>
     <string name="ConfirmPayment__network_fee">Taxa de rede</string>
     <string name="ConfirmPayment__estimated_s">Estimación: %1$s</string>
+    <!-- Prefix to a name to indicate who a payment will be sent to -->
     <string name="ConfirmPayment__to">Para</string>
     <string name="ConfirmPayment__total_amount">Contía total</string>
     <string name="ConfirmPayment__balance_s">Saldo: %1$s</string>
@@ -3658,6 +3718,14 @@
     <string name="conversation_group_options__conversation">Conversa</string>
     <string name="conversation_group_options__broadcast">Difusión</string>
 
+    <!-- DoubleTapEditEducationSheet -->
+    <!-- Displayed as the title of the education bottom sheet -->
+    <string name="DoubleTapEditEducationSheet__double_tap_edit_title">Double tap to edit</string>
+    <!-- Text on the sheet explaining how double tapping on a message will let them edit it -->
+    <string name="DoubleTapEditEducationSheet__quickly_tap_twice">Quickly tap twice on your messages to edit them. You can edit your messages up to 24hrs after they’ve been sent.</string>
+    <!-- Button label to dismiss sheet -->
+    <string name="DoubleTapEditEducationSheet__got_it">Got it</string>
+
     <!-- text_secure_normal -->
     <string name="text_secure_normal__menu_new_group">Novo grupo</string>
     <string name="text_secure_normal__menu_settings">Axustes</string>
@@ -4112,6 +4180,7 @@
     <string name="RecipientBottomSheet_copied_to_clipboard">Copiado ao portapapeis</string>
 
     <string name="GroupRecipientListItem_admin">Administrador</string>
+    <!-- Button text to approve a user that has requested to join a group -->
     <string name="GroupRecipientListItem_approve_description">Aprobar</string>
     <string name="GroupRecipientListItem_deny_description">Rexeitar</string>
 
@@ -4139,6 +4208,7 @@
 
     <!-- VoiceNoteMediaDescriptionCompatFactory -->
     <string name="VoiceNoteMediaItemFactory__voice_message">Mensaxe de voz · %1$s</string>
+    <!-- This is a title in a banner describing the conversation sender to receiver placeholders of the currently playing voice memo. -->
     <string name="VoiceNoteMediaItemFactory__s_to_s">%1$s a %2$s</string>
 
     <!-- StorageUtil -->
@@ -4152,8 +4222,16 @@
     <string name="ReviewCardDialogFragment__review_members">Revisar membros</string>
     <!-- Title of a screen where the user will be prompted to review a message request matching the name of someone they already know -->
     <string name="ReviewCardDialogFragment__review_request">Revisar solicitude</string>
-    <string name="ReviewCardDialogFragment__d_group_members_have_the_same_name">%1$d membros do grupo teñen o mesmo nome; revísaos e elixe unha acción.</string>
-    <string name="ReviewCardDialogFragment__if_youre_not_sure">Se non estás seguro de quen é a solicitude, revisa os contactos e elixe unha acción.</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="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 -->
+    <plurals name="ReviewCardDialogFragment__if_youre_not_sure">
+        <item quantity="one">If you\'re not sure who the request is from, review the contact below and take action.</item>
+        <item quantity="other">If you\'re not sure who the request is from, review the contacts below and take action.</item>
+    </plurals>
     <string name="ReviewCardDialogFragment__no_other_groups_in_common">Ningún outro grupo en común.</string>
     <string name="ReviewCardDialogFragment__no_groups_in_common">Ningún grupo en común.</string>
     <plurals name="ReviewCardDialogFragment__d_other_groups_in_common">
@@ -4184,11 +4262,20 @@
     <string name="CallParticipantsListUpdatePopupWindow__s_joined">%1$suniuse</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_and_s_joined">%1$s e %2$s uníronse</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_s_and_s_joined">%1$s, %2$s e %3$s uníronse</string>
-    <string name="CallParticipantsListUpdatePopupWindow__s_s_and_d_others_joined">%1$s, %2$s e outros %3$d uníronse</string>
+    <!-- Toast message shown in group call when 3 or more people join -->
+    <plurals name="CallParticipantsListUpdatePopupWindow__s_s_and_d_others_joined">
+        <item quantity="one">%1$s, %2$s and %3$d other joined</item>
+        <item quantity="other">%1$s, %2$s and %3$d others joined</item>
+    </plurals>
+    <!-- Toast/popup text shown when someone leaves a group call -->
     <string name="CallParticipantsListUpdatePopupWindow__s_left">%1$s saíu</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_and_s_left">%1$s e %2$s saíron</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_s_and_s_left">%1$s, %2$s e %3$s saíron</string>
-    <string name="CallParticipantsListUpdatePopupWindow__s_s_and_d_others_left">%1$s, %2$s e outros %3$d saíron</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 and %3$d other left</item>
+        <item quantity="other">%1$s, %2$s and %3$d others left</item>
+    </plurals>
 
     <string name="CallParticipant__you">Ti</string>
     <string name="CallParticipant__you_on_another_device">Ti (noutro dispositivo)</string>
@@ -4558,10 +4645,15 @@
 
     <!-- PrivacySettingsFragment -->
     <string name="PrivacySettingsFragment__blocked">Bloqueado</string>
-    <string name="PrivacySettingsFragment__d_contacts">%1$d contactos</string>
+    <!-- Settings label that shows the number blocked contacts -->
+    <plurals name="PrivacySettingsFragment__d_contacts">
+        <item quantity="one">%1$d contact</item>
+        <item quantity="other">%1$d contacts</item>
+    </plurals>
     <string name="PrivacySettingsFragment__messaging">Mensaxería</string>
     <string name="PrivacySettingsFragment__disappearing_messages">Desaparición das mensaxes</string>
     <string name="PrivacySettingsFragment__app_security">Seguranza da app</string>
+    <!-- This refers to the multi-tasking overview (recent apps) from the Android operating system.-->
     <string name="PrivacySettingsFragment__block_screenshots_in_the_recents_list_and_inside_the_app">Bloquea as capturas na listaxe de recentes e na aplicación</string>
     <string name="PrivacySettingsFragment__signal_message_and_calls">Mensaxes e chamadas Signal, redirección de chamadas e remitente selado</string>
     <string name="PrivacySettingsFragment__default_timer_for_new_changes">Establecer duración das novas conversas</string>
@@ -4618,11 +4710,14 @@
     <string name="DataAndStorageSettingsFragment__media_quality">Calidade multimedia</string>
     <string name="DataAndStorageSettingsFragment__sent_media_quality">Calidade dos envíos</string>
     <string name="DataAndStorageSettingsFragment__sending_high_quality_media_will_use_more_data">Enviando multimedia con alta calidade usarás máis datos</string>
+    <!-- Setting option that can be selected to default media to be sent as high quality by default -->
     <string name="DataAndStorageSettingsFragment__high">Alta</string>
+    <!-- Setting option that can be selected to default media to be sent as standard quality by default -->
     <string name="DataAndStorageSettingsFragment__standard">Estándar</string>
     <string name="DataAndStorageSettingsFragment__calls">Chamadas</string>
 
     <!-- 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__use_custom_colors">Empregar cores personalizadas</string>
     <string name="ChatColorSelectionFragment__chat_color">Cor da conversa</string>
@@ -4834,6 +4929,7 @@
     <string name="AvatarPickerFragment__take_a_picture">Sacar foto</string>
     <string name="AvatarPickerFragment__choose_a_photo">Escoller unha foto</string>
     <string name="AvatarPickerFragment__photo">Fotografía</string>
+    <!-- Button label during avatar selection/creation that when tapped lets you generate an avatar from typed in text. -->
     <string name="AvatarPickerFragment__text">Texto</string>
     <string name="AvatarPickerFragment__save">Gardar</string>
     <string name="AvatarPickerFragment__clear_avatar">Desbotar avatar</string>
@@ -4894,7 +4990,7 @@
     <string name="MediaReviewFragment__add_a_message">Engadir mensaxe</string>
     <string name="MediaReviewFragment__add_a_reply">Engadir unha resposta</string>
     <string name="MediaReviewFragment__send_to">Enviar a</string>
-    <string name="MediaReviewFragment__view_once_message">Mensaxe para ver unha vez</string>
+    <string name="MediaReviewFragment__view_once_message">Arquivo dunha soa visualización</string>
     <string name="MediaReviewFragment__one_or_more_items_were_too_large">Un ou máis elementos son demasiado grandes</string>
     <string name="MediaReviewFragment__one_or_more_items_were_invalid">Un ou máis elementos son incorrectos</string>
     <string name="MediaReviewFragment__too_many_items_selected">Demasiados elementos seleccionados</string>
@@ -5487,7 +5583,7 @@
     <string name="StoryViewerFragment__s_s">%1$s %2$s</string>
     <!-- Displayed when viewing a post you sent -->
     <string name="StoryViewerPageFragment__you">Ti</string>
-    <!-- Displayed when viewing a post displayed to a group -->
+    <!-- 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 -->
     <string name="StoryViewerPageFragment__reply">Responder</string>
@@ -6704,5 +6800,26 @@
     <!-- Content description for opening the note editor -->
     <string name="ViewNoteSheet__edit_note">Editar nota</string>
 
+    <!-- BackupProgressService -->
+    <!-- Notification title shown while backup restore job is running -->
+    <string name="BackupProgressService_title">Restaurando copia de seguranza…</string>
+    <!-- Notification title shown while downloading backup restore data -->
+    <string name="BackupProgressService_title_downloading">Descargando copia de seguranza…</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>
+    <!-- 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 -->
+    <string name="BackupsTypeSettingsFragment__google_pay">Google Pay</string>
+    <!-- Displayed as the user\'s payment method as a label in a preference row -->
+    <string name="BackupsTypeSettingsFragment__bank_transfer">Bank transfer</string>
+    <!-- Displayed as the user\'s payment method as a label in a preference row -->
+    <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>
+
+
     <!-- 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 ab6f4b84da..e0f9fd6305 100644
--- a/app/src/main/res/values-gu/strings.xml
+++ b/app/src/main/res/values-gu/strings.xml
@@ -1,6 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- smartling.instruction_comments_enabled = on -->
-<resources>
+<?xml version="1.0" encoding="UTF-8"?><!-- 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> -->
@@ -89,6 +87,16 @@
     <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">Allow access to your location</string>
+    <!-- Dialog description that will explain the steps needed to give location permission -->
+    <string name="AttachmentManager_signal_to_send_location">To send your location:</string>
+    <!-- Alert dialog description asking for location permission -->
+    <string name="AttachmentManager_signal_allow_signal_access_location">Allow Molly access to send your location.</string>
+    <!-- Toast text explaining Signal\'s need for location access -->
+    <string name="AttachmentManager_signal_needs_location_access">Molly needs location access to send your location.</string>
+
     <!-- Alert dialog title to show the recipient has not activated payments -->
     <string name="AttachmentManager__not_activated_payments">%1$sએ પેમેન્ટ સક્રિય કરેલ નથી </string>
     <!-- Alert dialog description to send the recipient a request to activate payments -->
@@ -241,7 +249,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>
@@ -386,8 +394,16 @@
     <string name="ConversationActivity_your_request_to_join_has_been_sent_to_the_group_admin">તમારી જૂથમાં જોડાવવાની વિનંતી એડમિનને મોકલવામાં આવી છે. જ્યારે તેઓ મંજૂર કરશે ત્યારે તમને જાણ કરવામાં આવશે.</string>
     <string name="ConversationActivity_cancel_request">વિનંતી રદ કરો</string>
 
-    <string name="ConversationActivity_to_send_audio_messages_allow_signal_access_to_your_microphone">ઓડિયો મેસેજ મોકલવા માટે, તમારા માઇક્રોફોન પર Molly એક્સેસની મંજૂરી આપો.</string>
+    <!-- Dialog title asking users for microphone permission -->
+    <string name="ConversationActivity_allow_access_microphone">Allow access to your microphone</string>
+    <!-- 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>
+    <!-- Toast text explaining Signal\'s need for microphone access -->
+    <string name="ConversationActivity_signal_needs_microphone_access_voice_message">Molly needs microphone access to record a voice message.</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">કૉલ કરવા માટે 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>
@@ -411,10 +427,17 @@
     <string name="ConversationActivity_you_will_leave_this_group_and_it_will_be_deleted_from_all_of_your_devices">તમે આ ગ્રુપને છોડી દો, અને તે તમારા બધા ડિવાઇસમાંથી ડિલીટ કરવામાં આવશે.</string>
     <string name="ConversationActivity_delete">ડિલીટ કરો</string>
     <string name="ConversationActivity_delete_and_leave">ડિલીટ કરો અને છોડો</string>
-    <string name="ConversationActivity__to_call_s_signal_needs_access_to_your_microphone">%1$s ને કોલ કરવા માટે, સિગ્નલને તમારા માઇક્રોફોનની ઍક્સેસની જરૂર છે</string>
+
+    <!-- Dialog description that will explain the steps needed to give microphone permissions for a voice call -->
+    <string name="ConversationActivity__to_start_call">To start a 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">To start a call, allow Molly access to your microphone.</string>
+    <!-- Toast text explaining Signal\'s need for microphone access for a voice call -->
+    <string name="ConversationActivity_signal_needs_microphone_access_voice_call">Molly needs microphone access to start a call.</string>
 
 
     <string name="ConversationActivity_join">જોડાઓ</string>
+    <!-- Button text for an active group call but the call is currently full and unjoinable -->
     <string name="ConversationActivity_full">ભરેલ</string>
 
     <string name="ConversationActivity_error_sending_media">મીડિયા મોકલવામાં ભૂલ</string>
@@ -613,6 +636,7 @@
     <string name="ConversationListFragment_unarchive">અનઆર્કાઇવ કરો</string>
     <string name="ConversationListFragment_delete">ડિલીટ કરો</string>
     <string name="ConversationListFragment_select_all">બધા પસંદ કરો</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 પસંદ કર્યો</item>
         <item quantity="other">%1$d પસંદ કર્યા</item>
@@ -864,6 +888,7 @@
         <item quantity="one">આમંત્રણ મોકલ્યું</item>
         <item quantity="other">%1$d આમંત્રણો મોકલ્યા</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">\"%1$s\" ને તમારા દ્વારા આ ગ્રુપમાં આપમેળે ઉમેરી શકાશે નહીં.\n\nતેમને જોડાવા માટે આમંત્રિત કરવામાં આવ્યા છે, અને જ્યાં સુધી તેઓ સ્વીકારશે નહીં ત્યાં સુધી કોઈ ગ્રુપ મેસેજ જોઇ શકાશે નહીં.</string>
     <string name="GroupManagement_invite_multiple_users">આ વપરાશકર્તાઓ તમારા દ્વારા આ ગ્રુપમાં આપમેળે ઉમેરી શકાતા નથી. \n\n તેમને ગ્રુપમાં જોડાવા માટે આમંત્રિત કરવામાં આવ્યા છે, અને જ્યાં સુધી તેઓ સ્વીકારે નહીં ત્યાં સુધી તેઓ કોઈ ગ્રુપ મેસેજ જોશે નહીં.</string>
 
@@ -1044,7 +1069,9 @@
 
     <string name="ManageGroupActivity_edit_name_and_picture">નામ અને ચિત્ર સંપાદિત કરવું</string>
     <string name="ManageGroupActivity_legacy_group">લેગેસી ગ્રુપ</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">આ એક લિગેસી ગ્રુપ છે. ગ્રુપ એડમીન જેવી સુવિધાઓ ફક્ત નવા ગ્રુપ માટે ઉપલબ્ધ છે.</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">આ એક જૂનું ગ્રુપ છે. @મેન્શન અને એડમિન જેવી નવી સુવિધાઓ ઍક્સેસ કરવા માટે,</string>
     <string name="ManageGroupActivity_legacy_group_too_large">આ લેગસી ગ્રુપને નવા ગ્રુપમાં અપગ્રેડ કરી શકાતું નથી કારણ કે તે ખૂબ મોટું છે. ગ્રુપનું મહત્તમ કદ %1$d છે.</string>
     <string name="ManageGroupActivity_upgrade_this_group">આ ગ્રુપને અપગ્રેડ કરો.</string>
@@ -1271,6 +1298,7 @@
         <item quantity="other">ડિલીટ કરો</item>
     </plurals>
 
+    <!-- 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 એ (%2$s) પસંદ કર્યા</item>
         <item quantity="other">%1$d એ (%2$s) પસંદ કર્યું</item>
@@ -1335,17 +1363,13 @@
     <string name="MessageRecord_left_group">તમે ગ્રુપ છોડી દીધું છે.</string>
     <string name="MessageRecord_you_updated_group">તમે ગ્રુપ ને અપડેટ કર્યું.</string>
     <string name="MessageRecord_the_group_was_updated">ગ્રુપ અપડેટ કરવામાં આવ્યું હતું.</string>
-    <!-- Update message shown when placing an outgoing 1:1 voice/audio call and it\'s answered by the other party -->
+    <!-- Update message shown when placing an outgoing 1:1 voice/audio call -->
     <string name="MessageRecord_outgoing_voice_call">આઉટગોઇંગ વૉઇસ કૉલ</string>
-    <!-- Update message shown when placing an outgoing 1:1 video call and it\'s answered by the other party -->
+    <!-- Update message shown when placing an outgoing 1:1 video call -->
     <string name="MessageRecord_outgoing_video_call">આઉટગોઈંગ વિડિયો કૉલ</string>
-    <!-- Update message shown when placing an outgoing 1:1 voice/audio call and it\'s not answered by the other party -->
-    <string name="MessageRecord_unanswered_voice_call">અનુત્તરિત વૉઇસ કૉલ</string>
-    <!-- Update message shown when placing an outgoing 1:1 video call and it\'s not answered by the other party -->
-    <string name="MessageRecord_unanswered_video_call">અનુત્તરિત વિડિયો કૉલ</string>
-    <!-- Update message shown when receiving an incoming 1:1 voice/audio call and it\'s answered -->
+    <!-- Update message shown when receiving an incoming 1:1 voice/audio call and it\'s answered or ringing -->
     <string name="MessageRecord_incoming_voice_call">ઇનકમિંગ વૉઇસ કૉલ</string>
-    <!-- Update message shown when receiving an incoming 1:1 video call and answered -->
+    <!-- Update message shown when receiving an incoming 1:1 video call and answered or ringing -->
     <string name="MessageRecord_incoming_video_call">ઈનકમિંગ વિડિયો કૉલ</string>
     <!-- Update message shown when receiving an incoming 1:1 voice/audio call and not answered -->
     <string name="MessageRecord_missed_voice_call">મિસ્ડ વૉઇસ કૉલ</string>
@@ -1355,10 +1379,6 @@
     <string name="MessageRecord_missed_voice_call_notification_profile">નોટિફિકેશન પ્રોફાઇલ ચાલુ હતી ત્યારે વૉઇસ કૉલ મિસ થયો</string>
     <!-- Update message shown when receiving an incoming video call and declined due to notification profile -->
     <string name="MessageRecord_missed_video_call_notification_profile">નોટિફિકેશન પ્રોફાઇલ ચાલુ હતી ત્યારે વીડિયો કૉલ મિસ થયો</string>
-    <!-- Update message shown when receiving an incoming 1:1 voice/audio call and explicitly declined -->
-    <string name="MessageRecord_you_declined_a_voice_call">તમે વૉઇસ કૉલ નકાર્યો</string>
-    <!-- Update message shown when receiving an incoming 1:1 video call and explicitly declined -->
-    <string name="MessageRecord_you_declined_a_video_call">તમે વિડિયો કૉલ નકાર્યો</string>
     <!-- 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>
@@ -1567,30 +1587,55 @@
     <string name="MessageRecord_can_accept_payments">%1$s હવે પેમેન્ટ સ્વીકારી શકે છે</string>
 
     <!-- Group Calling update messages -->
-    <string name="MessageRecord_s_started_a_group_call_s">%1$s એ ગ્રુપ કૉલ શરૂ કર્યો · %2$s</string>
-    <string name="MessageRecord_you_started_a_group_call_s">તમે ગ્રૂપ કૉલ શરૂ કર્યો · %1$s</string>
-    <string name="MessageRecord_s_is_in_the_group_call_s">%1$s એ ગ્રુપ કૉલમાં છે· %2$s</string>
-    <string name="MessageRecord_you_are_in_the_group_call_s1">તમે ગ્રુપ કૉલમાં છો· %1$s</string>
-    <string name="MessageRecord_s_and_s_are_in_the_group_call_s1">%1$sઅને %2$sએ ગ્રુપ કૉલમાં છે · %3$s</string>
-    <string name="MessageRecord_group_call_s">ગ્રુપ કૉલ · %1$s</string>
-
-    <string name="MessageRecord_s_started_a_group_call">%1$s એ ગ્રુપ કૉલ શરૂ કર્યો</string>
-    <string name="MessageRecord_you_started_a_group_call">તમે ગ્રુપ કૉલ શરૂ કર્યો</string>
-    <string name="MessageRecord_s_is_in_the_group_call">%1$s એ ગ્રુપ કૉલમાં છે·</string>
-    <string name="MessageRecord_you_are_in_the_group_call">તમે ગ્રુપ કૉલમાં છો</string>
-    <string name="MessageRecord_s_and_s_are_in_the_group_call">%1$sઅને %2$sએ ગ્રુપ કૉલમાં છે ·</string>
-    <string name="MessageRecord_group_call">ગ્રુપ કૉલ</string>
+    <!-- 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 કૉલમાં છે · %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">તમે કૉલમાં છો · %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 અને %2$s કૉલમાં છે · %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 કૉલમાં છે</string>
+    <!-- Chat log text for an ongoing group call only the local user has joined -->
+    <string name="MessageRecord_you_are_in_the_call">તમે કૉલમાં છો</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 અને %2$s કૉલમાં છે</string>
+    <!-- Chat log text for a group call that ended within the last 5 minutes -->
+    <string name="MessageRecord__the_video_call_has_ended">વીડિયો કૉલ સમાપ્ત થયો છે</string>
+    <!-- Chat log text for a group call that ended within the last 5 minutes with a placeholder for formatted time -->
+    <string name="MessageRecord__the_video_call_has_ended_s">વીડિયો કૉલ સમાપ્ત થયો છે · %1$s</string>
+    <!-- Chat log text for a group call that ended more than 5 minutes ago and was missed -->
+    <string name="MessageRecord__missed_video_call">મિસ્ડ વીડિયો કૉલ</string>
+    <!-- Chat log text for a group call that ended more than 5 minutes ago and was missed with a placeholder for formatted time -->
+    <string name="MessageRecord__missed_video_call_s">મિસ્ડ વીડિયો કૉલ · %1$s</string>
+    <!-- Chat log text for a group call that ended that the local user did not start -->
+    <string name="MessageRecord__incoming_video_call">ઇનકમિંગ વીડિયો કૉલ</string>
+    <!-- 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">ઇનકમિંગ વીડિયો કૉલ · %1$s</string>
+    <!-- Chat log text for a group call that ended that the local user started -->
+    <string name="MessageRecord__outgoing_video_call">આઉટગોઈંગ વીડિયો કૉલ</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">આઉટગોઇંગ વીડિયો કૉલ · %1$s</string>
+    <!-- Chat log text for an ongoing group call that the local user started -->
+    <string name="MessageRecord__you_started_a_video_call">તમે વીડિયો કૉલ શરૂ કર્યો</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">તમે વીડિયો કૉલ શરૂ કર્યો · %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એ વીડિયો કૉલ શરૂ કર્યો</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એ વીડિયો કૉલ શરૂ કર્યો · %2$s</string>
 
     <string name="MessageRecord_you">તમે</string>
 
-    <plurals name="MessageRecord_s_s_and_d_others_are_in_the_group_call_s">
-        <item quantity="one">%1$s, %2$s, અને %3$d અન્યો આ કૉલમાં છે%4$s</item>
-        <item quantity="other">%1$s, %2$s, અને %3$d અન્યો આ ગ્રુપ કૉલમાં છે%4$s</item>
+    <!-- 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 અને અન્ય %3$d આ કૉલમાં છે · %4$s</item>
+        <item quantity="other">%1$s, %2$s અને અન્ય %3$d આ ગ્રૂપ કૉલમાં છે · %4$s</item>
     </plurals>
 
-    <plurals name="MessageRecord_s_s_and_d_others_are_in_the_group_call">
-        <item quantity="one">%1$s, %2$s, અને %3$d અન્યો આ કૉલમાં છે</item>
-        <item quantity="other">%1$s, %2$s, અને %3$d અન્યો આ ગ્રુપ કૉલમાં છે</item>
+    <!-- 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 અને અન્ય %3$d આ કૉલમાં છે</item>
+        <item quantity="other">%1$s, %2$s અને અન્ય %3$d આ ગ્રૂપ કૉલમાં છે</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. -->
@@ -2063,6 +2108,7 @@
     <!-- Generic error when the app is unable to request an SMS code for an unknown reason. -->
     <string name="RegistrationActivity_unable_to_request_verification_code">ચકાસણી કોડની વિનંતી કરવામાં અસમર્થ. કૃપા કરીને તમારું નેટવર્ક કનેક્શન તપાસો અને ફરી પ્રયાસ કરો.</string>
     <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">Molly Android - ફોન નંબર ફોર્મેટ</string>
     <!--    Small "toast" notification to the user confirming that they have requested a new code via voice call.-->
@@ -2207,7 +2253,7 @@
     <string name="SubmitDebugLogActivity_this_log_will_be_posted_publicly_online_for_contributors">યોગદાનકર્તાઓને જોવા માટે આ લૉગ જાહેરમાં ઓનલાઇન પોસ્ટ કરવામાં આવશે. તમે અપલોડ કરતા પહેલા તેની તપાસ કરી શકો છો.</string>
 
     <!-- SupportEmailUtil -->
-  <!-- Removed by excludeNonTranslatables <string name="SupportEmailUtil_support_email" translatable="false">support@molly.im</string> -->
+  <!-- Removed by excludeNonTranslatables <string name="SupportEmailUtil_support_email" translatable="false">support@signal.org</string> -->
     <string name="SupportEmailUtil_filter">ફિલ્ટર:</string>
     <string name="SupportEmailUtil_device_info">ઉપકરણ માહિતી:</string>
     <string name="SupportEmailUtil_android_version">એન્ડ્રોઇડ વર્ઝન:</string>
@@ -2709,6 +2755,8 @@
     <string name="ConversationUpdateItem_loading">લોડ કરી રહ્યું છે</string>
     <string name="ConversationUpdateItem_learn_more">વધુ શીખો</string>
     <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_call_is_full">કૉલ પૂર્ણ છે</string>
     <string name="ConversationUpdateItem_invite_friends">મિત્રોને આમંત્રિત કરો</string>
@@ -2773,6 +2821,7 @@
     <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>
 
     <!-- EnableCallNotificationSettingsDialog__call_notifications_checklist -->
@@ -3086,6 +3135,7 @@
 
     <string name="arrays__default">ડિફોલ્ટ</string>
     <string name="arrays__high">ઉચ્ચ</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">મહત્તમ</string>
 
     <!-- plurals.xml -->
@@ -3357,7 +3407,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">Molly માં પેમેન્ટ હવે ઉપલબ્ધ નથી. તમે હજી પણ એક્સચેન્જમાં ફંડ સ્થાનાંતરિત કરી શકો છો પરંતુ તમે હવે પેમેન્ટ મોકલી શકતા નથી અને મેળવી શકતા નથી અથવા ફંડ ઉમેરી શકતા નથી.</string>
@@ -3406,6 +3456,14 @@
     <!-- Storage permission row description -->
     <string name="GrantPermissionsFragment__send_photos_videos_and_files">તમારા ડિવાઇસમાંથી ફોટા, વીડિયો અને ફાઇલો મોકલો.</string>
 
+    <!-- PermissionDeniedBottomSheet -->
+    <!-- Sheet describing step 1 on how to give permissions by opening settings -->
+    <string name="PermissionDeniedBottomSheet__1_tap_settings_below">1. Tap “Settings” below</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 Allow the permission</string>
+    <!-- Label for button at the bottom of the sheet which opens the system permission settings -->
+    <string name="PermissionDeniedBottomSheet__settings">Settings</string>
+
     <!-- PaymentsSecuritySetupFragment -->
     <!-- Toolbar title -->
     <string name="PaymentsSecuritySetupFragment__security_setup">સુરક્ષા સેટઅપ</string>
@@ -3446,6 +3504,7 @@
     <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__information">પેમેન્ટની રકમ અને ટ્રાન્ઝેક્શનના સમય સહિતની ટ્રાન્ઝેક્શન સંબંધી વિગતો MobileCoin લેજરનો ભાગ છે.</string>
@@ -3508,6 +3567,7 @@
     <string name="ConfirmPayment__confirm_payment">પેમેન્ટની પુષ્ટિ કરો</string>
     <string name="ConfirmPayment__network_fee">નેટવર્ક ફી</string>
     <string name="ConfirmPayment__estimated_s">અંદાજિત %1$s</string>
+    <!-- Prefix to a name to indicate who a payment will be sent to -->
     <string name="ConfirmPayment__to">તરફ:</string>
     <string name="ConfirmPayment__total_amount">કુલ રકમ</string>
     <string name="ConfirmPayment__balance_s">બેલેન્સ: %1$s</string>
@@ -3658,6 +3718,14 @@
     <string name="conversation_group_options__conversation">ચેટ</string>
     <string name="conversation_group_options__broadcast">બ્રોડકાસ્ટ</string>
 
+    <!-- DoubleTapEditEducationSheet -->
+    <!-- Displayed as the title of the education bottom sheet -->
+    <string name="DoubleTapEditEducationSheet__double_tap_edit_title">Double tap to edit</string>
+    <!-- Text on the sheet explaining how double tapping on a message will let them edit it -->
+    <string name="DoubleTapEditEducationSheet__quickly_tap_twice">Quickly tap twice on your messages to edit them. You can edit your messages up to 24hrs after they’ve been sent.</string>
+    <!-- Button label to dismiss sheet -->
+    <string name="DoubleTapEditEducationSheet__got_it">Got it</string>
+
     <!-- text_secure_normal -->
     <string name="text_secure_normal__menu_new_group">નવું ગ્રુપ</string>
     <string name="text_secure_normal__menu_settings">સેટિંગ્સ</string>
@@ -4112,6 +4180,7 @@
     <string name="RecipientBottomSheet_copied_to_clipboard">ક્લિપબોર્ડ પર કૉપી કરેલું</string>
 
     <string name="GroupRecipientListItem_admin">એડમિન</string>
+    <!-- Button text to approve a user that has requested to join a group -->
     <string name="GroupRecipientListItem_approve_description">મંજૂર</string>
     <string name="GroupRecipientListItem_deny_description">નામંજૂર કરો</string>
 
@@ -4139,6 +4208,7 @@
 
     <!-- VoiceNoteMediaDescriptionCompatFactory -->
     <string name="VoiceNoteMediaItemFactory__voice_message">વૉઈસ મેસેજ . %1$s</string>
+    <!-- This is a title in a banner describing the conversation sender to receiver placeholders of the currently playing voice memo. -->
     <string name="VoiceNoteMediaItemFactory__s_to_s">%1$sમાંથી %2$s</string>
 
     <!-- StorageUtil -->
@@ -4152,8 +4222,16 @@
     <string name="ReviewCardDialogFragment__review_members">સભ્યોને રિવ્યૂ કરો</string>
     <!-- Title of a screen where the user will be prompted to review a message request matching the name of someone they already know -->
     <string name="ReviewCardDialogFragment__review_request">વિનંતીને રિવ્યૂ કરો</string>
-    <string name="ReviewCardDialogFragment__d_group_members_have_the_same_name">%1$d ગ્રુપના સભ્યોનું નામ એક જ છે, નીચેના સભ્યોની સમીક્ષા કરો અથવા કરવાનું કાર્યવાહી પસંદ કરો.</string>
-    <string name="ReviewCardDialogFragment__if_youre_not_sure">જો તમને ખાતરી ન હોય કે વિનંતી કોની છે, તો નીચેના સંપર્કોની સમીક્ષા કરો અને પગલાં લો.</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="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 -->
+    <plurals name="ReviewCardDialogFragment__if_youre_not_sure">
+        <item quantity="one">If you\'re not sure who the request is from, review the contact below and take action.</item>
+        <item quantity="other">If you\'re not sure who the request is from, review the contacts below and take action.</item>
+    </plurals>
     <string name="ReviewCardDialogFragment__no_other_groups_in_common">અન્ય કોઈ ગ્રુપ સામાન્ય નથી.</string>
     <string name="ReviewCardDialogFragment__no_groups_in_common">કોમનમાં કોઈ ગ્રુપ નથી</string>
     <plurals name="ReviewCardDialogFragment__d_other_groups_in_common">
@@ -4184,11 +4262,20 @@
     <string name="CallParticipantsListUpdatePopupWindow__s_joined">%1$s જોડાયા</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_and_s_joined">%1$s અને %2$s જોડાયા</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_s_and_s_joined">%1$s, %2$s અને %3$s જોડાયા</string>
-    <string name="CallParticipantsListUpdatePopupWindow__s_s_and_d_others_joined">%1$s, %2$s અને %3$d અન્ય જોડાયા</string>
+    <!-- Toast message shown in group call when 3 or more people join -->
+    <plurals name="CallParticipantsListUpdatePopupWindow__s_s_and_d_others_joined">
+        <item quantity="one">%1$s, %2$s and %3$d other joined</item>
+        <item quantity="other">%1$s, %2$s and %3$d others joined</item>
+    </plurals>
+    <!-- Toast/popup text shown when someone leaves a group call -->
     <string name="CallParticipantsListUpdatePopupWindow__s_left">%1$s છોડ્યું</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_and_s_left">%1$s અને %2$s છોડ્યું</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_s_and_s_left">%1$s, %2$s અને %3$s છોડ્યું</string>
-    <string name="CallParticipantsListUpdatePopupWindow__s_s_and_d_others_left">%1$s, %2$s અને %3$d અન્યએ છોડ્યું</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 and %3$d other left</item>
+        <item quantity="other">%1$s, %2$s and %3$d others left</item>
+    </plurals>
 
     <string name="CallParticipant__you">તમે</string>
     <string name="CallParticipant__you_on_another_device">તમે (બીજા ડિવાઇસ પર)</string>
@@ -4558,10 +4645,15 @@
 
     <!-- PrivacySettingsFragment -->
     <string name="PrivacySettingsFragment__blocked">બ્લૉક કર્યા</string>
-    <string name="PrivacySettingsFragment__d_contacts">%1$d સંપર્કો</string>
+    <!-- Settings label that shows the number blocked contacts -->
+    <plurals name="PrivacySettingsFragment__d_contacts">
+        <item quantity="one">%1$d contact</item>
+        <item quantity="other">%1$d contacts</item>
+    </plurals>
     <string name="PrivacySettingsFragment__messaging">મેસેજ કરી રહ્યા છીએ</string>
     <string name="PrivacySettingsFragment__disappearing_messages">અદૃશ્ય થઈ રહેલા મેસેજ</string>
     <string name="PrivacySettingsFragment__app_security">એપ્લિકેશનની સુરક્ષા</string>
+    <!-- This refers to the multi-tasking overview (recent apps) from the Android operating system.-->
     <string name="PrivacySettingsFragment__block_screenshots_in_the_recents_list_and_inside_the_app">તાજેતરની સૂચિમાં અને ઍપમાંના સ્ક્રીનશોટને બ્લૉક કરો</string>
     <string name="PrivacySettingsFragment__signal_message_and_calls">Signal મેસેજ અને કૉલ્સ, હંમેશા રિલે કૉલ્સ, અને સીલ કરેલ મોકલનાર</string>
     <string name="PrivacySettingsFragment__default_timer_for_new_changes">નવી ચેટ માટે ડિફોલ્ટ ટાઈમર</string>
@@ -4618,11 +4710,14 @@
     <string name="DataAndStorageSettingsFragment__media_quality">મીડિયા ગુણવત્તા</string>
     <string name="DataAndStorageSettingsFragment__sent_media_quality">મોકલેલ મીડિયાની ગુણવત્તા</string>
     <string name="DataAndStorageSettingsFragment__sending_high_quality_media_will_use_more_data">ઉચ્ચ ગુણવત્તાના મીડિયા મોકલવાથી વધુ ડેટા વાપરશે.</string>
+    <!-- Setting option that can be selected to default media to be sent as high quality by default -->
     <string name="DataAndStorageSettingsFragment__high">ઉચ્ચ</string>
+    <!-- Setting option that can be selected to default media to be sent as standard quality by default -->
     <string name="DataAndStorageSettingsFragment__standard">સ્ટાન્ડર્ડ</string>
     <string name="DataAndStorageSettingsFragment__calls">કૉલ્સ</string>
 
     <!-- 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__use_custom_colors">કસ્ટમ કલર્સનો ઉપયોગ કરો</string>
     <string name="ChatColorSelectionFragment__chat_color">ચેટ કલર</string>
@@ -4834,6 +4929,7 @@
     <string name="AvatarPickerFragment__take_a_picture">ફોટો પાડો</string>
     <string name="AvatarPickerFragment__choose_a_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>
     <string name="AvatarPickerFragment__clear_avatar">અવતાર દૂર કરો</string>
@@ -4894,7 +4990,7 @@
     <string name="MediaReviewFragment__add_a_message">મેસેજ ઉમેરો</string>
     <string name="MediaReviewFragment__add_a_reply">જવાબ ઉમેરો</string>
     <string name="MediaReviewFragment__send_to">આમને મોકલો</string>
-    <string name="MediaReviewFragment__view_once_message">એક વખત જોવાનો મેસેજ</string>
+    <string name="MediaReviewFragment__view_once_message">એકવાર જોઈ શકાય તેવા મીડિયા</string>
     <string name="MediaReviewFragment__one_or_more_items_were_too_large">એક અથવા વધુ વસ્તુઓ બહુ મોટી હતી</string>
     <string name="MediaReviewFragment__one_or_more_items_were_invalid">એક અથવા વધુ વસ્તુઓ અમાન્ય હતી</string>
     <string name="MediaReviewFragment__too_many_items_selected">બહુ બધી વસ્તુઓ પસંદ કરી</string>
@@ -5487,7 +5583,7 @@
     <string name="StoryViewerFragment__s_s">%1$s %2$s</string>
     <!-- Displayed when viewing a post you sent -->
     <string name="StoryViewerPageFragment__you">તમે</string>
-    <!-- Displayed when viewing a post displayed to a group -->
+    <!-- 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 -->
     <string name="StoryViewerPageFragment__reply">જવાબ</string>
@@ -6704,5 +6800,26 @@
     <!-- Content description for opening the note editor -->
     <string name="ViewNoteSheet__edit_note">નોંધમાં ફેરફાર કરો</string>
 
+    <!-- BackupProgressService -->
+    <!-- Notification title shown while backup restore job is running -->
+    <string name="BackupProgressService_title">બેકઅપ રિસ્ટોર કરી રહ્યાં છીએ…</string>
+    <!-- Notification title shown while downloading backup restore data -->
+    <string name="BackupProgressService_title_downloading">બેકઅપ ડેટા ડાઉનલોડ કરી રહ્યાં છીએ…</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>
+    <!-- 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 -->
+    <string name="BackupsTypeSettingsFragment__google_pay">Google Pay</string>
+    <!-- Displayed as the user\'s payment method as a label in a preference row -->
+    <string name="BackupsTypeSettingsFragment__bank_transfer">Bank transfer</string>
+    <!-- Displayed as the user\'s payment method as a label in a preference row -->
+    <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>
+
+
     <!-- 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 85b59b5a47..8980a17149 100644
--- a/app/src/main/res/values-hi/strings.xml
+++ b/app/src/main/res/values-hi/strings.xml
@@ -1,6 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- smartling.instruction_comments_enabled = on -->
-<resources>
+<?xml version="1.0" encoding="UTF-8"?><!-- 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> -->
@@ -89,6 +87,16 @@
     <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">Allow access to your location</string>
+    <!-- Dialog description that will explain the steps needed to give location permission -->
+    <string name="AttachmentManager_signal_to_send_location">To send your location:</string>
+    <!-- Alert dialog description asking for location permission -->
+    <string name="AttachmentManager_signal_allow_signal_access_location">Allow Molly access to send your location.</string>
+    <!-- Toast text explaining Signal\'s need for location access -->
+    <string name="AttachmentManager_signal_needs_location_access">Molly needs location access to send your location.</string>
+
     <!-- Alert dialog title to show the recipient has not activated payments -->
     <string name="AttachmentManager__not_activated_payments">%1$s ने भुगतान सक्रीय नहीं किए हैं </string>
     <!-- Alert dialog description to send the recipient a request to activate payments -->
@@ -241,7 +249,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>
@@ -386,8 +394,16 @@
     <string name="ConversationActivity_your_request_to_join_has_been_sent_to_the_group_admin">समूह से जुड़ने का आपका अनुरोध समूह संचालक को भेज दिया गया है। जब वे जवाब देंगे तो आपको सूचित किया जाएगा।</string>
     <string name="ConversationActivity_cancel_request">निवेदन रद्द करें</string>
 
-    <string name="ConversationActivity_to_send_audio_messages_allow_signal_access_to_your_microphone">ऑडियो मेसेज भेजने के लिए, अपने माइक्रोफ़ोन पर Molly पहुंच की अनुमति दें।</string>
+    <!-- Dialog title asking users for microphone permission -->
+    <string name="ConversationActivity_allow_access_microphone">Allow access to your microphone</string>
+    <!-- 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>
+    <!-- Toast text explaining Signal\'s need for microphone access -->
+    <string name="ConversationActivity_signal_needs_microphone_access_voice_message">Molly needs microphone access to record a voice message.</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 को कॉल करने के लिए 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>
@@ -411,10 +427,17 @@
     <string name="ConversationActivity_you_will_leave_this_group_and_it_will_be_deleted_from_all_of_your_devices">आप इस ग्रूप को छोङ देंगे और यह ग्रूप आपके सभी डिवाइस से डिलीट कर दिया जाएगा।</string>
     <string name="ConversationActivity_delete">डिलीट करें</string>
     <string name="ConversationActivity_delete_and_leave">डिलीट करें और छोड़ दें</string>
-    <string name="ConversationActivity__to_call_s_signal_needs_access_to_your_microphone">%1$s को कॉल करने के लिए, Molly को आपके माइक्रोफ़ोन तक पहुंच की आवश्यकता है।</string>
+
+    <!-- Dialog description that will explain the steps needed to give microphone permissions for a voice call -->
+    <string name="ConversationActivity__to_start_call">To start a 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">To start a call, allow Molly access to your microphone.</string>
+    <!-- Toast text explaining Signal\'s need for microphone access for a voice call -->
+    <string name="ConversationActivity_signal_needs_microphone_access_voice_call">Molly needs microphone access to start a call.</string>
 
 
     <string name="ConversationActivity_join">जुड़ें</string>
+    <!-- Button text for an active group call but the call is currently full and unjoinable -->
     <string name="ConversationActivity_full">पूर्ण</string>
 
     <string name="ConversationActivity_error_sending_media">मीडिया भेजने में त्रुटि</string>
@@ -613,6 +636,7 @@
     <string name="ConversationListFragment_unarchive">अनारक्षित करें</string>
     <string name="ConversationListFragment_delete">डिलीट करें</string>
     <string name="ConversationListFragment_select_all">सभी को चुन लो</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 चुना हुआ</item>
         <item quantity="other">%1$d चुना हुआ</item>
@@ -864,6 +888,7 @@
         <item quantity="one">आमंत्रण भेजा गया</item>
         <item quantity="other">%1$d आमंत्रण भेजे गए</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">“%1$s” को आपके द्वारा स्वचालित रूप से इस ग्रुप में शामिल नहीं किया जा सकता।\n\nउन्हें जुड़ने के लिए आमंत्रित किया गया है, और उन्हें ग्रुप के कोई भी मेसेज दिखाई नहीं देंगे जब तक वे स्वीकार नहीं कर लेते।</string>
     <string name="GroupManagement_invite_multiple_users">इन उपयोगकर्ताओं को आपके द्वारा स्वचालित रूप से इस ग्रुप में शामिल नहीं किया जा सकता।\n\nउनको ग्रुप में जुड़ने के लिए आमंत्रित किया गया है, जब तक वे आमंत्रण स्वीकार नहीं कर लेते, ग्रुप के संदेश नहीं देख सकते।</string>
 
@@ -1044,7 +1069,9 @@
 
     <string name="ManageGroupActivity_edit_name_and_picture">नाम और चित्र संपादित करें</string>
     <string name="ManageGroupActivity_legacy_group">लेगेसी ग्रुप</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">यह एक लेगेसी ग्रुप है। फ़ीचर्स जैसे कि ग्रुप एडमिन केवल नए ग्रुप्स के लिए उपलब्ध हैं।</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">यह एक लेगेसी ग्रुप है। नए फ़ीचर्स जैसे कि @mentions और एडमिन तक पहुँच प्राप्त करने के लिए,</string>
     <string name="ManageGroupActivity_legacy_group_too_large">इस लेगेसी ग्रुप को एक नए ग्रुप में अपग्रेड नहीं किया जा सकता क्योंकि यह बहुत बड़ा है। अधिकतम ग्रुप साइज़ है %1$d।</string>
     <string name="ManageGroupActivity_upgrade_this_group">इस समूह को अपग्रेड करें।</string>
@@ -1271,6 +1298,7 @@
         <item quantity="other">डिलीट करें</item>
     </plurals>
 
+    <!-- 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 चुना हुआ (%2$s)</item>
         <item quantity="other">%1$d चुना हुआ (%2$s)</item>
@@ -1335,17 +1363,13 @@
     <string name="MessageRecord_left_group">आपने समूह छोड़ दिया है</string>
     <string name="MessageRecord_you_updated_group">आपने समूह को अपडेट किया है।</string>
     <string name="MessageRecord_the_group_was_updated">ग्रुप को अपडेट किया गया था।</string>
-    <!-- Update message shown when placing an outgoing 1:1 voice/audio call and it\'s answered by the other party -->
+    <!-- Update message shown when placing an outgoing 1:1 voice/audio call -->
     <string name="MessageRecord_outgoing_voice_call">आउटगोइंग वॉयस कॉल</string>
-    <!-- Update message shown when placing an outgoing 1:1 video call and it\'s answered by the other party -->
+    <!-- Update message shown when placing an outgoing 1:1 video call -->
     <string name="MessageRecord_outgoing_video_call">आउटगोइंग वीडियो कॉल</string>
-    <!-- Update message shown when placing an outgoing 1:1 voice/audio call and it\'s not answered by the other party -->
-    <string name="MessageRecord_unanswered_voice_call">अनुत्तरित वॉयस कॉल</string>
-    <!-- Update message shown when placing an outgoing 1:1 video call and it\'s not answered by the other party -->
-    <string name="MessageRecord_unanswered_video_call">अनुत्तरित वीडियो कॉल</string>
-    <!-- Update message shown when receiving an incoming 1:1 voice/audio call and it\'s answered -->
+    <!-- Update message shown when receiving an incoming 1:1 voice/audio call and it\'s answered or ringing -->
     <string name="MessageRecord_incoming_voice_call">इनकमिंग वॉयस कॉल</string>
-    <!-- Update message shown when receiving an incoming 1:1 video call and answered -->
+    <!-- Update message shown when receiving an incoming 1:1 video call and answered or ringing -->
     <string name="MessageRecord_incoming_video_call">इनकमिंग वीडियो कॉल</string>
     <!-- Update message shown when receiving an incoming 1:1 voice/audio call and not answered -->
     <string name="MessageRecord_missed_voice_call">छूटी हुई वॉयस कॉल</string>
@@ -1355,10 +1379,6 @@
     <string name="MessageRecord_missed_voice_call_notification_profile">नोटिफ़िकेशन प्रोफ़ाइल चालू होने पर वॉयस कॉल छूट गई</string>
     <!-- Update message shown when receiving an incoming video call and declined due to notification profile -->
     <string name="MessageRecord_missed_video_call_notification_profile">नोटिफ़िकेशन प्रोफ़ाइल चालू होने पर वीडियो कॉल छूट गई</string>
-    <!-- Update message shown when receiving an incoming 1:1 voice/audio call and explicitly declined -->
-    <string name="MessageRecord_you_declined_a_voice_call">आपने एक वॉयस कॉल काट दी</string>
-    <!-- Update message shown when receiving an incoming 1:1 video call and explicitly declined -->
-    <string name="MessageRecord_you_declined_a_video_call">आपने एक वीडियो कॉल काट दी</string>
     <!-- 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>
@@ -1567,28 +1587,53 @@
     <string name="MessageRecord_can_accept_payments">%1$s अब भुगतान स्वीकार कर सकते हैं</string>
 
     <!-- Group Calling update messages -->
-    <string name="MessageRecord_s_started_a_group_call_s">%1$s ने एक ग्रुप कॉल शुरू की · %2$s</string>
-    <string name="MessageRecord_you_started_a_group_call_s">आपने एक ग्रुप कॉल शुरू की · %1$s</string>
-    <string name="MessageRecord_s_is_in_the_group_call_s">%1$s ग्रुप कॉल में है · %2$s</string>
-    <string name="MessageRecord_you_are_in_the_group_call_s1">आप ग्रुप कॉल में हैं · %1$s</string>
-    <string name="MessageRecord_s_and_s_are_in_the_group_call_s1">%1$s और %2$s ग्रुप कॉल में हैं · %3$s</string>
-    <string name="MessageRecord_group_call_s">ग्रुप कॉल · %1$s</string>
-
-    <string name="MessageRecord_s_started_a_group_call">%1$s ने एक ग्रुप कॉल शुरू की</string>
-    <string name="MessageRecord_you_started_a_group_call">आपने एक ग्रुप कॉल शुरू की</string>
-    <string name="MessageRecord_s_is_in_the_group_call">%1$s ग्रुप कॉल में है</string>
-    <string name="MessageRecord_you_are_in_the_group_call">आप ग्रुप कॉल मे हैं</string>
-    <string name="MessageRecord_s_and_s_are_in_the_group_call">%1$s और %2$s ग्रुप कॉल में हैं</string>
-    <string name="MessageRecord_group_call">ग्रुप कॉल</string>
+    <!-- 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 कॉल में है · %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">आप कॉल में हैं · %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 और %2$s कॉल में हैं · %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 कॉल में है</string>
+    <!-- Chat log text for an ongoing group call only the local user has joined -->
+    <string name="MessageRecord_you_are_in_the_call">आप कॉल में हैं</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 और %2$s कॉल में हैं</string>
+    <!-- Chat log text for a group call that ended within the last 5 minutes -->
+    <string name="MessageRecord__the_video_call_has_ended">वीडियो कॉल समाप्त हो गया है</string>
+    <!-- Chat log text for a group call that ended within the last 5 minutes with a placeholder for formatted time -->
+    <string name="MessageRecord__the_video_call_has_ended_s">वीडियो कॉल समाप्त हो गया है · %1$s</string>
+    <!-- Chat log text for a group call that ended more than 5 minutes ago and was missed -->
+    <string name="MessageRecord__missed_video_call">छूटी हुई वीडियो कॉल</string>
+    <!-- Chat log text for a group call that ended more than 5 minutes ago and was missed with a placeholder for formatted time -->
+    <string name="MessageRecord__missed_video_call_s">मिस हुई वीडियो कॉल · %1$s</string>
+    <!-- Chat log text for a group call that ended that the local user did not start -->
+    <string name="MessageRecord__incoming_video_call">इनकमिंग वीडियो कॉल</string>
+    <!-- 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">इनकमिंग वीडियो कॉल %1$s</string>
+    <!-- Chat log text for a group call that ended that the local user started -->
+    <string name="MessageRecord__outgoing_video_call">आउटगोइंग वीडियो कॉल</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">आउटगोइंग वीडियो कॉल %1$s</string>
+    <!-- Chat log text for an ongoing group call that the local user started -->
+    <string name="MessageRecord__you_started_a_video_call">आपने वीडियो कॉल शुरू किया</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">आपने वीडियो कॉल शुरू किया %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 ने वीडियो कॉल शुरू किया</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 ने वीडियो कॉल शुरू किया · %2$s</string>
 
     <string name="MessageRecord_you">आप</string>
 
-    <plurals name="MessageRecord_s_s_and_d_others_are_in_the_group_call_s">
+    <!-- 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, और %3$d अन्य लोग ग्रुप कॉल में हैं · %4$s</item>
         <item quantity="other">%1$s, %2$s, और %3$d अन्य लोग ग्रुप कॉल में हैं · %4$s</item>
     </plurals>
 
-    <plurals name="MessageRecord_s_s_and_d_others_are_in_the_group_call">
+    <!-- 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, और %3$d अन्य लोग ग्रुप कॉल में हैं</item>
         <item quantity="other">%1$s, %2$s, और %3$d अन्य लोग ग्रुप कॉल में हैं</item>
     </plurals>
@@ -2063,6 +2108,7 @@
     <!-- Generic error when the app is unable to request an SMS code for an unknown reason. -->
     <string name="RegistrationActivity_unable_to_request_verification_code">सत्यापन कोड का अनुरोध करने में असमर्थ। कृपया नेटवर्क जाँचें और फिर से प्रयास करें।</string>
     <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">Molly एंड्रॉइड - फोन नंबर का फ़ॉर्मेट</string>
     <!--    Small "toast" notification to the user confirming that they have requested a new code via voice call.-->
@@ -2207,7 +2253,7 @@
     <string name="SubmitDebugLogActivity_this_log_will_be_posted_publicly_online_for_contributors">योगदानकर्ताओं को देखने के लिए यह लॉग सार्वजनिक रूप से ऑनलाइन पोस्ट किया जाएगा। अपलोड करने से पहले आप इसकी जांच कर सकते हैं।</string>
 
     <!-- SupportEmailUtil -->
-  <!-- Removed by excludeNonTranslatables <string name="SupportEmailUtil_support_email" translatable="false">support@molly.im</string> -->
+  <!-- Removed by excludeNonTranslatables <string name="SupportEmailUtil_support_email" translatable="false">support@signal.org</string> -->
     <string name="SupportEmailUtil_filter">फिल्टर:</string>
     <string name="SupportEmailUtil_device_info">डिवाइस की जानकारी:</string>
     <string name="SupportEmailUtil_android_version">Android वर्ज़न:</string>
@@ -2709,6 +2755,8 @@
     <string name="ConversationUpdateItem_loading">लोड हो रहा है</string>
     <string name="ConversationUpdateItem_learn_more">अधिक जानें</string>
     <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_call_is_full">कॉल पूर्ण है</string>
     <string name="ConversationUpdateItem_invite_friends">मित्रों को आमंत्रित करें</string>
@@ -2773,6 +2821,7 @@
     <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>
 
     <!-- EnableCallNotificationSettingsDialog__call_notifications_checklist -->
@@ -3086,6 +3135,7 @@
 
     <string name="arrays__default">डिफ़ॉल्ट</string>
     <string name="arrays__high">उच्च</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">अधिकतम</string>
 
     <!-- plurals.xml -->
@@ -3357,7 +3407,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">आप मोबाइलकॉइन भेजने और प्राप्त करने के लिए 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">Molly में भुगतान अब उपलब्ध नहीं है। अब भी आप किसी एक्सचेंज में धनराशि ट्रांसफ़र कर सकते हैं लेकिन अब आप भुगतान भेज या प्राप्त नहीं कर सकते या धनराशि नहीं जोड़ सकते।</string>
@@ -3406,6 +3456,14 @@
     <!-- Storage permission row description -->
     <string name="GrantPermissionsFragment__send_photos_videos_and_files">अपनी डिवाइस से फोटो, वीडियो और फाइलें भेजें।</string>
 
+    <!-- PermissionDeniedBottomSheet -->
+    <!-- Sheet describing step 1 on how to give permissions by opening settings -->
+    <string name="PermissionDeniedBottomSheet__1_tap_settings_below">1. Tap “Settings” below</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 Allow the permission</string>
+    <!-- Label for button at the bottom of the sheet which opens the system permission settings -->
+    <string name="PermissionDeniedBottomSheet__settings">Settings</string>
+
     <!-- PaymentsSecuritySetupFragment -->
     <!-- Toolbar title -->
     <string name="PaymentsSecuritySetupFragment__security_setup">सुरक्षा सेटअप</string>
@@ -3446,6 +3504,7 @@
     <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__information">भुगतान राशि और लेन-देन के समय सहित लेन-देन विवरण, MobileCoin लेजर का हिस्सा हैं।</string>
@@ -3508,6 +3567,7 @@
     <string name="ConfirmPayment__confirm_payment">भुगतान की पुष्टि करें</string>
     <string name="ConfirmPayment__network_fee">नेटवर्क शुल्क</string>
     <string name="ConfirmPayment__estimated_s">अनुमानित %1$s</string>
+    <!-- Prefix to a name to indicate who a payment will be sent to -->
     <string name="ConfirmPayment__to">किस को</string>
     <string name="ConfirmPayment__total_amount">कुल राशि</string>
     <string name="ConfirmPayment__balance_s">बैलेंस: %1$s</string>
@@ -3658,6 +3718,14 @@
     <string name="conversation_group_options__conversation">चैट</string>
     <string name="conversation_group_options__broadcast">प्रसारण</string>
 
+    <!-- DoubleTapEditEducationSheet -->
+    <!-- Displayed as the title of the education bottom sheet -->
+    <string name="DoubleTapEditEducationSheet__double_tap_edit_title">Double tap to edit</string>
+    <!-- Text on the sheet explaining how double tapping on a message will let them edit it -->
+    <string name="DoubleTapEditEducationSheet__quickly_tap_twice">Quickly tap twice on your messages to edit them. You can edit your messages up to 24hrs after they’ve been sent.</string>
+    <!-- Button label to dismiss sheet -->
+    <string name="DoubleTapEditEducationSheet__got_it">Got it</string>
+
     <!-- text_secure_normal -->
     <string name="text_secure_normal__menu_new_group">नया समूह</string>
     <string name="text_secure_normal__menu_settings">सेटिंग्स</string>
@@ -4112,6 +4180,7 @@
     <string name="RecipientBottomSheet_copied_to_clipboard">क्लिपबोर्ड पर कॉपी किया गया है</string>
 
     <string name="GroupRecipientListItem_admin">एडमिन</string>
+    <!-- Button text to approve a user that has requested to join a group -->
     <string name="GroupRecipientListItem_approve_description">स्वीकार करें</string>
     <string name="GroupRecipientListItem_deny_description">अस्वीकार करें</string>
 
@@ -4139,6 +4208,7 @@
 
     <!-- VoiceNoteMediaDescriptionCompatFactory -->
     <string name="VoiceNoteMediaItemFactory__voice_message">ऑडियो संदेश · %1$s</string>
+    <!-- This is a title in a banner describing the conversation sender to receiver placeholders of the currently playing voice memo. -->
     <string name="VoiceNoteMediaItemFactory__s_to_s">%1$sसे%2$s</string>
 
     <!-- StorageUtil -->
@@ -4152,8 +4222,16 @@
     <string name="ReviewCardDialogFragment__review_members">सदस्यों की समीक्षा करें</string>
     <!-- Title of a screen where the user will be prompted to review a message request matching the name of someone they already know -->
     <string name="ReviewCardDialogFragment__review_request">निवेदन की समीक्षा करें</string>
-    <string name="ReviewCardDialogFragment__d_group_members_have_the_same_name">%1$d समूह सदस्यों के एक ही नाम हैं, नीचे दिए गए सदस्यों की समीक्षा करें और कार्रवाई का चुनाव करें।</string>
-    <string name="ReviewCardDialogFragment__if_youre_not_sure">अगर आप इस निवेदन को भेजने वाले के बारे में निश्चित नहीं हों, तो निचे दिए गए संपर्कों की समीक्षा करें और कार्रवाई करें।</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="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 -->
+    <plurals name="ReviewCardDialogFragment__if_youre_not_sure">
+        <item quantity="one">If you\'re not sure who the request is from, review the contact below and take action.</item>
+        <item quantity="other">If you\'re not sure who the request is from, review the contacts below and take action.</item>
+    </plurals>
     <string name="ReviewCardDialogFragment__no_other_groups_in_common">कोई दूसरा साझा समूह नहीं</string>
     <string name="ReviewCardDialogFragment__no_groups_in_common">कोई साझा समूह नहीं</string>
     <plurals name="ReviewCardDialogFragment__d_other_groups_in_common">
@@ -4184,11 +4262,20 @@
     <string name="CallParticipantsListUpdatePopupWindow__s_joined">%1$s समूह में शामिल हुए</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_and_s_joined">%1$s और %2$s समूह में शामिल हुए</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_s_and_s_joined">%1$s, %2$s %3$s और समूह में शामिल हुए</string>
-    <string name="CallParticipantsListUpdatePopupWindow__s_s_and_d_others_joined">%1$s, %2$s और %3$d अन्य उपयोगकर्ता शामिल हुए</string>
+    <!-- Toast message shown in group call when 3 or more people join -->
+    <plurals name="CallParticipantsListUpdatePopupWindow__s_s_and_d_others_joined">
+        <item quantity="one">%1$s, %2$s and %3$d other joined</item>
+        <item quantity="other">%1$s, %2$s and %3$d others joined</item>
+    </plurals>
+    <!-- Toast/popup text shown when someone leaves a group call -->
     <string name="CallParticipantsListUpdatePopupWindow__s_left">%1$s समूह छोड़ गए</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_and_s_left">%1$sऔर %2$s समूह छोड़ गए</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_s_and_s_left">%1$s, %2$s और %3$s समूह छोड़ गए</string>
-    <string name="CallParticipantsListUpdatePopupWindow__s_s_and_d_others_left">%1$s, %2$s और %3$d अन्यउपयोगकर्ता समूह छोड़ गए</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 and %3$d other left</item>
+        <item quantity="other">%1$s, %2$s and %3$d others left</item>
+    </plurals>
 
     <string name="CallParticipant__you">आप</string>
     <string name="CallParticipant__you_on_another_device">आप (दूसरे डिवाइस से)</string>
@@ -4558,10 +4645,15 @@
 
     <!-- PrivacySettingsFragment -->
     <string name="PrivacySettingsFragment__blocked">ब्लॉक किया गया</string>
-    <string name="PrivacySettingsFragment__d_contacts">%1$d संपर्क</string>
+    <!-- Settings label that shows the number blocked contacts -->
+    <plurals name="PrivacySettingsFragment__d_contacts">
+        <item quantity="one">%1$d contact</item>
+        <item quantity="other">%1$d contacts</item>
+    </plurals>
     <string name="PrivacySettingsFragment__messaging">संदेश संवाद</string>
     <string name="PrivacySettingsFragment__disappearing_messages">गायब होने वाले मेसेज</string>
     <string name="PrivacySettingsFragment__app_security">ऐप सुरक्षा</string>
+    <!-- This refers to the multi-tasking overview (recent apps) from the Android operating system.-->
     <string name="PrivacySettingsFragment__block_screenshots_in_the_recents_list_and_inside_the_app">रीसेंट सूची में और ऐप के अंदर स्क्रीनशॉट ब्लॉक करें</string>
     <string name="PrivacySettingsFragment__signal_message_and_calls">Signal संदेश और कॉल, हमेशा रिले होने वाले कॉल और सील्ड सेंडर</string>
     <string name="PrivacySettingsFragment__default_timer_for_new_changes">नई चैट के लिए डिफ़ॉल्ट टाइमर</string>
@@ -4618,11 +4710,14 @@
     <string name="DataAndStorageSettingsFragment__media_quality">मीडिया क्वालिटी</string>
     <string name="DataAndStorageSettingsFragment__sent_media_quality">मीडिया क्वालिटी भेजी गई</string>
     <string name="DataAndStorageSettingsFragment__sending_high_quality_media_will_use_more_data">हाई क्वालिटी मीडिया भेजने के लिए अधिक डेटा खर्च होगा।</string>
+    <!-- Setting option that can be selected to default media to be sent as high quality by default -->
     <string name="DataAndStorageSettingsFragment__high">उच्च</string>
+    <!-- Setting option that can be selected to default media to be sent as standard quality by default -->
     <string name="DataAndStorageSettingsFragment__standard">मानक</string>
     <string name="DataAndStorageSettingsFragment__calls">कॉल</string>
 
     <!-- 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__use_custom_colors">कस्टम रंगों का उपयोग करें</string>
     <string name="ChatColorSelectionFragment__chat_color">चैट का रंग</string>
@@ -4834,6 +4929,7 @@
     <string name="AvatarPickerFragment__take_a_picture">फ़ोटो खींचें</string>
     <string name="AvatarPickerFragment__choose_a_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>
     <string name="AvatarPickerFragment__clear_avatar">अवतार हटाएँ</string>
@@ -4894,7 +4990,7 @@
     <string name="MediaReviewFragment__add_a_message">एक मेसेज शामिल करें</string>
     <string name="MediaReviewFragment__add_a_reply">एक जवाब शामिल करें</string>
     <string name="MediaReviewFragment__send_to">को भेजें</string>
-    <string name="MediaReviewFragment__view_once_message">एक बार मेसेज देखें</string>
+    <string name="MediaReviewFragment__view_once_message">एक बार मीडिया देखें</string>
     <string name="MediaReviewFragment__one_or_more_items_were_too_large">एक या उससे ज़्यादा आइटम बहुत बड़े थे</string>
     <string name="MediaReviewFragment__one_or_more_items_were_invalid">एक या अधिक आइटम अमान्य थे</string>
     <string name="MediaReviewFragment__too_many_items_selected">बहुत ज़्यादा आइटम चुने गए</string>
@@ -5487,7 +5583,7 @@
     <string name="StoryViewerFragment__s_s">%1$s%2$s</string>
     <!-- Displayed when viewing a post you sent -->
     <string name="StoryViewerPageFragment__you">आप</string>
-    <!-- Displayed when viewing a post displayed to a group -->
+    <!-- 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 -->
     <string name="StoryViewerPageFragment__reply">उत्तर</string>
@@ -6704,5 +6800,26 @@
     <!-- Content description for opening the note editor -->
     <string name="ViewNoteSheet__edit_note">नोट संपादित करें</string>
 
+    <!-- BackupProgressService -->
+    <!-- Notification title shown while backup restore job is running -->
+    <string name="BackupProgressService_title">बैकअप पुनः निर्मित हो रहा है…</string>
+    <!-- Notification title shown while downloading backup restore data -->
+    <string name="BackupProgressService_title_downloading">बैकअप डाटा डाउनलोड हो रहा है…</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>
+    <!-- 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 -->
+    <string name="BackupsTypeSettingsFragment__google_pay">Google Pay</string>
+    <!-- Displayed as the user\'s payment method as a label in a preference row -->
+    <string name="BackupsTypeSettingsFragment__bank_transfer">Bank transfer</string>
+    <!-- Displayed as the user\'s payment method as a label in a preference row -->
+    <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>
+
+
     <!-- 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 5c691d9a14..86e415d95b 100644
--- a/app/src/main/res/values-hr/strings.xml
+++ b/app/src/main/res/values-hr/strings.xml
@@ -1,6 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- smartling.instruction_comments_enabled = on -->
-<resources>
+<?xml version="1.0" encoding="UTF-8"?><!-- 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> -->
@@ -89,6 +87,16 @@
     <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">Allow access to your location</string>
+    <!-- Dialog description that will explain the steps needed to give location permission -->
+    <string name="AttachmentManager_signal_to_send_location">To send your location:</string>
+    <!-- Alert dialog description asking for location permission -->
+    <string name="AttachmentManager_signal_allow_signal_access_location">Allow Molly access to send your location.</string>
+    <!-- Toast text explaining Signal\'s need for location access -->
+    <string name="AttachmentManager_signal_needs_location_access">Molly needs location access to send your location.</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>
     <!-- Alert dialog description to send the recipient a request to activate payments -->
@@ -243,7 +251,7 @@
     <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>
@@ -392,8 +400,16 @@
     <string name="ConversationActivity_your_request_to_join_has_been_sent_to_the_group_admin">Vaš zahtjev za pridruživanje poslan je administratoru grupe. Biti će te obaviješteni kada nešto poduzmu.</string>
     <string name="ConversationActivity_cancel_request">Poništi zahtjev</string>
 
-    <string name="ConversationActivity_to_send_audio_messages_allow_signal_access_to_your_microphone">Za slanje zvučnih poruka, omogućite Mollyu pristup vašem mikrofonu.</string>
+    <!-- Dialog title asking users for microphone permission -->
+    <string name="ConversationActivity_allow_access_microphone">Allow access to your microphone</string>
+    <!-- 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>
+    <!-- Toast text explaining Signal\'s need for microphone access -->
+    <string name="ConversationActivity_signal_needs_microphone_access_voice_message">Molly needs microphone access to record a voice message.</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">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>
@@ -417,10 +433,17 @@
     <string name="ConversationActivity_you_will_leave_this_group_and_it_will_be_deleted_from_all_of_your_devices">Napustit ćete ovu grupu i ona će biti izbrisana sa svih vaših uređaja.</string>
     <string name="ConversationActivity_delete">Izbriši</string>
     <string name="ConversationActivity_delete_and_leave">Izbriši i napusti grupu</string>
-    <string name="ConversationActivity__to_call_s_signal_needs_access_to_your_microphone">Da biste uputili poziv za %1$s, omogućite Mollyu pristup vašem mikrofonu</string>
+
+    <!-- Dialog description that will explain the steps needed to give microphone permissions for a voice call -->
+    <string name="ConversationActivity__to_start_call">To start a 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">To start a call, allow Molly access to your microphone.</string>
+    <!-- Toast text explaining Signal\'s need for microphone access for a voice call -->
+    <string name="ConversationActivity_signal_needs_microphone_access_voice_call">Molly needs microphone access to start a call.</string>
 
 
     <string name="ConversationActivity_join">Pridruži se</string>
+    <!-- Button text for an active group call but the call is currently full and unjoinable -->
     <string name="ConversationActivity_full">Puno</string>
 
     <string name="ConversationActivity_error_sending_media">Pogreška prilikom slanja medijskog sadržaja</string>
@@ -645,6 +668,7 @@
     <string name="ConversationListFragment_unarchive">Dearhiviraj</string>
     <string name="ConversationListFragment_delete">Izbriši</string>
     <string name="ConversationListFragment_select_all">Odaberi sve</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 odabran</item>
         <item quantity="few">%1$d odabrana</item>
@@ -902,6 +926,7 @@
         <item quantity="many">%1$d poslanih pozivnica</item>
         <item quantity="other">%1$d poslanih pozivnica</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">Ne možete automatski dodati \"%1$s\" u grupu.\n\nKorisnik je pozvan i neće vidjeti poruke grupe dok ne prihvati pozivnicu.</string>
     <string name="GroupManagement_invite_multiple_users">Ne možete automatski dodati ove korisnike u grupu.\n\nKorisnik je pozvan u grupu i neće vidjeti poruke grupe dok ne prihvati pozivnicu.</string>
 
@@ -1114,7 +1139,9 @@
 
     <string name="ManageGroupActivity_edit_name_and_picture">Uredi naziv i sliku</string>
     <string name="ManageGroupActivity_legacy_group">Naslijeđena grupa</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">Ovo je Naslijeđena grupa. Značajke poput grupnih administratora su dostupne samo za Nove grupe.</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">Ovo je Naslijeđena grupa. Da biste pristupili novim značajkama poput @spominjanja i administratora,</string>
     <string name="ManageGroupActivity_legacy_group_too_large">Ova Naslijeđena grupa ne može se nadograditi u Novu grupu jer je prevelika. Maksimalna veličina grupe je %1$d.</string>
     <string name="ManageGroupActivity_upgrade_this_group">nadogradi ovu grupu.</string>
@@ -1359,6 +1386,7 @@
         <item quantity="other">Izbriši</item>
     </plurals>
 
+    <!-- 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">Odabrano %1$d (%2$s)</item>
         <item quantity="few">Odabrano %1$d (%2$s)</item>
@@ -1425,17 +1453,13 @@
     <string name="MessageRecord_left_group">Napustili ste grupu.</string>
     <string name="MessageRecord_you_updated_group">Ažurirali ste grupu.</string>
     <string name="MessageRecord_the_group_was_updated">Grupa je ažurirana.</string>
-    <!-- Update message shown when placing an outgoing 1:1 voice/audio call and it\'s answered by the other party -->
+    <!-- Update message shown when placing an outgoing 1:1 voice/audio call -->
     <string name="MessageRecord_outgoing_voice_call">Odlazni glasovni poziv</string>
-    <!-- Update message shown when placing an outgoing 1:1 video call and it\'s answered by the other party -->
+    <!-- Update message shown when placing an outgoing 1:1 video call -->
     <string name="MessageRecord_outgoing_video_call">Odlazni videopoziv</string>
-    <!-- Update message shown when placing an outgoing 1:1 voice/audio call and it\'s not answered by the other party -->
-    <string name="MessageRecord_unanswered_voice_call">Propušteni glasovni poziv</string>
-    <!-- Update message shown when placing an outgoing 1:1 video call and it\'s not answered by the other party -->
-    <string name="MessageRecord_unanswered_video_call">Propušteni videopoziv</string>
-    <!-- Update message shown when receiving an incoming 1:1 voice/audio call and it\'s answered -->
+    <!-- Update message shown when receiving an incoming 1:1 voice/audio call and it\'s answered or ringing -->
     <string name="MessageRecord_incoming_voice_call">Dolazni glasovni poziv</string>
-    <!-- Update message shown when receiving an incoming 1:1 video call and answered -->
+    <!-- Update message shown when receiving an incoming 1:1 video call and answered or ringing -->
     <string name="MessageRecord_incoming_video_call">Dolazni videopoziv</string>
     <!-- Update message shown when receiving an incoming 1:1 voice/audio call and not answered -->
     <string name="MessageRecord_missed_voice_call">Propušteni glasovni poziv</string>
@@ -1445,10 +1469,6 @@
     <string name="MessageRecord_missed_voice_call_notification_profile">Propustili ste glasovni poziv dok je profil obavijesti bio uključen</string>
     <!-- Update message shown when receiving an incoming video call and declined due to notification profile -->
     <string name="MessageRecord_missed_video_call_notification_profile">Propustili ste videopoziv dok je profil obavijesti bio uključen</string>
-    <!-- Update message shown when receiving an incoming 1:1 voice/audio call and explicitly declined -->
-    <string name="MessageRecord_you_declined_a_voice_call">Odbili ste glasovni poziv</string>
-    <!-- Update message shown when receiving an incoming 1:1 video call and explicitly declined -->
-    <string name="MessageRecord_you_declined_a_video_call">Odbili ste videopoziv</string>
     <!-- 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 je ažurirao grupu.</string>
@@ -1673,30 +1693,55 @@
     <string name="MessageRecord_can_accept_payments">%1$s sada može prihvaćati uplate</string>
 
     <!-- Group Calling update messages -->
-    <string name="MessageRecord_s_started_a_group_call_s">%1$s je započeo/la grupni poziv · %2$s</string>
-    <string name="MessageRecord_you_started_a_group_call_s">Započeli ste grupni poziv · %1$s</string>
-    <string name="MessageRecord_s_is_in_the_group_call_s">%1$s je na ovom grupnom pozivu · %2$s</string>
-    <string name="MessageRecord_you_are_in_the_group_call_s1">Vi ste na ovom grupnom pozivu · %1$s</string>
-    <string name="MessageRecord_s_and_s_are_in_the_group_call_s1">%1$s i %2$s su na ovom grupnom pozivu · %3$s</string>
-    <string name="MessageRecord_group_call_s">Grupni poziv · %1$s</string>
-
-    <string name="MessageRecord_s_started_a_group_call">%1$s je započeo/la grupni poziv</string>
-    <string name="MessageRecord_you_started_a_group_call">Započeli ste grupni poziv</string>
-    <string name="MessageRecord_s_is_in_the_group_call">%1$s je na ovom grupnom pozivu</string>
-    <string name="MessageRecord_you_are_in_the_group_call">Vi ste na ovom grupnom pozivu</string>
-    <string name="MessageRecord_s_and_s_are_in_the_group_call">%1$s i %2$s su na ovom grupnom pozivu</string>
-    <string name="MessageRecord_group_call">Grupni poziv</string>
+    <!-- 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 sudjeluje u ovom pozivu · %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">Pridružili ste se pozivu · %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 i %2$s sudjeluju u ovom pozivu · %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 sudjeluje u ovom pozivu</string>
+    <!-- Chat log text for an ongoing group call only the local user has joined -->
+    <string name="MessageRecord_you_are_in_the_call">Vi sudjelujete u ovom pozivu</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 i %2$s sudjeluju u ovom pozivu</string>
+    <!-- Chat log text for a group call that ended within the last 5 minutes -->
+    <string name="MessageRecord__the_video_call_has_ended">Videopoziv je završen</string>
+    <!-- Chat log text for a group call that ended within the last 5 minutes with a placeholder for formatted time -->
+    <string name="MessageRecord__the_video_call_has_ended_s">Videopoziv je završen · %1$s</string>
+    <!-- Chat log text for a group call that ended more than 5 minutes ago and was missed -->
+    <string name="MessageRecord__missed_video_call">Propušteni videopoziv</string>
+    <!-- Chat log text for a group call that ended more than 5 minutes ago and was missed with a placeholder for formatted time -->
+    <string name="MessageRecord__missed_video_call_s">Propušteni videopoziv · %1$s</string>
+    <!-- Chat log text for a group call that ended that the local user did not start -->
+    <string name="MessageRecord__incoming_video_call">Dolazni videopoziv</string>
+    <!-- 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">Dolazni videopoziv · %1$s</string>
+    <!-- Chat log text for a group call that ended that the local user started -->
+    <string name="MessageRecord__outgoing_video_call">Odlazni videopoziv</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">Odlazni videopoziv · %1$s</string>
+    <!-- Chat log text for an ongoing group call that the local user started -->
+    <string name="MessageRecord__you_started_a_video_call">Započeli ste videopoziv</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">Započeli ste videopoziv · %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 započinje videopoziv</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 započinje videopoziv · %2$s</string>
 
     <string name="MessageRecord_you">Vi</string>
 
-    <plurals name="MessageRecord_s_s_and_d_others_are_in_the_group_call_s">
+    <!-- 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 i još %3$d osoba su na ovom grupnom pozivu · %4$s</item>
         <item quantity="few">%1$s, %2$s i još %3$d osobe su na ovom grupnom pozivu · %4$s</item>
         <item quantity="many">%1$s, %2$s i još %3$d osoba je na ovom grupnom pozivu · %4$s</item>
-        <item quantity="other">%1$s, %2$s i još %3$d osoba su na ovom grupnom pozivu · %4$s</item>
+        <item quantity="other">%1$s, %2$s i još %3$d osoba je na ovom grupnom pozivu · %4$s</item>
     </plurals>
 
-    <plurals name="MessageRecord_s_s_and_d_others_are_in_the_group_call">
+    <!-- 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 i još %3$d osoba su na ovom grupnom pozivu</item>
         <item quantity="few">%1$s, %2$s i još %3$d osobe su na ovom grupnom pozivu</item>
         <item quantity="many">%1$s, %2$s i još %3$d osoba je na ovom grupnom pozivu</item>
@@ -2221,6 +2266,7 @@
     <!-- Generic error when the app is unable to request an SMS code for an unknown reason. -->
     <string name="RegistrationActivity_unable_to_request_verification_code">Nije moguće zatražiti potvrdni kôd. Provjerite mrežnu vezu i pokušajte ponovno.</string>
     <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">Molly Android – format broja telefona</string>
     <!--    Small "toast" notification to the user confirming that they have requested a new code via voice call.-->
@@ -2367,7 +2413,7 @@
     <string name="SubmitDebugLogActivity_this_log_will_be_posted_publicly_online_for_contributors">Ovaj će zapisnik biti javno objavljen na internetu za suradnike. Možete ga pregledati prije učitavanja.</string>
 
     <!-- SupportEmailUtil -->
-  <!-- Removed by excludeNonTranslatables <string name="SupportEmailUtil_support_email" translatable="false">support@molly.im</string> -->
+  <!-- Removed by excludeNonTranslatables <string name="SupportEmailUtil_support_email" translatable="false">support@signal.org</string> -->
     <string name="SupportEmailUtil_filter">Filtar:</string>
     <string name="SupportEmailUtil_device_info">Informacije o uređaju:</string>
     <string name="SupportEmailUtil_android_version">Android verzija:</string>
@@ -2883,6 +2929,8 @@
     <string name="ConversationUpdateItem_loading">Učitavanje</string>
     <string name="ConversationUpdateItem_learn_more">Saznajte više</string>
     <string name="ConversationUpdateItem_join_call">Pridruži se pozivu</string>
+    <!-- Action button label for starting a new call in the current conversation -->
+    <string name="ConversationUpdateItem_call_back">Uzvrati poziv</string>
     <string name="ConversationUpdateItem_return_to_call">Povratak na poziv</string>
     <string name="ConversationUpdateItem_call_is_full">Poziv je pun</string>
     <string name="ConversationUpdateItem_invite_friends">Pozovi prijatelje</string>
@@ -2947,6 +2995,7 @@
     <string name="safety_number_change_dialog__leave_call">Napusti poziv</string>
     <string name="safety_number_change_dialog__the_following_people_may_have_reinstalled_or_changed_devices">Sljedeće su osobe možda ponovo instalirale ili promijenile uređaje. Provjerite svoj sigurnosni broj s njima kako biste osigurali privatnost.</string>
     <string name="safety_number_change_dialog__view">Pregledaj</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">Prethodno provjereno</string>
 
     <!-- EnableCallNotificationSettingsDialog__call_notifications_checklist -->
@@ -3274,6 +3323,7 @@
 
     <string name="arrays__default">Zadano</string>
     <string name="arrays__high">Visoko</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">Najviše</string>
 
     <!-- plurals.xml -->
@@ -3551,7 +3601,7 @@
     <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 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>
@@ -3600,6 +3650,14 @@
     <!-- Storage permission row description -->
     <string name="GrantPermissionsFragment__send_photos_videos_and_files">Šaljite fotografije, videozapise i datoteke sa svoga uređaja.</string>
 
+    <!-- PermissionDeniedBottomSheet -->
+    <!-- Sheet describing step 1 on how to give permissions by opening settings -->
+    <string name="PermissionDeniedBottomSheet__1_tap_settings_below">1. Tap “Settings” below</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 Allow the permission</string>
+    <!-- Label for button at the bottom of the sheet which opens the system permission settings -->
+    <string name="PermissionDeniedBottomSheet__settings">Settings</string>
+
     <!-- PaymentsSecuritySetupFragment -->
     <!-- Toolbar title -->
     <string name="PaymentsSecuritySetupFragment__security_setup">Sigurnosne postavke</string>
@@ -3640,6 +3698,7 @@
     <string name="PaymentsDetailsFragment__sent_to_s">Poslano za %1$s</string>
     <string name="PaymentsDetailsFragment__you_on_s_at_s">Vi dana %1$s u %2$s</string>
     <string name="PaymentsDetailsFragment__s_on_s_at_s">%1$s dana %2$s u %3$s</string>
+    <!-- Prefix to a name to indicate who a payment was sent to -->
     <string name="PaymentsDetailsFragment__to">Za</string>
     <string name="PaymentsDetailsFragment__from">Od</string>
     <string name="PaymentsDetailsFragment__information">Pojedinosti o prijenosu kao i iznos uplate i vrijeme prijenosa dio su MobileCoin Ledgera.</string>
@@ -3702,6 +3761,7 @@
     <string name="ConfirmPayment__confirm_payment">Potvrdi plaćanje</string>
     <string name="ConfirmPayment__network_fee">Mrežna naknada</string>
     <string name="ConfirmPayment__estimated_s">Procijenjeno %1$s</string>
+    <!-- Prefix to a name to indicate who a payment will be sent to -->
     <string name="ConfirmPayment__to">Za</string>
     <string name="ConfirmPayment__total_amount">Ukupan iznos</string>
     <string name="ConfirmPayment__balance_s">Stanje: %1$s</string>
@@ -3856,6 +3916,14 @@
     <string name="conversation_group_options__conversation">Razgovor</string>
     <string name="conversation_group_options__broadcast">Emitiranje</string>
 
+    <!-- DoubleTapEditEducationSheet -->
+    <!-- Displayed as the title of the education bottom sheet -->
+    <string name="DoubleTapEditEducationSheet__double_tap_edit_title">Double tap to edit</string>
+    <!-- Text on the sheet explaining how double tapping on a message will let them edit it -->
+    <string name="DoubleTapEditEducationSheet__quickly_tap_twice">Quickly tap twice on your messages to edit them. You can edit your messages up to 24hrs after they’ve been sent.</string>
+    <!-- Button label to dismiss sheet -->
+    <string name="DoubleTapEditEducationSheet__got_it">Got it</string>
+
     <!-- text_secure_normal -->
     <string name="text_secure_normal__menu_new_group">Nova grupa</string>
     <string name="text_secure_normal__menu_settings">Postavke</string>
@@ -4324,6 +4392,7 @@
     <string name="RecipientBottomSheet_copied_to_clipboard">Kopirano u međuspremnik</string>
 
     <string name="GroupRecipientListItem_admin">Administrator</string>
+    <!-- Button text to approve a user that has requested to join a group -->
     <string name="GroupRecipientListItem_approve_description">Odobri</string>
     <string name="GroupRecipientListItem_deny_description">Odbij</string>
 
@@ -4351,6 +4420,7 @@
 
     <!-- VoiceNoteMediaDescriptionCompatFactory -->
     <string name="VoiceNoteMediaItemFactory__voice_message">Glasovna poruka: %1$s</string>
+    <!-- This is a title in a banner describing the conversation sender to receiver placeholders of the currently playing voice memo. -->
     <string name="VoiceNoteMediaItemFactory__s_to_s">%1$s za %2$s</string>
 
     <!-- StorageUtil -->
@@ -4364,8 +4434,20 @@
     <string name="ReviewCardDialogFragment__review_members">Pregled članova</string>
     <!-- Title of a screen where the user will be prompted to review a message request matching the name of someone they already know -->
     <string name="ReviewCardDialogFragment__review_request">Pregled zahtjeva</string>
-    <string name="ReviewCardDialogFragment__d_group_members_have_the_same_name">%1$d člana/ova grupe imaju isto ime, pregledajte članove u nastavku i odaberite poduzeti radnju.</string>
-    <string name="ReviewCardDialogFragment__if_youre_not_sure">Ako niste sigurni od koga je zahtjev, pregledajte kontakte u nastavku i poduzmite radnje.</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="few">%1$d group members have the same name, review the members below and choose to take action.</item>
+        <item quantity="many">%1$d group members have the same name, review the members 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 -->
+    <plurals name="ReviewCardDialogFragment__if_youre_not_sure">
+        <item quantity="one">If you\'re not sure who the request is from, review the contact below and take action.</item>
+        <item quantity="few">If you\'re not sure who the request is from, review the contacts below and take action.</item>
+        <item quantity="many">If you\'re not sure who the request is from, review the contacts below and take action.</item>
+        <item quantity="other">If you\'re not sure who the request is from, review the contacts below and take action.</item>
+    </plurals>
     <string name="ReviewCardDialogFragment__no_other_groups_in_common">Nema drugih zajedničkih grupa.</string>
     <string name="ReviewCardDialogFragment__no_groups_in_common">Nema zajedničkih grupa.</string>
     <plurals name="ReviewCardDialogFragment__d_other_groups_in_common">
@@ -4400,11 +4482,24 @@
     <string name="CallParticipantsListUpdatePopupWindow__s_joined">%1$s se pridružio/la</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_and_s_joined">%1$s i %2$s se pridružio/la</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_s_and_s_joined">%1$s, %2$s i %3$s se pridružio/la</string>
-    <string name="CallParticipantsListUpdatePopupWindow__s_s_and_d_others_joined">%1$s, %2$s i %3$d osoba su se pridružili</string>
+    <!-- Toast message shown in group call when 3 or more people join -->
+    <plurals name="CallParticipantsListUpdatePopupWindow__s_s_and_d_others_joined">
+        <item quantity="one">%1$s, %2$s and %3$d other joined</item>
+        <item quantity="few">%1$s, %2$s and %3$d others joined</item>
+        <item quantity="many">%1$s, %2$s and %3$d others joined</item>
+        <item quantity="other">%1$s, %2$s and %3$d others joined</item>
+    </plurals>
+    <!-- Toast/popup text shown when someone leaves a group call -->
     <string name="CallParticipantsListUpdatePopupWindow__s_left">%1$s je napustio/la</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_and_s_left">%1$s i %2$s je napustio/la</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_s_and_s_left">%1$s, %2$s i %3$s je napustio/la</string>
-    <string name="CallParticipantsListUpdatePopupWindow__s_s_and_d_others_left">%1$s, %2$s i %3$d osoba je napustilo</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 and %3$d other left</item>
+        <item quantity="few">%1$s, %2$s and %3$d others left</item>
+        <item quantity="many">%1$s, %2$s and %3$d others left</item>
+        <item quantity="other">%1$s, %2$s and %3$d others left</item>
+    </plurals>
 
     <string name="CallParticipant__you">Vi</string>
     <string name="CallParticipant__you_on_another_device">Vi (na drugom uređaju)</string>
@@ -4778,10 +4873,17 @@
 
     <!-- PrivacySettingsFragment -->
     <string name="PrivacySettingsFragment__blocked">Blokirani</string>
-    <string name="PrivacySettingsFragment__d_contacts">%1$d kontakata</string>
+    <!-- Settings label that shows the number blocked contacts -->
+    <plurals name="PrivacySettingsFragment__d_contacts">
+        <item quantity="one">%1$d contact</item>
+        <item quantity="few">%1$d contacts</item>
+        <item quantity="many">%1$d contacts</item>
+        <item quantity="other">%1$d contacts</item>
+    </plurals>
     <string name="PrivacySettingsFragment__messaging">Razmjena poruka</string>
     <string name="PrivacySettingsFragment__disappearing_messages">Poruke koje nestaju</string>
     <string name="PrivacySettingsFragment__app_security">Sigurnost aplikacije</string>
+    <!-- This refers to the multi-tasking overview (recent apps) from the Android operating system.-->
     <string name="PrivacySettingsFragment__block_screenshots_in_the_recents_list_and_inside_the_app">Blokira mogućnost snimke zaslona u nedavnim razgovorima i unutar aplikacije</string>
     <string name="PrivacySettingsFragment__signal_message_and_calls">Signal poruke i pozivi, uvijek preusmjeravanje poziva i zapečaćeni pošiljatelj</string>
     <string name="PrivacySettingsFragment__default_timer_for_new_changes">Zadani vremenski period za nove poruke</string>
@@ -4838,11 +4940,14 @@
     <string name="DataAndStorageSettingsFragment__media_quality">Kvaliteta medija</string>
     <string name="DataAndStorageSettingsFragment__sent_media_quality">Kvaliteta poslanih medija</string>
     <string name="DataAndStorageSettingsFragment__sending_high_quality_media_will_use_more_data">Slanje visokokvalitetnih medija zahtjeva veću potrošnju mobilnih podataka.</string>
+    <!-- Setting option that can be selected to default media to be sent as high quality by default -->
     <string name="DataAndStorageSettingsFragment__high">Visoko</string>
+    <!-- Setting option that can be selected to default media to be sent as standard quality by default -->
     <string name="DataAndStorageSettingsFragment__standard">Standardno</string>
     <string name="DataAndStorageSettingsFragment__calls">Pozivi</string>
 
     <!-- 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__use_custom_colors">Koristi prilagođene boje</string>
     <string name="ChatColorSelectionFragment__chat_color">Boja razgovora</string>
@@ -5060,6 +5165,7 @@
     <string name="AvatarPickerFragment__take_a_picture">Uslikaj</string>
     <string name="AvatarPickerFragment__choose_a_photo">Izaberi fotografiju</string>
     <string name="AvatarPickerFragment__photo">Fotografija</string>
+    <!-- Button label during avatar selection/creation that when tapped lets you generate an avatar from typed in text. -->
     <string name="AvatarPickerFragment__text">Tekst</string>
     <string name="AvatarPickerFragment__save">Spremi</string>
     <string name="AvatarPickerFragment__clear_avatar">Izbriši Avatara</string>
@@ -5128,7 +5234,7 @@
     <string name="MediaReviewFragment__add_a_message">Dodaj poruku</string>
     <string name="MediaReviewFragment__add_a_reply">Dodajte odgovor</string>
     <string name="MediaReviewFragment__send_to">Pošalji</string>
-    <string name="MediaReviewFragment__view_once_message">Jednom vidljiva poruka</string>
+    <string name="MediaReviewFragment__view_once_message">Medijski zapis koji nestaje nakon prikaza</string>
     <string name="MediaReviewFragment__one_or_more_items_were_too_large">Jedna ili više stavki bile su prevelike</string>
     <string name="MediaReviewFragment__one_or_more_items_were_invalid">Jedna ili više stavki bile su nevažeće</string>
     <string name="MediaReviewFragment__too_many_items_selected">Odabrano je previše stavki</string>
@@ -5731,7 +5837,7 @@
     <string name="StoryViewerFragment__s_s">%1$s%2$s</string>
     <!-- Displayed when viewing a post you sent -->
     <string name="StoryViewerPageFragment__you">Vi</string>
-    <!-- Displayed when viewing a post displayed to a group -->
+    <!-- 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 za %2$s</string>
     <!-- Displayed when viewing a post from another user with no replies -->
     <string name="StoryViewerPageFragment__reply">Odgovori</string>
@@ -6996,5 +7102,26 @@
     <!-- Content description for opening the note editor -->
     <string name="ViewNoteSheet__edit_note">Uredi bilješku</string>
 
+    <!-- BackupProgressService -->
+    <!-- Notification title shown while backup restore job is running -->
+    <string name="BackupProgressService_title">Vraćanje podataka iz sigurnosne kopije…</string>
+    <!-- Notification title shown while downloading backup restore data -->
+    <string name="BackupProgressService_title_downloading">Preuzimanje sigurnosne kopije podataka…</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>
+    <!-- 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 -->
+    <string name="BackupsTypeSettingsFragment__google_pay">Google Pay</string>
+    <!-- Displayed as the user\'s payment method as a label in a preference row -->
+    <string name="BackupsTypeSettingsFragment__bank_transfer">Bank transfer</string>
+    <!-- Displayed as the user\'s payment method as a label in a preference row -->
+    <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>
+
+
     <!-- 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 c0c2d13242..41492b326f 100644
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@@ -1,6 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- smartling.instruction_comments_enabled = on -->
-<resources>
+<?xml version="1.0" encoding="UTF-8"?><!-- 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> -->
@@ -89,6 +87,16 @@
     <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">Allow access to your location</string>
+    <!-- Dialog description that will explain the steps needed to give location permission -->
+    <string name="AttachmentManager_signal_to_send_location">To send your location:</string>
+    <!-- Alert dialog description asking for location permission -->
+    <string name="AttachmentManager_signal_allow_signal_access_location">Allow Molly access to send your location.</string>
+    <!-- Toast text explaining Signal\'s need for location access -->
+    <string name="AttachmentManager_signal_needs_location_access">Molly needs location access to send your location.</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>
     <!-- Alert dialog description to send the recipient a request to activate payments -->
@@ -241,7 +249,7 @@
     <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>
@@ -386,8 +394,16 @@
     <string name="ConversationActivity_your_request_to_join_has_been_sent_to_the_group_admin">A csatlakozási kérésed el lett küldve a csoportadmin részére. Értesítést fogsz kapni, amint reagálnak rá.</string>
     <string name="ConversationActivity_cancel_request">Kérés törlése</string>
 
-    <string name="ConversationActivity_to_send_audio_messages_allow_signal_access_to_your_microphone">Hangüzenetek küldéséhez engedélyezd, hogy a Molly hozzáférhessen a mikrofonhoz!</string>
+    <!-- Dialog title asking users for microphone permission -->
+    <string name="ConversationActivity_allow_access_microphone">Allow access to your microphone</string>
+    <!-- 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>
+    <!-- Toast text explaining Signal\'s need for microphone access -->
+    <string name="ConversationActivity_signal_needs_microphone_access_voice_message">Molly needs microphone access to record a voice message.</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 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>
@@ -411,10 +427,17 @@
     <string name="ConversationActivity_you_will_leave_this_group_and_it_will_be_deleted_from_all_of_your_devices">Ha kilépsz a csoportból, akkor a csoport a többi társított eszközödön is törölve lesz.</string>
     <string name="ConversationActivity_delete">Törlés</string>
     <string name="ConversationActivity_delete_and_leave">Törlés és kilépés</string>
-    <string name="ConversationActivity__to_call_s_signal_needs_access_to_your_microphone">%1$s hívásához a Mollynak hozzá kell férnie mikrofonodhoz</string>
+
+    <!-- Dialog description that will explain the steps needed to give microphone permissions for a voice call -->
+    <string name="ConversationActivity__to_start_call">To start a 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">To start a call, allow Molly access to your microphone.</string>
+    <!-- Toast text explaining Signal\'s need for microphone access for a voice call -->
+    <string name="ConversationActivity_signal_needs_microphone_access_voice_call">Molly needs microphone access to start a call.</string>
 
 
     <string name="ConversationActivity_join">Csatlakozás</string>
+    <!-- Button text for an active group call but the call is currently full and unjoinable -->
     <string name="ConversationActivity_full">Tele</string>
 
     <string name="ConversationActivity_error_sending_media">Hiba történt a médiafájl küldése során</string>
@@ -613,6 +636,7 @@
     <string name="ConversationListFragment_unarchive">Nem archív</string>
     <string name="ConversationListFragment_delete">Törlés</string>
     <string name="ConversationListFragment_select_all">Összes kivál.</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 kiválasztva</item>
         <item quantity="other">%1$d kiválasztva</item>
@@ -864,6 +888,7 @@
         <item quantity="one">Meghívó elküldve</item>
         <item quantity="other">%1$d meghívó elküldve</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">Nem lehet \"%1$s\" nevű kontaktodat automatikusan a csoporthoz adni.\n\nBár már meg lett hívva, addig mégsem láthatja az csoportüzeneteket, míg el nem fogadja a meghívást.</string>
     <string name="GroupManagement_invite_multiple_users">Ezeket a felhasználókat nem lehet automatikusan a csoporthoz adni.\n\nBár már meg lettek hívva, addig mégsem láthatják a csoportüzeneteket, míg el nem fogadják a meghívást.</string>
 
@@ -1044,7 +1069,9 @@
 
     <string name="ManageGroupActivity_edit_name_and_picture">Név és kép szerkesztése</string>
     <string name="ManageGroupActivity_legacy_group">Régi típusú csoport</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">Ez egy régi típusú csoport. Az újabb funkciók (pl. csoport-adminok) csak az újabb típusú csoportokban érhetőek el.</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">Ez egy régi típusú csoport. Az újabb funkciók eléréséhez, mint pl. az @említések és adminok,</string>
     <string name="ManageGroupActivity_legacy_group_too_large">Ezt a régi típusú csoportot nem lehet új típusúra frissíteni, mert túl nagy. A maximális csoportméret %1$d tag.</string>
     <string name="ManageGroupActivity_upgrade_this_group">frissítsd a csoportot!</string>
@@ -1271,6 +1298,7 @@
         <item quantity="other">Törlés</item>
     </plurals>
 
+    <!-- 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 kiválasztva (%2$s)</item>
         <item quantity="other">%1$d kiválasztva (%2$s)</item>
@@ -1335,17 +1363,13 @@
     <string name="MessageRecord_left_group">Kiléptél a csoportból.</string>
     <string name="MessageRecord_you_updated_group">Frissítetted a csoportot.</string>
     <string name="MessageRecord_the_group_was_updated">A csoport frissítve lett.</string>
-    <!-- Update message shown when placing an outgoing 1:1 voice/audio call and it\'s answered by the other party -->
+    <!-- Update message shown when placing an outgoing 1:1 voice/audio call -->
     <string name="MessageRecord_outgoing_voice_call">Kimenő hanghívás</string>
-    <!-- Update message shown when placing an outgoing 1:1 video call and it\'s answered by the other party -->
+    <!-- Update message shown when placing an outgoing 1:1 video call -->
     <string name="MessageRecord_outgoing_video_call">Kimenő videóhívás</string>
-    <!-- Update message shown when placing an outgoing 1:1 voice/audio call and it\'s not answered by the other party -->
-    <string name="MessageRecord_unanswered_voice_call">Nem fogadott hanghívás</string>
-    <!-- Update message shown when placing an outgoing 1:1 video call and it\'s not answered by the other party -->
-    <string name="MessageRecord_unanswered_video_call">Nem fogadott videóhívás</string>
-    <!-- Update message shown when receiving an incoming 1:1 voice/audio call and it\'s answered -->
+    <!-- Update message shown when receiving an incoming 1:1 voice/audio call and it\'s answered or ringing -->
     <string name="MessageRecord_incoming_voice_call">Bejövő hanghívás</string>
-    <!-- Update message shown when receiving an incoming 1:1 video call and answered -->
+    <!-- Update message shown when receiving an incoming 1:1 video call and answered or ringing -->
     <string name="MessageRecord_incoming_video_call">Bejövő videóhívás</string>
     <!-- Update message shown when receiving an incoming 1:1 voice/audio call and not answered -->
     <string name="MessageRecord_missed_voice_call">Nem fogadott hanghívás</string>
@@ -1355,10 +1379,6 @@
     <string name="MessageRecord_missed_voice_call_notification_profile">Nem fogadott hanghívás, miközben az értesítési profil be van kapcsolva</string>
     <!-- Update message shown when receiving an incoming video call and declined due to notification profile -->
     <string name="MessageRecord_missed_video_call_notification_profile">Nem fogadott videohívás, miközben az értesítési profil be van kapcsolva</string>
-    <!-- Update message shown when receiving an incoming 1:1 voice/audio call and explicitly declined -->
-    <string name="MessageRecord_you_declined_a_voice_call">Elutasítottál egy hanghívást</string>
-    <!-- Update message shown when receiving an incoming 1:1 video call and explicitly declined -->
-    <string name="MessageRecord_you_declined_a_video_call">Elutasítottál egy videóhívást</string>
     <!-- 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 frissítette a csoportot.</string>
@@ -1567,28 +1587,53 @@
     <string name="MessageRecord_can_accept_payments">%1$s mostantól fogadhat Kifizetéseket</string>
 
     <!-- Group Calling update messages -->
-    <string name="MessageRecord_s_started_a_group_call_s">%1$s csoport hívást indított · %2$s</string>
-    <string name="MessageRecord_you_started_a_group_call_s">Elindítottál egy csoporthívást · %1$s</string>
-    <string name="MessageRecord_s_is_in_the_group_call_s">%1$s csoporthívásban van · %2$s</string>
-    <string name="MessageRecord_you_are_in_the_group_call_s1">Csoport hívásban vagy · %1$s</string>
-    <string name="MessageRecord_s_and_s_are_in_the_group_call_s1">%1$s és %2$s csoporthívásban van · %3$s</string>
-    <string name="MessageRecord_group_call_s">Csoporthívás · %1$s</string>
-
-    <string name="MessageRecord_s_started_a_group_call">%1$s csoporthívást indított</string>
-    <string name="MessageRecord_you_started_a_group_call">Elindítottad a csoporthívást</string>
-    <string name="MessageRecord_s_is_in_the_group_call">%1$s csoporthívásban van</string>
-    <string name="MessageRecord_you_are_in_the_group_call">Csoporthívásban vagy</string>
-    <string name="MessageRecord_s_and_s_are_in_the_group_call">%1$s és %2$s csoporthívásban van</string>
-    <string name="MessageRecord_group_call">Csoporthívás</string>
+    <!-- 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 részt vesz a hívásban · %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">Részt veszel a hívásban · %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 és %2$s részt vesznek a hívásban · %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 részt vesz a hívásban</string>
+    <!-- Chat log text for an ongoing group call only the local user has joined -->
+    <string name="MessageRecord_you_are_in_the_call">Részt veszel a hívásban</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 és %2$s részt vesznek a hívásban</string>
+    <!-- Chat log text for a group call that ended within the last 5 minutes -->
+    <string name="MessageRecord__the_video_call_has_ended">A videohívás véget ért</string>
+    <!-- Chat log text for a group call that ended within the last 5 minutes with a placeholder for formatted time -->
+    <string name="MessageRecord__the_video_call_has_ended_s">A videohívás véget ért · %1$s</string>
+    <!-- Chat log text for a group call that ended more than 5 minutes ago and was missed -->
+    <string name="MessageRecord__missed_video_call">Nem fogadott videóhívás</string>
+    <!-- Chat log text for a group call that ended more than 5 minutes ago and was missed with a placeholder for formatted time -->
+    <string name="MessageRecord__missed_video_call_s">Nem fogadott videóhívás · %1$s</string>
+    <!-- Chat log text for a group call that ended that the local user did not start -->
+    <string name="MessageRecord__incoming_video_call">Bejövő videóhívás</string>
+    <!-- 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">Bejövő videohívás · %1$s</string>
+    <!-- Chat log text for a group call that ended that the local user started -->
+    <string name="MessageRecord__outgoing_video_call">Kimenő videóhívás</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">Kimenő videohívás · %1$s</string>
+    <!-- Chat log text for an ongoing group call that the local user started -->
+    <string name="MessageRecord__you_started_a_video_call">Videohívást indítottál</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">Videohívást indítottál · %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 videohívást indított</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 videohívást indított · %2$s</string>
 
     <string name="MessageRecord_you">Te</string>
 
-    <plurals name="MessageRecord_s_s_and_d_others_are_in_the_group_call_s">
+    <!-- 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 és %3$d másik személy csoporthívásban van · %4$s</item>
         <item quantity="other">%1$s, %2$s és %3$d másik személy csoporthívásban van · %4$s</item>
     </plurals>
 
-    <plurals name="MessageRecord_s_s_and_d_others_are_in_the_group_call">
+    <!-- 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 és %3$d másik személy csoporthívásban van</item>
         <item quantity="other">%1$s, %2$s és %3$d másik személy csoporthívásban van</item>
     </plurals>
@@ -2063,6 +2108,7 @@
     <!-- Generic error when the app is unable to request an SMS code for an unknown reason. -->
     <string name="RegistrationActivity_unable_to_request_verification_code">Nem lehet ellenőrző kódot kérni. Kérjük, ellenőrizd a hálózati kapcsolatot, és próbáld újra!</string>
     <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">Molly Android - Telefonszám formátum</string>
     <!--    Small "toast" notification to the user confirming that they have requested a new code via voice call.-->
@@ -2207,7 +2253,7 @@
     <string name="SubmitDebugLogActivity_this_log_will_be_posted_publicly_online_for_contributors">Ez a naplófájl nyilvánosan elérhető lesz az interneten annak érdekében, hogy a fejlesztők megtekinthessék. A tartalmát feltöltés előtt ellenőrizheted, és szabadon szerkesztheted.</string>
 
     <!-- SupportEmailUtil -->
-  <!-- Removed by excludeNonTranslatables <string name="SupportEmailUtil_support_email" translatable="false">support@molly.im</string> -->
+  <!-- Removed by excludeNonTranslatables <string name="SupportEmailUtil_support_email" translatable="false">support@signal.org</string> -->
     <string name="SupportEmailUtil_filter">Szűrő:</string>
     <string name="SupportEmailUtil_device_info">Eszköz információ:</string>
     <string name="SupportEmailUtil_android_version">Android verzió:</string>
@@ -2709,6 +2755,8 @@
     <string name="ConversationUpdateItem_loading">Betöltés</string>
     <string name="ConversationUpdateItem_learn_more">Tudj meg többet!</string>
     <string name="ConversationUpdateItem_join_call">Belépés a hívásba</string>
+    <!-- Action button label for starting a new call in the current conversation -->
+    <string name="ConversationUpdateItem_call_back">Visszahívás</string>
     <string name="ConversationUpdateItem_return_to_call">Vissza a híváshoz</string>
     <string name="ConversationUpdateItem_call_is_full">A hívás betelt</string>
     <string name="ConversationUpdateItem_invite_friends">Barátok meghívása</string>
@@ -2773,6 +2821,7 @@
     <string name="safety_number_change_dialog__leave_call">Kilépés a hívásból</string>
     <string name="safety_number_change_dialog__the_following_people_may_have_reinstalled_or_changed_devices">A következő személyek lehet, hogy újratelepítették a Signalt vagy készüléket cseréltek. Ellenőrizd biztonsági számotokat a privacy megőrzése érdekében!</string>
     <string name="safety_number_change_dialog__view">Megtekintés</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">Korábban megerősítve</string>
 
     <!-- EnableCallNotificationSettingsDialog__call_notifications_checklist -->
@@ -3086,6 +3135,7 @@
 
     <string name="arrays__default">Alapértelmezett</string>
     <string name="arrays__high">Magas</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">Legmagasabb</string>
 
     <!-- plurals.xml -->
@@ -3357,7 +3407,7 @@
     <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 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>
@@ -3406,6 +3456,14 @@
     <!-- Storage permission row description -->
     <string name="GrantPermissionsFragment__send_photos_videos_and_files">Fényképeket, videókat és fájlokat is küldhetsz az eszközödről.</string>
 
+    <!-- PermissionDeniedBottomSheet -->
+    <!-- Sheet describing step 1 on how to give permissions by opening settings -->
+    <string name="PermissionDeniedBottomSheet__1_tap_settings_below">1. Tap “Settings” below</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 Allow the permission</string>
+    <!-- Label for button at the bottom of the sheet which opens the system permission settings -->
+    <string name="PermissionDeniedBottomSheet__settings">Settings</string>
+
     <!-- PaymentsSecuritySetupFragment -->
     <!-- Toolbar title -->
     <string name="PaymentsSecuritySetupFragment__security_setup">Biztonsági beállítás</string>
@@ -3446,6 +3504,7 @@
     <string name="PaymentsDetailsFragment__sent_to_s">Címzett: %1$s</string>
     <string name="PaymentsDetailsFragment__you_on_s_at_s">Te %1$s napján %2$s időpontban</string>
     <string name="PaymentsDetailsFragment__s_on_s_at_s">%1$s %2$s napján %3$s időpontban</string>
+    <!-- Prefix to a name to indicate who a payment was sent to -->
     <string name="PaymentsDetailsFragment__to">Címzett</string>
     <string name="PaymentsDetailsFragment__from">Feladó</string>
     <string name="PaymentsDetailsFragment__information">A tranzakció részletei, beleértve a fizetési összeget és a tranzakció idejét, a MobileCoin Ledger részét képezik.</string>
@@ -3508,6 +3567,7 @@
     <string name="ConfirmPayment__confirm_payment">Fizetés megerősítése</string>
     <string name="ConfirmPayment__network_fee">Hálózati díj</string>
     <string name="ConfirmPayment__estimated_s">Becsült %1$s</string>
+    <!-- Prefix to a name to indicate who a payment will be sent to -->
     <string name="ConfirmPayment__to">Címzett</string>
     <string name="ConfirmPayment__total_amount">Teljes összeg</string>
     <string name="ConfirmPayment__balance_s">Egyenleg: %1$s</string>
@@ -3658,6 +3718,14 @@
     <string name="conversation_group_options__conversation">Csevegés</string>
     <string name="conversation_group_options__broadcast">Adás</string>
 
+    <!-- DoubleTapEditEducationSheet -->
+    <!-- Displayed as the title of the education bottom sheet -->
+    <string name="DoubleTapEditEducationSheet__double_tap_edit_title">Double tap to edit</string>
+    <!-- Text on the sheet explaining how double tapping on a message will let them edit it -->
+    <string name="DoubleTapEditEducationSheet__quickly_tap_twice">Quickly tap twice on your messages to edit them. You can edit your messages up to 24hrs after they’ve been sent.</string>
+    <!-- Button label to dismiss sheet -->
+    <string name="DoubleTapEditEducationSheet__got_it">Got it</string>
+
     <!-- text_secure_normal -->
     <string name="text_secure_normal__menu_new_group">Új csoport</string>
     <string name="text_secure_normal__menu_settings">Beállítások</string>
@@ -4112,6 +4180,7 @@
     <string name="RecipientBottomSheet_copied_to_clipboard">Vágólapra másolva</string>
 
     <string name="GroupRecipientListItem_admin">Admin</string>
+    <!-- Button text to approve a user that has requested to join a group -->
     <string name="GroupRecipientListItem_approve_description">Jóváhagyás</string>
     <string name="GroupRecipientListItem_deny_description">Elutasítás</string>
 
@@ -4139,6 +4208,7 @@
 
     <!-- VoiceNoteMediaDescriptionCompatFactory -->
     <string name="VoiceNoteMediaItemFactory__voice_message">Hangüzenet · %1$s</string>
+    <!-- This is a title in a banner describing the conversation sender to receiver placeholders of the currently playing voice memo. -->
     <string name="VoiceNoteMediaItemFactory__s_to_s">%1$s (címzett: %2$s)</string>
 
     <!-- StorageUtil -->
@@ -4152,8 +4222,16 @@
     <string name="ReviewCardDialogFragment__review_members">Tagok áttekintése</string>
     <!-- Title of a screen where the user will be prompted to review a message request matching the name of someone they already know -->
     <string name="ReviewCardDialogFragment__review_request">Kérés áttekintése</string>
-    <string name="ReviewCardDialogFragment__d_group_members_have_the_same_name">%1$d csoporttagnak ugyanaz a neve. Tekintsd át a listájukat, és dönts a továbbiakról!</string>
-    <string name="ReviewCardDialogFragment__if_youre_not_sure">Ha nem vagy benne biztos, hogy kitől is érkezett a kérés, akkor tekintsd át az alábbi kontaktokat döntés előtt!</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="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 -->
+    <plurals name="ReviewCardDialogFragment__if_youre_not_sure">
+        <item quantity="one">If you\'re not sure who the request is from, review the contact below and take action.</item>
+        <item quantity="other">If you\'re not sure who the request is from, review the contacts below and take action.</item>
+    </plurals>
     <string name="ReviewCardDialogFragment__no_other_groups_in_common">Nincs egyéb közös csoportotok.</string>
     <string name="ReviewCardDialogFragment__no_groups_in_common">Nincs közös csoportotok.</string>
     <plurals name="ReviewCardDialogFragment__d_other_groups_in_common">
@@ -4184,11 +4262,20 @@
     <string name="CallParticipantsListUpdatePopupWindow__s_joined">%1$s csatlakozott</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_and_s_joined">%1$s és %2$s csatlakozott</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_s_and_s_joined">%1$s, %2$s és %3$s csatlakozott</string>
-    <string name="CallParticipantsListUpdatePopupWindow__s_s_and_d_others_joined">%1$s, %2$s és %3$d másik személy csatlakozott</string>
+    <!-- Toast message shown in group call when 3 or more people join -->
+    <plurals name="CallParticipantsListUpdatePopupWindow__s_s_and_d_others_joined">
+        <item quantity="one">%1$s, %2$s and %3$d other joined</item>
+        <item quantity="other">%1$s, %2$s and %3$d others joined</item>
+    </plurals>
+    <!-- Toast/popup text shown when someone leaves a group call -->
     <string name="CallParticipantsListUpdatePopupWindow__s_left">%1$s kilépett</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_and_s_left">%1$s és %2$s kilépett</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_s_and_s_left">%1$s, %2$s és %3$s kilépett</string>
-    <string name="CallParticipantsListUpdatePopupWindow__s_s_and_d_others_left">%1$s, %2$s és %3$d másik személy kilépett</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 and %3$d other left</item>
+        <item quantity="other">%1$s, %2$s and %3$d others left</item>
+    </plurals>
 
     <string name="CallParticipant__you">Te</string>
     <string name="CallParticipant__you_on_another_device">Te (másik eszközön)</string>
@@ -4558,10 +4645,15 @@
 
     <!-- PrivacySettingsFragment -->
     <string name="PrivacySettingsFragment__blocked">Letiltva</string>
-    <string name="PrivacySettingsFragment__d_contacts">%1$d kontakt</string>
+    <!-- Settings label that shows the number blocked contacts -->
+    <plurals name="PrivacySettingsFragment__d_contacts">
+        <item quantity="one">%1$d contact</item>
+        <item quantity="other">%1$d contacts</item>
+    </plurals>
     <string name="PrivacySettingsFragment__messaging">Üzenetküldés</string>
     <string name="PrivacySettingsFragment__disappearing_messages">Eltűnő üzenetek</string>
     <string name="PrivacySettingsFragment__app_security">App biztonság</string>
+    <!-- This refers to the multi-tasking overview (recent apps) from the Android operating system.-->
     <string name="PrivacySettingsFragment__block_screenshots_in_the_recents_list_and_inside_the_app">Képernyőképek készítésének letiltása a futó alkalmazások listájában és az alkalmazáson belül</string>
     <string name="PrivacySettingsFragment__signal_message_and_calls">Signal üzenetek és hívások, átjátszási beállítások, rejtett feladó</string>
     <string name="PrivacySettingsFragment__default_timer_for_new_changes">Alapértelmezett időzítő új csevegésekhez</string>
@@ -4618,11 +4710,14 @@
     <string name="DataAndStorageSettingsFragment__media_quality">Médiafájl minősége</string>
     <string name="DataAndStorageSettingsFragment__sent_media_quality">Elküldött médiafájl minősége</string>
     <string name="DataAndStorageSettingsFragment__sending_high_quality_media_will_use_more_data">A nagy felbontású médiafájl elküldése több adatforgalommal jár.</string>
+    <!-- Setting option that can be selected to default media to be sent as high quality by default -->
     <string name="DataAndStorageSettingsFragment__high">Magas</string>
+    <!-- Setting option that can be selected to default media to be sent as standard quality by default -->
     <string name="DataAndStorageSettingsFragment__standard">Normál</string>
     <string name="DataAndStorageSettingsFragment__calls">Hívások</string>
 
     <!-- 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__use_custom_colors">Egyedi színek használata</string>
     <string name="ChatColorSelectionFragment__chat_color">Csevegés színe</string>
@@ -4834,6 +4929,7 @@
     <string name="AvatarPickerFragment__take_a_picture">Kép készítése</string>
     <string name="AvatarPickerFragment__choose_a_photo">Fotó választás</string>
     <string name="AvatarPickerFragment__photo">Fotó</string>
+    <!-- Button label during avatar selection/creation that when tapped lets you generate an avatar from typed in text. -->
     <string name="AvatarPickerFragment__text">Szöveg</string>
     <string name="AvatarPickerFragment__save">Mentés</string>
     <string name="AvatarPickerFragment__clear_avatar">Profilkép törlése</string>
@@ -4894,7 +4990,7 @@
     <string name="MediaReviewFragment__add_a_message">Szöveg hozzáadása</string>
     <string name="MediaReviewFragment__add_a_reply">Válasz hozzáadása</string>
     <string name="MediaReviewFragment__send_to">Címzett</string>
-    <string name="MediaReviewFragment__view_once_message">Egyszer megjelenő üzenet</string>
+    <string name="MediaReviewFragment__view_once_message">Egyszer megjelenő médiafájl megtekintése</string>
     <string name="MediaReviewFragment__one_or_more_items_were_too_large">Egy vagy több elem túl nagy méretű</string>
     <string name="MediaReviewFragment__one_or_more_items_were_invalid">Egy vagy több elem érvénytelen formátumú</string>
     <string name="MediaReviewFragment__too_many_items_selected">Túl sok kijelölt elem</string>
@@ -5487,7 +5583,7 @@
     <string name="StoryViewerFragment__s_s">%1$s %2$s</string>
     <!-- Displayed when viewing a post you sent -->
     <string name="StoryViewerPageFragment__you">Te</string>
-    <!-- Displayed when viewing a post displayed to a group -->
+    <!-- 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 (címzett: %2$s)</string>
     <!-- Displayed when viewing a post from another user with no replies -->
     <string name="StoryViewerPageFragment__reply">Válasz</string>
@@ -6704,5 +6800,26 @@
     <!-- Content description for opening the note editor -->
     <string name="ViewNoteSheet__edit_note">Megjegyzés szerkesztése</string>
 
+    <!-- BackupProgressService -->
+    <!-- Notification title shown while backup restore job is running -->
+    <string name="BackupProgressService_title">Biztonsági mentés visszaállítása…</string>
+    <!-- Notification title shown while downloading backup restore data -->
+    <string name="BackupProgressService_title_downloading">Biztonsági mentés adatainak letöltése…</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>
+    <!-- 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 -->
+    <string name="BackupsTypeSettingsFragment__google_pay">Google Pay</string>
+    <!-- Displayed as the user\'s payment method as a label in a preference row -->
+    <string name="BackupsTypeSettingsFragment__bank_transfer">Bank transfer</string>
+    <!-- Displayed as the user\'s payment method as a label in a preference row -->
+    <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>
+
+
     <!-- 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 f82ddfb4d7..ef204984f8 100644
--- a/app/src/main/res/values-in/strings.xml
+++ b/app/src/main/res/values-in/strings.xml
@@ -1,6 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- smartling.instruction_comments_enabled = on -->
-<resources>
+<?xml version="1.0" encoding="UTF-8"?><!-- 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> -->
@@ -89,6 +87,16 @@
     <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">Allow access to your location</string>
+    <!-- Dialog description that will explain the steps needed to give location permission -->
+    <string name="AttachmentManager_signal_to_send_location">To send your location:</string>
+    <!-- Alert dialog description asking for location permission -->
+    <string name="AttachmentManager_signal_allow_signal_access_location">Allow Molly access to send your location.</string>
+    <!-- Toast text explaining Signal\'s need for location access -->
+    <string name="AttachmentManager_signal_needs_location_access">Molly needs location access to send your location.</string>
+
     <!-- Alert dialog title to show the recipient has not activated payments -->
     <string name="AttachmentManager__not_activated_payments">%1$s belum mengaktifkan Pembayaran </string>
     <!-- Alert dialog description to send the recipient a request to activate payments -->
@@ -240,7 +248,7 @@
     <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>
@@ -383,8 +391,16 @@
     <string name="ConversationActivity_your_request_to_join_has_been_sent_to_the_group_admin">Permintaan Anda untuk bergabung telah terkirim kepada admin grup. Anda akan diberitahu saat mereka meresponnya.</string>
     <string name="ConversationActivity_cancel_request">Batalkan Permintaan</string>
 
-    <string name="ConversationActivity_to_send_audio_messages_allow_signal_access_to_your_microphone">Untuk mengirim pesan audio, izinkan Molly mengakses mikrofon Anda.</string>
+    <!-- Dialog title asking users for microphone permission -->
+    <string name="ConversationActivity_allow_access_microphone">Allow access to your microphone</string>
+    <!-- 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>
+    <!-- Toast text explaining Signal\'s need for microphone access -->
+    <string name="ConversationActivity_signal_needs_microphone_access_voice_message">Molly needs microphone access to record a voice message.</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">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>
@@ -408,10 +424,17 @@
     <string name="ConversationActivity_you_will_leave_this_group_and_it_will_be_deleted_from_all_of_your_devices">Anda akan keluar dari grup ini, dan grup akan dihapus dari semua perangkat Anda.</string>
     <string name="ConversationActivity_delete">Hapus</string>
     <string name="ConversationActivity_delete_and_leave">Hapus dan keluar</string>
-    <string name="ConversationActivity__to_call_s_signal_needs_access_to_your_microphone">Untuk menelepon %1$s, Molly memerlukan akses mikrofon Anda</string>
+
+    <!-- Dialog description that will explain the steps needed to give microphone permissions for a voice call -->
+    <string name="ConversationActivity__to_start_call">To start a 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">To start a call, allow Molly access to your microphone.</string>
+    <!-- Toast text explaining Signal\'s need for microphone access for a voice call -->
+    <string name="ConversationActivity_signal_needs_microphone_access_voice_call">Molly needs microphone access to start a call.</string>
 
 
     <string name="ConversationActivity_join">Bergabung</string>
+    <!-- Button text for an active group call but the call is currently full and unjoinable -->
     <string name="ConversationActivity_full">Penuh</string>
 
     <string name="ConversationActivity_error_sending_media">Gagal mengirim media</string>
@@ -597,6 +620,7 @@
     <string name="ConversationListFragment_unarchive">Buka Arsip</string>
     <string name="ConversationListFragment_delete">Hapus</string>
     <string name="ConversationListFragment_select_all">Pilih semua</string>
+    <!-- Screen title shown when selecting multiple items from a list like conversation threads or call logs. -->
     <plurals name="ConversationListFragment_s_selected">
         <item quantity="other">%1$d dipilih</item>
     </plurals>
@@ -845,6 +869,7 @@
     <plurals name="GroupManagement_invitation_sent">
         <item quantity="other">%1$d undangan dikirimkan</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">\"%1$s\" tidak dapat secara otomatis ditambahkan ke grup oleh Anda.\n\nMereka telah diundang untuk bergabung, dan tidak akan melihat pesan grup sampai mereka menerimanya.</string>
     <string name="GroupManagement_invite_multiple_users">Pengguna ini tidak dapat secara otomatis Anda tambahkan ke dalam grup.\n\nMereka telah mendapatkan undangan, dan tidak dapat melihat pesan di dalam grup sampai mereka menerimanya.</string>
 
@@ -1009,7 +1034,9 @@
 
     <string name="ManageGroupActivity_edit_name_and_picture">Sunting nama dan gambar</string>
     <string name="ManageGroupActivity_legacy_group">Grup Lama</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">Ini adalah Grup Lama. Fitur-fitur seperti admin grup hanya tersedia untuk Grup Baru.</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">Ini adalah Grup Lama. Untuk mengakses fitur-fitur baru seperti @mention dan admin,</string>
     <string name="ManageGroupActivity_legacy_group_too_large">Grup lama ini tidak bisa ditingkatkan menjadi grup yang baru karena terlalu besar. Ukuran maksimum grup adalah %1$d.</string>
     <string name="ManageGroupActivity_upgrade_this_group">perbarui grup ini.</string>
@@ -1227,6 +1254,7 @@
         <item quantity="other">Hapus</item>
     </plurals>
 
+    <!-- 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="other">%1$d dipilih (%2$s)</item>
     </plurals>
@@ -1290,17 +1318,13 @@
     <string name="MessageRecord_left_group">Anda telah keluar dari grup.</string>
     <string name="MessageRecord_you_updated_group">Anda memperbarui grup.</string>
     <string name="MessageRecord_the_group_was_updated">Grup telah diiperbarui.</string>
-    <!-- Update message shown when placing an outgoing 1:1 voice/audio call and it\'s answered by the other party -->
+    <!-- Update message shown when placing an outgoing 1:1 voice/audio call -->
     <string name="MessageRecord_outgoing_voice_call">Panggilan suara keluar</string>
-    <!-- Update message shown when placing an outgoing 1:1 video call and it\'s answered by the other party -->
+    <!-- Update message shown when placing an outgoing 1:1 video call -->
     <string name="MessageRecord_outgoing_video_call">Panggilan video keluar</string>
-    <!-- Update message shown when placing an outgoing 1:1 voice/audio call and it\'s not answered by the other party -->
-    <string name="MessageRecord_unanswered_voice_call">Panggilan suara tidak terjawab</string>
-    <!-- Update message shown when placing an outgoing 1:1 video call and it\'s not answered by the other party -->
-    <string name="MessageRecord_unanswered_video_call">Panggilan video tidak terjawab</string>
-    <!-- Update message shown when receiving an incoming 1:1 voice/audio call and it\'s answered -->
+    <!-- Update message shown when receiving an incoming 1:1 voice/audio call and it\'s answered or ringing -->
     <string name="MessageRecord_incoming_voice_call">Panggilan suara masuk</string>
-    <!-- Update message shown when receiving an incoming 1:1 video call and answered -->
+    <!-- Update message shown when receiving an incoming 1:1 video call and answered or ringing -->
     <string name="MessageRecord_incoming_video_call">Panggilan video masuk</string>
     <!-- Update message shown when receiving an incoming 1:1 voice/audio call and not answered -->
     <string name="MessageRecord_missed_voice_call">Panggilan suara tidak terjawab</string>
@@ -1310,10 +1334,6 @@
     <string name="MessageRecord_missed_voice_call_notification_profile">Panggilan suara tidak terjawab saat profil notifikasi aktif</string>
     <!-- Update message shown when receiving an incoming video call and declined due to notification profile -->
     <string name="MessageRecord_missed_video_call_notification_profile">Panggilan video tidak terjawab saat profil notifikasi aktif</string>
-    <!-- Update message shown when receiving an incoming 1:1 voice/audio call and explicitly declined -->
-    <string name="MessageRecord_you_declined_a_voice_call">Anda menolak panggilan suara</string>
-    <!-- Update message shown when receiving an incoming 1:1 video call and explicitly declined -->
-    <string name="MessageRecord_you_declined_a_video_call">Anda menolak panggilan video</string>
     <!-- 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 memperbarui grup.</string>
@@ -1514,28 +1534,53 @@
     <string name="MessageRecord_can_accept_payments">%1$s sekarang dapat menerima Pembayaran</string>
 
     <!-- Group Calling update messages -->
-    <string name="MessageRecord_s_started_a_group_call_s">%1$s memulai panggilan grup. %2$s</string>
-    <string name="MessageRecord_you_started_a_group_call_s">Anda memulai panggilan grup · %1$s</string>
-    <string name="MessageRecord_s_is_in_the_group_call_s">%1$s berada di panggilan grup. %2$s</string>
-    <string name="MessageRecord_you_are_in_the_group_call_s1">Anda berada di panggilan grup. %1$s</string>
-    <string name="MessageRecord_s_and_s_are_in_the_group_call_s1">%1$s dan %2$s berada di panggilan grup. %3$s</string>
-    <string name="MessageRecord_group_call_s">Panggilan grup. %1$s</string>
-
-    <string name="MessageRecord_s_started_a_group_call">%1$s memulai panggilan grup</string>
-    <string name="MessageRecord_you_started_a_group_call">Anda memulai panggilan grup</string>
-    <string name="MessageRecord_s_is_in_the_group_call">%1$s berada di panggilan grup</string>
-    <string name="MessageRecord_you_are_in_the_group_call">Anda berada dalam panggilan grup</string>
-    <string name="MessageRecord_s_and_s_are_in_the_group_call">%1$s dan %2$s berada di panggilan grup</string>
-    <string name="MessageRecord_group_call">Panggilan grup</string>
+    <!-- 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 ada dalam panggilan · %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">Anda ada dalam panggilan · %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 dan %2$s ada dalam panggilan · %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 ada dalam panggilan</string>
+    <!-- Chat log text for an ongoing group call only the local user has joined -->
+    <string name="MessageRecord_you_are_in_the_call">Anda ada dalam panggilan</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 dan %2$s ada dalam panggilan</string>
+    <!-- Chat log text for a group call that ended within the last 5 minutes -->
+    <string name="MessageRecord__the_video_call_has_ended">Panggilan video telah berakhir</string>
+    <!-- Chat log text for a group call that ended within the last 5 minutes with a placeholder for formatted time -->
+    <string name="MessageRecord__the_video_call_has_ended_s">Panggilan video telah berakhir · %1$s</string>
+    <!-- Chat log text for a group call that ended more than 5 minutes ago and was missed -->
+    <string name="MessageRecord__missed_video_call">Panggilan video tidak terjawab</string>
+    <!-- Chat log text for a group call that ended more than 5 minutes ago and was missed with a placeholder for formatted time -->
+    <string name="MessageRecord__missed_video_call_s">Panggilan video tidak terjawab · %1$s</string>
+    <!-- Chat log text for a group call that ended that the local user did not start -->
+    <string name="MessageRecord__incoming_video_call">Panggilan video masuk</string>
+    <!-- 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">Panggilan video masuk · %1$s</string>
+    <!-- Chat log text for a group call that ended that the local user started -->
+    <string name="MessageRecord__outgoing_video_call">Panggilan video keluar</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">Panggilan video keluar · %1$s</string>
+    <!-- Chat log text for an ongoing group call that the local user started -->
+    <string name="MessageRecord__you_started_a_video_call">Anda memulai panggilan video</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">Anda memulai panggilan video · %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 memulai panggilan video</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 memulai panggilan video · %2$s</string>
 
     <string name="MessageRecord_you">Anda</string>
 
-    <plurals name="MessageRecord_s_s_and_d_others_are_in_the_group_call_s">
-        <item quantity="other">%1$s, %2$s, dan %3$d lainnya berada di panggilan grup. %4$s</item>
+    <!-- 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="other">%1$s, %2$s, dan %3$d lainnya ada dalam panggilan grup · %4$s</item>
     </plurals>
 
-    <plurals name="MessageRecord_s_s_and_d_others_are_in_the_group_call">
-        <item quantity="other">%1$s, %2$s, dan %3$d lainnya berada di panggilan grup</item>
+    <!-- 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="other">%1$s, %2$s, dan %3$d lainnya ada dalam panggilan grup</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. -->
@@ -1984,6 +2029,7 @@
     <!-- Generic error when the app is unable to request an SMS code for an unknown reason. -->
     <string name="RegistrationActivity_unable_to_request_verification_code">Tidak dapat meminta kode verifikasi. Harap periksa koneksi internet dan coba lagi.</string>
     <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">Molly Android - Format Nomor Telepon</string>
     <!--    Small "toast" notification to the user confirming that they have requested a new code via voice call.-->
@@ -2127,7 +2173,7 @@
     <string name="SubmitDebugLogActivity_this_log_will_be_posted_publicly_online_for_contributors">Catatan ini akan dipasang secara daring kepada publik untuk dilihat oleh kontributor. Anda dapat memeriksanya sebelum mengunggah.</string>
 
     <!-- SupportEmailUtil -->
-  <!-- Removed by excludeNonTranslatables <string name="SupportEmailUtil_support_email" translatable="false">support@molly.im</string> -->
+  <!-- Removed by excludeNonTranslatables <string name="SupportEmailUtil_support_email" translatable="false">support@signal.org</string> -->
     <string name="SupportEmailUtil_filter">Saring:</string>
     <string name="SupportEmailUtil_device_info">Informasi perangkat:</string>
     <string name="SupportEmailUtil_android_version">Versi Android:</string>
@@ -2622,6 +2668,8 @@
     <string name="ConversationUpdateItem_loading">Memuat</string>
     <string name="ConversationUpdateItem_learn_more">Pelajari lebih lanjut</string>
     <string name="ConversationUpdateItem_join_call">Bergabung panggilan</string>
+    <!-- Action button label for starting a new call in the current conversation -->
+    <string name="ConversationUpdateItem_call_back">Panggil ulang</string>
     <string name="ConversationUpdateItem_return_to_call">Kembali ke panggilan</string>
     <string name="ConversationUpdateItem_call_is_full">Panggilan penuh</string>
     <string name="ConversationUpdateItem_invite_friends">Undang teman</string>
@@ -2686,6 +2734,7 @@
     <string name="safety_number_change_dialog__leave_call">Tinggalkan panggilan</string>
     <string name="safety_number_change_dialog__the_following_people_may_have_reinstalled_or_changed_devices">Orang-orang berikut mungkin telah memasang ulang atau mengganti perangkat. Verifikasi nomor keamanan Anda dengan mereka untuk memastikan privasi.</string>
     <string name="safety_number_change_dialog__view">Lihat</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">Diverifikasi sebelumnya</string>
 
     <!-- EnableCallNotificationSettingsDialog__call_notifications_checklist -->
@@ -2992,6 +3041,7 @@
 
     <string name="arrays__default">Standar</string>
     <string name="arrays__high">Tinggi</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">Maks</string>
 
     <!-- plurals.xml -->
@@ -3260,7 +3310,7 @@
     <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 Molly tidak lagi tersedia. Anda dapat memindahkan dana ke sebuah exchange namun Anda tidak lagi dapat mengirim dan menerima pembayaran atau menambahkan dana.</string>
@@ -3309,6 +3359,14 @@
     <!-- Storage permission row description -->
     <string name="GrantPermissionsFragment__send_photos_videos_and_files">Kirim foto, video, dan file dari perangkat Anda.</string>
 
+    <!-- PermissionDeniedBottomSheet -->
+    <!-- Sheet describing step 1 on how to give permissions by opening settings -->
+    <string name="PermissionDeniedBottomSheet__1_tap_settings_below">1. Tap “Settings” below</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 Allow the permission</string>
+    <!-- Label for button at the bottom of the sheet which opens the system permission settings -->
+    <string name="PermissionDeniedBottomSheet__settings">Settings</string>
+
     <!-- PaymentsSecuritySetupFragment -->
     <!-- Toolbar title -->
     <string name="PaymentsSecuritySetupFragment__security_setup">Pengaturan keamanan</string>
@@ -3349,6 +3407,7 @@
     <string name="PaymentsDetailsFragment__sent_to_s">Dikrim ke %1$s</string>
     <string name="PaymentsDetailsFragment__you_on_s_at_s">Anda pada %1$s pada %2$s</string>
     <string name="PaymentsDetailsFragment__s_on_s_at_s">%1$s pada %2$s pada %3$s</string>
+    <!-- Prefix to a name to indicate who a payment was sent to -->
     <string name="PaymentsDetailsFragment__to">Kepada</string>
     <string name="PaymentsDetailsFragment__from">Dari</string>
     <string name="PaymentsDetailsFragment__information">Detail transaksi termasuk jumlah pembayaran dan waktu dari transaksi adalah bagian dari Ledger MobileCoin.</string>
@@ -3411,6 +3470,7 @@
     <string name="ConfirmPayment__confirm_payment">Konfirmasi pembayaran</string>
     <string name="ConfirmPayment__network_fee">Biaya jaringan</string>
     <string name="ConfirmPayment__estimated_s">Perkiraan %1$s</string>
+    <!-- Prefix to a name to indicate who a payment will be sent to -->
     <string name="ConfirmPayment__to">Kepada</string>
     <string name="ConfirmPayment__total_amount">Jumlah total</string>
     <string name="ConfirmPayment__balance_s">Saldo: %1$s</string>
@@ -3559,6 +3619,14 @@
     <string name="conversation_group_options__conversation">Obrolan</string>
     <string name="conversation_group_options__broadcast">Siaran</string>
 
+    <!-- DoubleTapEditEducationSheet -->
+    <!-- Displayed as the title of the education bottom sheet -->
+    <string name="DoubleTapEditEducationSheet__double_tap_edit_title">Double tap to edit</string>
+    <!-- Text on the sheet explaining how double tapping on a message will let them edit it -->
+    <string name="DoubleTapEditEducationSheet__quickly_tap_twice">Quickly tap twice on your messages to edit them. You can edit your messages up to 24hrs after they’ve been sent.</string>
+    <!-- Button label to dismiss sheet -->
+    <string name="DoubleTapEditEducationSheet__got_it">Got it</string>
+
     <!-- text_secure_normal -->
     <string name="text_secure_normal__menu_new_group">Grup baru</string>
     <string name="text_secure_normal__menu_settings">Pengaturan</string>
@@ -4006,6 +4074,7 @@
     <string name="RecipientBottomSheet_copied_to_clipboard">Disalin ke papan klip</string>
 
     <string name="GroupRecipientListItem_admin">Admin</string>
+    <!-- Button text to approve a user that has requested to join a group -->
     <string name="GroupRecipientListItem_approve_description">Terima</string>
     <string name="GroupRecipientListItem_deny_description">Tolak</string>
 
@@ -4033,6 +4102,7 @@
 
     <!-- VoiceNoteMediaDescriptionCompatFactory -->
     <string name="VoiceNoteMediaItemFactory__voice_message">Pesan suara. %1$s</string>
+    <!-- This is a title in a banner describing the conversation sender to receiver placeholders of the currently playing voice memo. -->
     <string name="VoiceNoteMediaItemFactory__s_to_s">%1$s hingga %2$s</string>
 
     <!-- StorageUtil -->
@@ -4046,8 +4116,14 @@
     <string name="ReviewCardDialogFragment__review_members">Tinjau anggota</string>
     <!-- Title of a screen where the user will be prompted to review a message request matching the name of someone they already know -->
     <string name="ReviewCardDialogFragment__review_request">Tinjau permintaan</string>
-    <string name="ReviewCardDialogFragment__d_group_members_have_the_same_name">%1$danggota grup memiliki nama yang sama, tinjau anggota-anggota di bawah dan pilih tindakan.</string>
-    <string name="ReviewCardDialogFragment__if_youre_not_sure">Jika anda tidak yakin dari mana permintaannya berasal, tinjau kontak-kontak dibawah dan ambil tindakan.</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="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 -->
+    <plurals name="ReviewCardDialogFragment__if_youre_not_sure">
+        <item quantity="other">If you\'re not sure who the request is from, review the contacts below and take action.</item>
+    </plurals>
     <string name="ReviewCardDialogFragment__no_other_groups_in_common">Tidak ada grup lain yang sama.</string>
     <string name="ReviewCardDialogFragment__no_groups_in_common">Tidak ada grup yang sama.</string>
     <plurals name="ReviewCardDialogFragment__d_other_groups_in_common">
@@ -4076,11 +4152,18 @@
     <string name="CallParticipantsListUpdatePopupWindow__s_joined">%1$s bergabung</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_and_s_joined">%1$s dan %2$s telah bergabung</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_s_and_s_joined">%1$s,%2$s, dan %3$s telah bergabung</string>
-    <string name="CallParticipantsListUpdatePopupWindow__s_s_and_d_others_joined">%1$s, %2$s, %3$d dan lainnya telah bergabung</string>
+    <!-- Toast message shown in group call when 3 or more people join -->
+    <plurals name="CallParticipantsListUpdatePopupWindow__s_s_and_d_others_joined">
+        <item quantity="other">%1$s, %2$s and %3$d others joined</item>
+    </plurals>
+    <!-- Toast/popup text shown when someone leaves a group call -->
     <string name="CallParticipantsListUpdatePopupWindow__s_left">%1$s telah keluar</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_and_s_left">%1$s dan %2$s telah keluar</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_s_and_s_left">%1$s, %2$s dan %3$s keluar</string>
-    <string name="CallParticipantsListUpdatePopupWindow__s_s_and_d_others_left">%1$s, %2$s dan %3$d lainnya keluar</string>
+    <!-- Toast message shown in group call when 3 or more people leave -->
+    <plurals name="CallParticipantsListUpdatePopupWindow__s_s_and_d_others_left">
+        <item quantity="other">%1$s, %2$s and %3$d others left</item>
+    </plurals>
 
     <string name="CallParticipant__you">Anda</string>
     <string name="CallParticipant__you_on_another_device">Anda (di perangkat lain)</string>
@@ -4448,10 +4531,14 @@
 
     <!-- PrivacySettingsFragment -->
     <string name="PrivacySettingsFragment__blocked">Diblokir</string>
-    <string name="PrivacySettingsFragment__d_contacts">%1$d kontak</string>
+    <!-- Settings label that shows the number blocked contacts -->
+    <plurals name="PrivacySettingsFragment__d_contacts">
+        <item quantity="other">%1$d contacts</item>
+    </plurals>
     <string name="PrivacySettingsFragment__messaging">Olah pesan</string>
     <string name="PrivacySettingsFragment__disappearing_messages">Penghilangan pesan</string>
     <string name="PrivacySettingsFragment__app_security">Keamanan aplikasi</string>
+    <!-- This refers to the multi-tasking overview (recent apps) from the Android operating system.-->
     <string name="PrivacySettingsFragment__block_screenshots_in_the_recents_list_and_inside_the_app">Blokir tangkapan layar di daftar terbaru dan di dalam aplikasi</string>
     <string name="PrivacySettingsFragment__signal_message_and_calls">Pesan dan panggilan Signal, selalu relay panggilan, dan menggunakan pengirim tertutup</string>
     <string name="PrivacySettingsFragment__default_timer_for_new_changes">Timer default untuk obrolan baru</string>
@@ -4508,11 +4595,14 @@
     <string name="DataAndStorageSettingsFragment__media_quality">Kualitas media</string>
     <string name="DataAndStorageSettingsFragment__sent_media_quality">Kualitas media terkirim</string>
     <string name="DataAndStorageSettingsFragment__sending_high_quality_media_will_use_more_data">Mengirimkan media dengan kualitas tinggi akan menggunakan lebih banyak data.</string>
+    <!-- Setting option that can be selected to default media to be sent as high quality by default -->
     <string name="DataAndStorageSettingsFragment__high">Tinggi</string>
+    <!-- Setting option that can be selected to default media to be sent as standard quality by default -->
     <string name="DataAndStorageSettingsFragment__standard">Standar</string>
     <string name="DataAndStorageSettingsFragment__calls">Panggilan</string>
 
     <!-- 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__use_custom_colors">Gunakan warna kustom</string>
     <string name="ChatColorSelectionFragment__chat_color">Warna obrolan</string>
@@ -4721,6 +4811,7 @@
     <string name="AvatarPickerFragment__take_a_picture">Ambil gambar</string>
     <string name="AvatarPickerFragment__choose_a_photo">Pilih sebuah foto</string>
     <string name="AvatarPickerFragment__photo">Foto</string>
+    <!-- Button label during avatar selection/creation that when tapped lets you generate an avatar from typed in text. -->
     <string name="AvatarPickerFragment__text">Teks</string>
     <string name="AvatarPickerFragment__save">Simpan</string>
     <string name="AvatarPickerFragment__clear_avatar">Hapus avatar</string>
@@ -4777,7 +4868,7 @@
     <string name="MediaReviewFragment__add_a_message">Tambah pesan</string>
     <string name="MediaReviewFragment__add_a_reply">Tambah balasan</string>
     <string name="MediaReviewFragment__send_to">Kirim ke</string>
-    <string name="MediaReviewFragment__view_once_message">Pesan satu tayangan</string>
+    <string name="MediaReviewFragment__view_once_message">Media sekali lihat</string>
     <string name="MediaReviewFragment__one_or_more_items_were_too_large">Ukuran satu atau beberapa media terlalu besar</string>
     <string name="MediaReviewFragment__one_or_more_items_were_invalid">Satu atau beberapa media salah</string>
     <string name="MediaReviewFragment__too_many_items_selected">Terlalu banyak media dipilih</string>
@@ -5365,7 +5456,7 @@
     <string name="StoryViewerFragment__s_s">%1$s %2$s</string>
     <!-- Displayed when viewing a post you sent -->
     <string name="StoryViewerPageFragment__you">Anda</string>
-    <!-- Displayed when viewing a post displayed to a group -->
+    <!-- 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 hingga %2$s</string>
     <!-- Displayed when viewing a post from another user with no replies -->
     <string name="StoryViewerPageFragment__reply">Balas</string>
@@ -6558,5 +6649,26 @@
     <!-- Content description for opening the note editor -->
     <string name="ViewNoteSheet__edit_note">Edit catatan</string>
 
+    <!-- BackupProgressService -->
+    <!-- Notification title shown while backup restore job is running -->
+    <string name="BackupProgressService_title">Memulihkan cadangan …</string>
+    <!-- Notification title shown while downloading backup restore data -->
+    <string name="BackupProgressService_title_downloading">Mengunduh data cadangan …</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>
+    <!-- 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 -->
+    <string name="BackupsTypeSettingsFragment__google_pay">Google Pay</string>
+    <!-- Displayed as the user\'s payment method as a label in a preference row -->
+    <string name="BackupsTypeSettingsFragment__bank_transfer">Bank transfer</string>
+    <!-- Displayed as the user\'s payment method as a label in a preference row -->
+    <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>
+
+
     <!-- 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 a0c5aab98a..91a33a1f77 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -1,6 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- smartling.instruction_comments_enabled = on -->
-<resources>
+<?xml version="1.0" encoding="UTF-8"?><!-- 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> -->
@@ -89,6 +87,16 @@
     <string name="AttachmentManager_signal_requires_the_external_storage_permission_in_order_to_attach_photos_videos_or_audio">Molly richiede l\'autorizzazione all\'accesso della memoria per allegare foto, video o audio, ma questa è stata negata in modo permanente. Si prega di aprire il menu delle impostazioni dell\'app, selezionare \"Autorizzazioni\" e abilitare \"Archiviazione\".</string>
     <string name="AttachmentManager_signal_requires_contacts_permission_in_order_to_attach_contact_information">Molly richiede l\'autorizzazione alla lettura dei contatti per allegare le informazioni di contatto, 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="AttachmentManager_signal_requires_location_information_in_order_to_attach_a_location">Molly richiede l\'autorizzazione alla geolocalizzazione per allegare una posizione, ma questa è stata negata in modo permanente. Si prega di aprire il menu delle impostazioni dell\'app, selezionare \"Autorizzazioni\" e abilitare \"Posizione\".</string>
+
+    <!-- Dialog title asking users for location permission -->
+    <string name="AttachmentManager_signal_allow_access_location">Allow access to your location</string>
+    <!-- Dialog description that will explain the steps needed to give location permission -->
+    <string name="AttachmentManager_signal_to_send_location">To send your location:</string>
+    <!-- Alert dialog description asking for location permission -->
+    <string name="AttachmentManager_signal_allow_signal_access_location">Allow Molly access to send your location.</string>
+    <!-- Toast text explaining Signal\'s need for location access -->
+    <string name="AttachmentManager_signal_needs_location_access">Molly needs location access to send your location.</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>
     <!-- Alert dialog description to send the recipient a request to activate payments -->
@@ -241,7 +249,7 @@
     <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>
@@ -386,8 +394,16 @@
     <string name="ConversationActivity_your_request_to_join_has_been_sent_to_the_group_admin">La tua richiesta di unirti è stata inviata agli amministratori del gruppo. Riceverai una notifica quando interverranno.</string>
     <string name="ConversationActivity_cancel_request">Annulla richiesta</string>
 
-    <string name="ConversationActivity_to_send_audio_messages_allow_signal_access_to_your_microphone">Per poter mandare un messaggio audio, permetti a Molly di accedere al tuo microfono.</string>
+    <!-- Dialog title asking users for microphone permission -->
+    <string name="ConversationActivity_allow_access_microphone">Allow access to your microphone</string>
+    <!-- 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>
+    <!-- Toast text explaining Signal\'s need for microphone access -->
+    <string name="ConversationActivity_signal_needs_microphone_access_voice_message">Molly needs microphone access to record a voice message.</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">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>
@@ -411,10 +427,17 @@
     <string name="ConversationActivity_you_will_leave_this_group_and_it_will_be_deleted_from_all_of_your_devices">Quando abbandonerai il gruppo, verrà eliminato da tutti i tuoi dispositivi.</string>
     <string name="ConversationActivity_delete">Elimina</string>
     <string name="ConversationActivity_delete_and_leave">Elimina e abbandona</string>
-    <string name="ConversationActivity__to_call_s_signal_needs_access_to_your_microphone">Per chiamare %1$s, Molly necessita dell\'accesso al tuo microfono</string>
+
+    <!-- Dialog description that will explain the steps needed to give microphone permissions for a voice call -->
+    <string name="ConversationActivity__to_start_call">To start a 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">To start a call, allow Molly access to your microphone.</string>
+    <!-- Toast text explaining Signal\'s need for microphone access for a voice call -->
+    <string name="ConversationActivity_signal_needs_microphone_access_voice_call">Molly needs microphone access to start a call.</string>
 
 
     <string name="ConversationActivity_join">Unisciti</string>
+    <!-- Button text for an active group call but the call is currently full and unjoinable -->
     <string name="ConversationActivity_full">Piena</string>
 
     <string name="ConversationActivity_error_sending_media">Errore durante l\'invio del media</string>
@@ -613,6 +636,7 @@
     <string name="ConversationListFragment_unarchive">Non archiviare</string>
     <string name="ConversationListFragment_delete">Elimina</string>
     <string name="ConversationListFragment_select_all">Scegli tutto</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 selezionata</item>
         <item quantity="other">%1$d selezionate</item>
@@ -864,6 +888,7 @@
         <item quantity="one">Invito mandato</item>
         <item quantity="other">%1$d inviti mandati</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">“%1$s” non può essere aggiunto automaticamente a questo gruppo da te.\n\nÈ stato invitato a unirsi al gruppo e non vedrà alcun messaggio del gruppo fino a quando non accetterà.</string>
     <string name="GroupManagement_invite_multiple_users">Questi utenti non possono essere aggiunti automaticamente a questo gruppo da te.\n\nSono stati invitati a unirsi al gruppo e non vedranno alcun messaggio del gruppo fino a quando non accetteranno.</string>
 
@@ -1044,7 +1069,9 @@
 
     <string name="ManageGroupActivity_edit_name_and_picture">Modifica nome e immagine</string>
     <string name="ManageGroupActivity_legacy_group">Gruppi Legacy</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">Questo è un Gruppo Legacy. Funzionalità come gli amministratori di gruppo sono disponibili solo per i Nuovi Gruppi.</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">Questo è un Gruppo Legacy. Per accedere a nuove funzionalità come @menzioni e amministratori,</string>
     <string name="ManageGroupActivity_legacy_group_too_large">Questo Gruppo Legacy non può essere aggiornato a un Nuovo Gruppo perché è troppo grande. La dimensione massima del gruppo è %1$d.</string>
     <string name="ManageGroupActivity_upgrade_this_group">aggiorna questo gruppo.</string>
@@ -1271,6 +1298,7 @@
         <item quantity="other">Elimina</item>
     </plurals>
 
+    <!-- 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 selezionato (%2$s)</item>
         <item quantity="other">%1$d selezionati (%2$s)</item>
@@ -1335,17 +1363,13 @@
     <string name="MessageRecord_left_group">Hai lasciato il gruppo.</string>
     <string name="MessageRecord_you_updated_group">Hai aggiornato il gruppo.</string>
     <string name="MessageRecord_the_group_was_updated">Il gruppo è stato aggiornato.</string>
-    <!-- Update message shown when placing an outgoing 1:1 voice/audio call and it\'s answered by the other party -->
+    <!-- Update message shown when placing an outgoing 1:1 voice/audio call -->
     <string name="MessageRecord_outgoing_voice_call">Chiamata in uscita</string>
-    <!-- Update message shown when placing an outgoing 1:1 video call and it\'s answered by the other party -->
+    <!-- Update message shown when placing an outgoing 1:1 video call -->
     <string name="MessageRecord_outgoing_video_call">Videochiamata in uscita</string>
-    <!-- Update message shown when placing an outgoing 1:1 voice/audio call and it\'s not answered by the other party -->
-    <string name="MessageRecord_unanswered_voice_call">Chiamata senza risposta</string>
-    <!-- Update message shown when placing an outgoing 1:1 video call and it\'s not answered by the other party -->
-    <string name="MessageRecord_unanswered_video_call">Videochiamata senza risposta</string>
-    <!-- Update message shown when receiving an incoming 1:1 voice/audio call and it\'s answered -->
+    <!-- Update message shown when receiving an incoming 1:1 voice/audio call and it\'s answered or ringing -->
     <string name="MessageRecord_incoming_voice_call">Chiamata in arrivo</string>
-    <!-- Update message shown when receiving an incoming 1:1 video call and answered -->
+    <!-- Update message shown when receiving an incoming 1:1 video call and answered or ringing -->
     <string name="MessageRecord_incoming_video_call">Videochiamata in arrivo</string>
     <!-- Update message shown when receiving an incoming 1:1 voice/audio call and not answered -->
     <string name="MessageRecord_missed_voice_call">Chiamata persa</string>
@@ -1355,10 +1379,6 @@
     <string name="MessageRecord_missed_voice_call_notification_profile">Chiamata vocale persa per lo stato del profilo</string>
     <!-- Update message shown when receiving an incoming video call and declined due to notification profile -->
     <string name="MessageRecord_missed_video_call_notification_profile">Videochiamata persa per lo stato del profilo</string>
-    <!-- Update message shown when receiving an incoming 1:1 voice/audio call and explicitly declined -->
-    <string name="MessageRecord_you_declined_a_voice_call">Hai rifiutato una chiamata</string>
-    <!-- Update message shown when receiving an incoming 1:1 video call and explicitly declined -->
-    <string name="MessageRecord_you_declined_a_video_call">Hai rifiutato una videochiamata</string>
     <!-- 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 ha aggiornato il gruppo.</string>
@@ -1567,28 +1587,53 @@
     <string name="MessageRecord_can_accept_payments">Ora %1$s può accettare e ricevere i pagamenti</string>
 
     <!-- Group Calling update messages -->
-    <string name="MessageRecord_s_started_a_group_call_s">%1$s ha iniziato una chiamata di gruppo · %2$s</string>
-    <string name="MessageRecord_you_started_a_group_call_s">Hai iniziato una chiamata di gruppo · %1$s</string>
-    <string name="MessageRecord_s_is_in_the_group_call_s">%1$s è nella chiamata di gruppo · %2$s</string>
-    <string name="MessageRecord_you_are_in_the_group_call_s1">Sei nella chiamata di gruppo · %1$s</string>
-    <string name="MessageRecord_s_and_s_are_in_the_group_call_s1">%1$s e %2$s sono nella chiamata di gruppo · %3$s</string>
-    <string name="MessageRecord_group_call_s">Chiamata di gruppo · %1$s</string>
-
-    <string name="MessageRecord_s_started_a_group_call">%1$s ha iniziato una chiamata di gruppo</string>
-    <string name="MessageRecord_you_started_a_group_call">Hai iniziato una chiamata di gruppo</string>
-    <string name="MessageRecord_s_is_in_the_group_call">%1$s è nella chiamata di gruppo</string>
-    <string name="MessageRecord_you_are_in_the_group_call">Sei nella chiamata di gruppo</string>
-    <string name="MessageRecord_s_and_s_are_in_the_group_call">%1$s e %2$s sono nella chiamata di gruppo</string>
-    <string name="MessageRecord_group_call">Chiamata di gruppo</string>
+    <!-- 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 è in chiamata · %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">Sei in chiamata · %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 e %2$s sono in chiamata · %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 è in chiamata</string>
+    <!-- Chat log text for an ongoing group call only the local user has joined -->
+    <string name="MessageRecord_you_are_in_the_call">Sei in chiamata</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 e %2$s sono in chiamata</string>
+    <!-- Chat log text for a group call that ended within the last 5 minutes -->
+    <string name="MessageRecord__the_video_call_has_ended">Videochiamata terminata</string>
+    <!-- Chat log text for a group call that ended within the last 5 minutes with a placeholder for formatted time -->
+    <string name="MessageRecord__the_video_call_has_ended_s">Videochiamata terminata · %1$s</string>
+    <!-- Chat log text for a group call that ended more than 5 minutes ago and was missed -->
+    <string name="MessageRecord__missed_video_call">Videochiamata persa</string>
+    <!-- Chat log text for a group call that ended more than 5 minutes ago and was missed with a placeholder for formatted time -->
+    <string name="MessageRecord__missed_video_call_s">Videochiamata persa · %1$s</string>
+    <!-- Chat log text for a group call that ended that the local user did not start -->
+    <string name="MessageRecord__incoming_video_call">Videochiamata in arrivo</string>
+    <!-- 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">Videochiamata in entrata · %1$s</string>
+    <!-- Chat log text for a group call that ended that the local user started -->
+    <string name="MessageRecord__outgoing_video_call">Videochiamata in uscita</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">Videochiamata in uscita · %1$s</string>
+    <!-- Chat log text for an ongoing group call that the local user started -->
+    <string name="MessageRecord__you_started_a_video_call">Hai iniziato una videochiamata</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">Hai iniziato una videochiamata · %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 ha iniziato una videochiamata</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 ha iniziato una videochiamata · %2$s</string>
 
     <string name="MessageRecord_you">Tu</string>
 
-    <plurals name="MessageRecord_s_s_and_d_others_are_in_the_group_call_s">
+    <!-- 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 e %3$d altra persona sono nella chiamata di gruppo · %4$s</item>
         <item quantity="other">%1$s, %2$s e %3$d altre persone sono nella chiamata di gruppo · %4$s</item>
     </plurals>
 
-    <plurals name="MessageRecord_s_s_and_d_others_are_in_the_group_call">
+    <!-- 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 e %3$d altra persona sono nella chiamata di gruppo</item>
         <item quantity="other">%1$s, %2$s e %3$d altre persone sono nella chiamata di gruppo</item>
     </plurals>
@@ -2063,6 +2108,7 @@
     <!-- Generic error when the app is unable to request an SMS code for an unknown reason. -->
     <string name="RegistrationActivity_unable_to_request_verification_code">Impossibile richiedere un codice di verifica. Controlla la tua connessione di rete e riprova.</string>
     <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">Molly Android - Formato Numero di Telefono</string>
     <!--    Small "toast" notification to the user confirming that they have requested a new code via voice call.-->
@@ -2207,7 +2253,7 @@
     <string name="SubmitDebugLogActivity_this_log_will_be_posted_publicly_online_for_contributors">Questo log verrà postato pubblicamente online per essere visualizzato dai contributori. Puoi esaminarlo prima di caricarlo.</string>
 
     <!-- SupportEmailUtil -->
-  <!-- Removed by excludeNonTranslatables <string name="SupportEmailUtil_support_email" translatable="false">support@molly.im</string> -->
+  <!-- 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">Informazioni sul dispositivo:</string>
     <string name="SupportEmailUtil_android_version">Versione di Android:</string>
@@ -2709,6 +2755,8 @@
     <string name="ConversationUpdateItem_loading">Caricamento</string>
     <string name="ConversationUpdateItem_learn_more">Scopri di più</string>
     <string name="ConversationUpdateItem_join_call">Unisciti alla chiamata</string>
+    <!-- Action button label for starting a new call in the current conversation -->
+    <string name="ConversationUpdateItem_call_back">Richiama</string>
     <string name="ConversationUpdateItem_return_to_call">Torna alla chiamata</string>
     <string name="ConversationUpdateItem_call_is_full">La chiamata è piena</string>
     <string name="ConversationUpdateItem_invite_friends">Invita amici</string>
@@ -2773,6 +2821,7 @@
     <string name="safety_number_change_dialog__leave_call">Abbandona chiamata</string>
     <string name="safety_number_change_dialog__the_following_people_may_have_reinstalled_or_changed_devices">Le seguenti persone potrebbero aver reinstallato o cambiato i dispositivi. Verifica il tuo codice di sicurezza con loro per garantire la privacy.</string>
     <string name="safety_number_change_dialog__view">Mostra</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">Verificato in precedenza</string>
 
     <!-- EnableCallNotificationSettingsDialog__call_notifications_checklist -->
@@ -3086,6 +3135,7 @@
 
     <string name="arrays__default">Predefinito</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">Massima</string>
 
     <!-- plurals.xml -->
@@ -3357,7 +3407,7 @@
     <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 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>
@@ -3406,6 +3456,14 @@
     <!-- Storage permission row description -->
     <string name="GrantPermissionsFragment__send_photos_videos_and_files">Invia foto, video e file dal tuo dispositivo.</string>
 
+    <!-- PermissionDeniedBottomSheet -->
+    <!-- Sheet describing step 1 on how to give permissions by opening settings -->
+    <string name="PermissionDeniedBottomSheet__1_tap_settings_below">1. Tap “Settings” below</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 Allow the permission</string>
+    <!-- Label for button at the bottom of the sheet which opens the system permission settings -->
+    <string name="PermissionDeniedBottomSheet__settings">Settings</string>
+
     <!-- PaymentsSecuritySetupFragment -->
     <!-- Toolbar title -->
     <string name="PaymentsSecuritySetupFragment__security_setup">Impostazioni di sicurezza</string>
@@ -3446,6 +3504,7 @@
     <string name="PaymentsDetailsFragment__sent_to_s">Inviato a %1$s</string>
     <string name="PaymentsDetailsFragment__you_on_s_at_s">You il %1$s alle %2$s</string>
     <string name="PaymentsDetailsFragment__s_on_s_at_s">%1$s il %2$s alle %3$s</string>
+    <!-- Prefix to a name to indicate who a payment was sent to -->
     <string name="PaymentsDetailsFragment__to">A</string>
     <string name="PaymentsDetailsFragment__from">Da</string>
     <string name="PaymentsDetailsFragment__information">I dettagli della transazione, compreso l\'importo del pagamento e l\'ora della transazione, fanno parte del MobileCoin Ledger.</string>
@@ -3508,6 +3567,7 @@
     <string name="ConfirmPayment__confirm_payment">Conferma pagamento</string>
     <string name="ConfirmPayment__network_fee">Commissione rete</string>
     <string name="ConfirmPayment__estimated_s">Stimati %1$s</string>
+    <!-- Prefix to a name to indicate who a payment will be sent to -->
     <string name="ConfirmPayment__to">A</string>
     <string name="ConfirmPayment__total_amount">Importo totale</string>
     <string name="ConfirmPayment__balance_s">Saldo: %1$s</string>
@@ -3658,6 +3718,14 @@
     <string name="conversation_group_options__conversation">Chat</string>
     <string name="conversation_group_options__broadcast">Broadcast</string>
 
+    <!-- DoubleTapEditEducationSheet -->
+    <!-- Displayed as the title of the education bottom sheet -->
+    <string name="DoubleTapEditEducationSheet__double_tap_edit_title">Double tap to edit</string>
+    <!-- Text on the sheet explaining how double tapping on a message will let them edit it -->
+    <string name="DoubleTapEditEducationSheet__quickly_tap_twice">Quickly tap twice on your messages to edit them. You can edit your messages up to 24hrs after they’ve been sent.</string>
+    <!-- Button label to dismiss sheet -->
+    <string name="DoubleTapEditEducationSheet__got_it">Got it</string>
+
     <!-- text_secure_normal -->
     <string name="text_secure_normal__menu_new_group">Nuovo gruppo</string>
     <string name="text_secure_normal__menu_settings">Impostazioni</string>
@@ -4112,6 +4180,7 @@
     <string name="RecipientBottomSheet_copied_to_clipboard">Copiato negli appunti</string>
 
     <string name="GroupRecipientListItem_admin">Amministratore</string>
+    <!-- Button text to approve a user that has requested to join a group -->
     <string name="GroupRecipientListItem_approve_description">Approva</string>
     <string name="GroupRecipientListItem_deny_description">Rifiuta</string>
 
@@ -4139,6 +4208,7 @@
 
     <!-- VoiceNoteMediaDescriptionCompatFactory -->
     <string name="VoiceNoteMediaItemFactory__voice_message">Messaggio vocale · %1$s</string>
+    <!-- This is a title in a banner describing the conversation sender to receiver placeholders of the currently playing voice memo. -->
     <string name="VoiceNoteMediaItemFactory__s_to_s">%1$s a %2$s</string>
 
     <!-- StorageUtil -->
@@ -4152,8 +4222,16 @@
     <string name="ReviewCardDialogFragment__review_members">Controlla membri</string>
     <!-- Title of a screen where the user will be prompted to review a message request matching the name of someone they already know -->
     <string name="ReviewCardDialogFragment__review_request">Controlla richieste</string>
-    <string name="ReviewCardDialogFragment__d_group_members_have_the_same_name">%1$d membri del gruppo hanno lo stesso nome, controlla i membri di seguito e scegli di agire.</string>
-    <string name="ReviewCardDialogFragment__if_youre_not_sure">Se non sei sicuro della provenienza della richiesta, controlla i contatti di seguito e agisci.</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="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 -->
+    <plurals name="ReviewCardDialogFragment__if_youre_not_sure">
+        <item quantity="one">If you\'re not sure who the request is from, review the contact below and take action.</item>
+        <item quantity="other">If you\'re not sure who the request is from, review the contacts below and take action.</item>
+    </plurals>
     <string name="ReviewCardDialogFragment__no_other_groups_in_common">Nessun altro gruppo in comune.</string>
     <string name="ReviewCardDialogFragment__no_groups_in_common">Nessun gruppo in comune.</string>
     <plurals name="ReviewCardDialogFragment__d_other_groups_in_common">
@@ -4184,11 +4262,20 @@
     <string name="CallParticipantsListUpdatePopupWindow__s_joined">%1$s si è unito</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_and_s_joined">%1$s e %2$s si sono uniti</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_s_and_s_joined">%1$s, %2$s e %3$s si sono uniti</string>
-    <string name="CallParticipantsListUpdatePopupWindow__s_s_and_d_others_joined">%1$s, %2$s e altri %3$d si sono uniti</string>
+    <!-- Toast message shown in group call when 3 or more people join -->
+    <plurals name="CallParticipantsListUpdatePopupWindow__s_s_and_d_others_joined">
+        <item quantity="one">%1$s, %2$s and %3$d other joined</item>
+        <item quantity="other">%1$s, %2$s and %3$d others joined</item>
+    </plurals>
+    <!-- Toast/popup text shown when someone leaves a group call -->
     <string name="CallParticipantsListUpdatePopupWindow__s_left">%1$s ha abbandonato</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_and_s_left">%1$s e %2$s hanno abbandonato</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_s_and_s_left">%1$s, %2$s e %3$s hanno abbandonato</string>
-    <string name="CallParticipantsListUpdatePopupWindow__s_s_and_d_others_left">%1$s, %2$s e altri %3$d hanno abbandonato</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 and %3$d other left</item>
+        <item quantity="other">%1$s, %2$s and %3$d others left</item>
+    </plurals>
 
     <string name="CallParticipant__you">Tu</string>
     <string name="CallParticipant__you_on_another_device">Tu (su un altro dispositivo)</string>
@@ -4558,10 +4645,15 @@
 
     <!-- PrivacySettingsFragment -->
     <string name="PrivacySettingsFragment__blocked">Bloccati</string>
-    <string name="PrivacySettingsFragment__d_contacts">%1$d contatti</string>
+    <!-- Settings label that shows the number blocked contacts -->
+    <plurals name="PrivacySettingsFragment__d_contacts">
+        <item quantity="one">%1$d contact</item>
+        <item quantity="other">%1$d contacts</item>
+    </plurals>
     <string name="PrivacySettingsFragment__messaging">Messaggistica</string>
     <string name="PrivacySettingsFragment__disappearing_messages">Messaggi a scomparsa</string>
     <string name="PrivacySettingsFragment__app_security">Sicurezza app</string>
+    <!-- This refers to the multi-tasking overview (recent apps) from the Android operating system.-->
     <string name="PrivacySettingsFragment__block_screenshots_in_the_recents_list_and_inside_the_app">Blocca gli screenshot nell\'elenco delle chat recenti e all\'interno dell\'app</string>
     <string name="PrivacySettingsFragment__signal_message_and_calls">Messaggi e chiamate Signal, ritrasmetti sempre le chiamate e mittente sigillato</string>
     <string name="PrivacySettingsFragment__default_timer_for_new_changes">Timer predefinito per nuove chat</string>
@@ -4618,11 +4710,14 @@
     <string name="DataAndStorageSettingsFragment__media_quality">Qualità media</string>
     <string name="DataAndStorageSettingsFragment__sent_media_quality">Qualità media inviati</string>
     <string name="DataAndStorageSettingsFragment__sending_high_quality_media_will_use_more_data">L\'invio di media in alta qualità utilizzerà più dati.</string>
+    <!-- Setting option that can be selected to default media to be sent as high quality by default -->
     <string name="DataAndStorageSettingsFragment__high">Alta</string>
+    <!-- Setting option that can be selected to default media to be sent as standard quality by default -->
     <string name="DataAndStorageSettingsFragment__standard">Normale</string>
     <string name="DataAndStorageSettingsFragment__calls">Chiamate</string>
 
     <!-- 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__use_custom_colors">Usa colori personalizzati</string>
     <string name="ChatColorSelectionFragment__chat_color">Colore chat</string>
@@ -4834,6 +4929,7 @@
     <string name="AvatarPickerFragment__take_a_picture">Scatta una foto</string>
     <string name="AvatarPickerFragment__choose_a_photo">Scegli una foto</string>
     <string name="AvatarPickerFragment__photo">Foto</string>
+    <!-- Button label during avatar selection/creation that when tapped lets you generate an avatar from typed in text. -->
     <string name="AvatarPickerFragment__text">Testo</string>
     <string name="AvatarPickerFragment__save">Salva</string>
     <string name="AvatarPickerFragment__clear_avatar">Rimuovi avatar</string>
@@ -4894,7 +4990,7 @@
     <string name="MediaReviewFragment__add_a_message">Aggiungi un messaggio</string>
     <string name="MediaReviewFragment__add_a_reply">Aggiungi una risposta</string>
     <string name="MediaReviewFragment__send_to">Invia a</string>
-    <string name="MediaReviewFragment__view_once_message">Messaggio visualizzabile una volta</string>
+    <string name="MediaReviewFragment__view_once_message">Media visibile una sola volta</string>
     <string name="MediaReviewFragment__one_or_more_items_were_too_large">Uno o più elementi erano troppo grandi</string>
     <string name="MediaReviewFragment__one_or_more_items_were_invalid">Uno o più elementi non erano validi</string>
     <string name="MediaReviewFragment__too_many_items_selected">Troppi elementi selezionati</string>
@@ -5487,7 +5583,7 @@
     <string name="StoryViewerFragment__s_s">%1$s %2$s</string>
     <!-- Displayed when viewing a post you sent -->
     <string name="StoryViewerPageFragment__you">Tu</string>
-    <!-- Displayed when viewing a post displayed to a group -->
+    <!-- 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 -->
     <string name="StoryViewerPageFragment__reply">Rispondi</string>
@@ -6704,5 +6800,26 @@
     <!-- Content description for opening the note editor -->
     <string name="ViewNoteSheet__edit_note">Modifica appunti</string>
 
+    <!-- BackupProgressService -->
+    <!-- Notification title shown while backup restore job is running -->
+    <string name="BackupProgressService_title">Ripristino backup in corso…</string>
+    <!-- Notification title shown while downloading backup restore data -->
+    <string name="BackupProgressService_title_downloading">Download dati di backup…</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>
+    <!-- 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 -->
+    <string name="BackupsTypeSettingsFragment__google_pay">Google Pay</string>
+    <!-- Displayed as the user\'s payment method as a label in a preference row -->
+    <string name="BackupsTypeSettingsFragment__bank_transfer">Bank transfer</string>
+    <!-- Displayed as the user\'s payment method as a label in a preference row -->
+    <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>
+
+
     <!-- 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 9fc336b2a0..d97d05911e 100644
--- a/app/src/main/res/values-iw/strings.xml
+++ b/app/src/main/res/values-iw/strings.xml
@@ -1,6 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- smartling.instruction_comments_enabled = on -->
-<resources>
+<?xml version="1.0" encoding="UTF-8"?><!-- 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> -->
@@ -89,6 +87,16 @@
     <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">Allow access to your location</string>
+    <!-- Dialog description that will explain the steps needed to give location permission -->
+    <string name="AttachmentManager_signal_to_send_location">To send your location:</string>
+    <!-- Alert dialog description asking for location permission -->
+    <string name="AttachmentManager_signal_allow_signal_access_location">Allow Molly access to send your location.</string>
+    <!-- Toast text explaining Signal\'s need for location access -->
+    <string name="AttachmentManager_signal_needs_location_access">Molly needs location access to send your location.</string>
+
     <!-- Alert dialog title to show the recipient has not activated payments -->
     <string name="AttachmentManager__not_activated_payments">%1$s לא הפעיל/ה תשלומים </string>
     <!-- Alert dialog description to send the recipient a request to activate payments -->
@@ -243,7 +251,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>
@@ -392,8 +400,16 @@
     <string name="ConversationActivity_your_request_to_join_has_been_sent_to_the_group_admin">בקשתך להצטרף נשלחה אל מנהלן הקבוצה. תיודע כאשר הוא מחליט.</string>
     <string name="ConversationActivity_cancel_request">בטל בקשה</string>
 
-    <string name="ConversationActivity_to_send_audio_messages_allow_signal_access_to_your_microphone">כדי לשלוח הודעות שמע, התר אל Molly לקבל גישה אל המיקרופון שלך.</string>
+    <!-- Dialog title asking users for microphone permission -->
+    <string name="ConversationActivity_allow_access_microphone">Allow access to your microphone</string>
+    <!-- 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>
+    <!-- Toast text explaining Signal\'s need for microphone access -->
+    <string name="ConversationActivity_signal_needs_microphone_access_voice_message">Molly needs microphone access to record a voice message.</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">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>
@@ -417,10 +433,17 @@
     <string name="ConversationActivity_you_will_leave_this_group_and_it_will_be_deleted_from_all_of_your_devices">אתם תעזבו קבוצה זו, והיא תימחק מכל המכשירים שלכם.</string>
     <string name="ConversationActivity_delete">מחיקה</string>
     <string name="ConversationActivity_delete_and_leave">מחיקה ועזיבה</string>
-    <string name="ConversationActivity__to_call_s_signal_needs_access_to_your_microphone">כדי להתקשר אל %1$s, היישום Molly צריך גישה אל המיקרופון שלך</string>
+
+    <!-- Dialog description that will explain the steps needed to give microphone permissions for a voice call -->
+    <string name="ConversationActivity__to_start_call">To start a 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">To start a call, allow Molly access to your microphone.</string>
+    <!-- Toast text explaining Signal\'s need for microphone access for a voice call -->
+    <string name="ConversationActivity_signal_needs_microphone_access_voice_call">Molly needs microphone access to start a call.</string>
 
 
     <string name="ConversationActivity_join">הצטרף</string>
+    <!-- Button text for an active group call but the call is currently full and unjoinable -->
     <string name="ConversationActivity_full">מלאה</string>
 
     <string name="ConversationActivity_error_sending_media">שגיאה בשליחת מדיה</string>
@@ -645,6 +668,7 @@
     <string name="ConversationListFragment_unarchive">הוצאה מארכיון</string>
     <string name="ConversationListFragment_delete">מחיקה</string>
     <string name="ConversationListFragment_select_all">בחירת הכל</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 נבחר</item>
         <item quantity="two">%1$d נבחרו</item>
@@ -902,6 +926,7 @@
         <item quantity="many">%1$d הזמנות נשלחו</item>
         <item quantity="other">%1$d הזמנות נשלחו</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">“%1$s” לא יכול/ה להתווסף באופן אוטומטי אל קבוצה זו על ידך.\n\nהוא/יא הוזמן/ה להצטרף, ולא יראה/תראה הודעות קבוצה כלשהן עד שהוא/היא יאשר/תאשר.</string>
     <string name="GroupManagement_invite_multiple_users">משתמשים אלו אינם יכולים להתווסף באופן אוטומטי אל קבוצה זו על ידך.\n\nהם הוזמנו להצטרף אל הקבוצה, ולא יראו הודעות קבוצה כלשהן עד שהם יאשרו.</string>
 
@@ -1114,7 +1139,9 @@
 
     <string name="ManageGroupActivity_edit_name_and_picture">ערוך שם ותמונה</string>
     <string name="ManageGroupActivity_legacy_group">קבוצה מיושנת</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">זוהי קבוצה מיושנת. מאפיינים כמו מנהלני קבוצה זמינים רק בקבוצות חדשות.</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">זוהי קבוצה מיושנת. כדי להשיג גישה אל מאפיינים חדשים כמו @אזכורים ומנהלנים,</string>
     <string name="ManageGroupActivity_legacy_group_too_large">קבוצה מיושנת זו אינה יכולה להשתדרג אל קבוצה חדשה מאחר שהיא גדולה מדי. גודל הקבוצה המרבי הוא %1$d.</string>
     <string name="ManageGroupActivity_upgrade_this_group">שדרג קבוצה זו.</string>
@@ -1359,6 +1386,7 @@
         <item quantity="other">מחיקה</item>
     </plurals>
 
+    <!-- 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 נבחר (%2$s)</item>
         <item quantity="two">%1$d נבחרו (%2$s)</item>
@@ -1425,17 +1453,13 @@
     <string name="MessageRecord_left_group">עזבת את הקבוצה.</string>
     <string name="MessageRecord_you_updated_group">עדכנת את הקבוצה.</string>
     <string name="MessageRecord_the_group_was_updated">הקבוצה עודכנה.</string>
-    <!-- Update message shown when placing an outgoing 1:1 voice/audio call and it\'s answered by the other party -->
+    <!-- Update message shown when placing an outgoing 1:1 voice/audio call -->
     <string name="MessageRecord_outgoing_voice_call">שיחה קולית יוצאת</string>
-    <!-- Update message shown when placing an outgoing 1:1 video call and it\'s answered by the other party -->
+    <!-- Update message shown when placing an outgoing 1:1 video call -->
     <string name="MessageRecord_outgoing_video_call">שיחת וידאו יוצאת</string>
-    <!-- Update message shown when placing an outgoing 1:1 voice/audio call and it\'s not answered by the other party -->
-    <string name="MessageRecord_unanswered_voice_call">שיחה קולית שלא נענתה</string>
-    <!-- Update message shown when placing an outgoing 1:1 video call and it\'s not answered by the other party -->
-    <string name="MessageRecord_unanswered_video_call">שיחת וידאו שלא נענתה</string>
-    <!-- Update message shown when receiving an incoming 1:1 voice/audio call and it\'s answered -->
+    <!-- Update message shown when receiving an incoming 1:1 voice/audio call and it\'s answered or ringing -->
     <string name="MessageRecord_incoming_voice_call">שיחה קולית נכנסת</string>
-    <!-- Update message shown when receiving an incoming 1:1 video call and answered -->
+    <!-- Update message shown when receiving an incoming 1:1 video call and answered or ringing -->
     <string name="MessageRecord_incoming_video_call">שיחת וידאו נכנסת</string>
     <!-- Update message shown when receiving an incoming 1:1 voice/audio call and not answered -->
     <string name="MessageRecord_missed_voice_call">שיחה קולית שלא נענתה</string>
@@ -1445,10 +1469,6 @@
     <string name="MessageRecord_missed_voice_call_notification_profile">שיחה קולית שלא נענתה בזמן שפרופיל ההתראות פועל</string>
     <!-- Update message shown when receiving an incoming video call and declined due to notification profile -->
     <string name="MessageRecord_missed_video_call_notification_profile">שיחת וידאו שלא נענתה בזמן שפרופיל ההתראות פועל</string>
-    <!-- Update message shown when receiving an incoming 1:1 voice/audio call and explicitly declined -->
-    <string name="MessageRecord_you_declined_a_voice_call">דחית שיחה קולית</string>
-    <!-- Update message shown when receiving an incoming 1:1 video call and explicitly declined -->
-    <string name="MessageRecord_you_declined_a_video_call">דחית שיחת וידאו</string>
     <!-- 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>
@@ -1673,30 +1693,55 @@
     <string name="MessageRecord_can_accept_payments">ל%1$s יש אפשרות לקבל תשלומים עכשיו</string>
 
     <!-- Group Calling update messages -->
-    <string name="MessageRecord_s_started_a_group_call_s">%1$s התחיל/ה שיחה קבוצתית · %2$s</string>
-    <string name="MessageRecord_you_started_a_group_call_s">התחלת שיחה קבוצתית · %1$s</string>
-    <string name="MessageRecord_s_is_in_the_group_call_s">%1$s בשיחה הקבוצתית · %2$s</string>
-    <string name="MessageRecord_you_are_in_the_group_call_s1">את/ה בשיחה הקבוצתית · %1$s</string>
-    <string name="MessageRecord_s_and_s_are_in_the_group_call_s1">%1$s וגם %2$s בשיחה הקבוצתית · %3$s</string>
-    <string name="MessageRecord_group_call_s">שיחה קבוצתית · %1$s</string>
-
-    <string name="MessageRecord_s_started_a_group_call">%1$s התחיל/ה שיחה קבוצתית</string>
-    <string name="MessageRecord_you_started_a_group_call">התחלת שיחה קבוצתית</string>
-    <string name="MessageRecord_s_is_in_the_group_call">%1$s בשיחה הקבוצתית</string>
-    <string name="MessageRecord_you_are_in_the_group_call">את/ה בשיחה הקבוצתית</string>
-    <string name="MessageRecord_s_and_s_are_in_the_group_call">%1$s וגם %2$s בשיחה הקבוצתית</string>
-    <string name="MessageRecord_group_call">שיחה קבוצתית</string>
+    <!-- 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 בשיחה הזו · %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">את/ה בשיחה הזו · %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 וגם %2$s בשיחה הזו · %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 בשיחה הזו</string>
+    <!-- Chat log text for an ongoing group call only the local user has joined -->
+    <string name="MessageRecord_you_are_in_the_call">את/ה בשיחה הזו</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 וגם %2$s בשיחה זו</string>
+    <!-- Chat log text for a group call that ended within the last 5 minutes -->
+    <string name="MessageRecord__the_video_call_has_ended">שיחת הווידאו הסתיימה</string>
+    <!-- Chat log text for a group call that ended within the last 5 minutes with a placeholder for formatted time -->
+    <string name="MessageRecord__the_video_call_has_ended_s">שיחת הווידאו הסתיימה · %1$s</string>
+    <!-- Chat log text for a group call that ended more than 5 minutes ago and was missed -->
+    <string name="MessageRecord__missed_video_call">שיחת וידאו שלא נענתה</string>
+    <!-- Chat log text for a group call that ended more than 5 minutes ago and was missed with a placeholder for formatted time -->
+    <string name="MessageRecord__missed_video_call_s">שיחת וידאו שלא נענתה · %1$s</string>
+    <!-- Chat log text for a group call that ended that the local user did not start -->
+    <string name="MessageRecord__incoming_video_call">שיחת וידאו נכנסת</string>
+    <!-- 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">שיחת וידאו נכנסת · %1$s</string>
+    <!-- Chat log text for a group call that ended that the local user started -->
+    <string name="MessageRecord__outgoing_video_call">שיחת וידאו יוצאת</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">שיחת וידאו יוצאת · %1$s</string>
+    <!-- Chat log text for an ongoing group call that the local user started -->
+    <string name="MessageRecord__you_started_a_video_call">התחלת שיחת וידאו</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">התחלת שיחת וידאו · %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 התחיל/ה שיחת וידאו</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 התחיל/ה שיחת וידאו · %2$s</string>
 
     <string name="MessageRecord_you">את/ה</string>
 
-    <plurals name="MessageRecord_s_s_and_d_others_are_in_the_group_call_s">
+    <!-- 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, ועוד %3$d אחר בשיחה הקבוצתית · %4$s</item>
         <item quantity="two">%1$s, %2$s ועוד %3$d אחרים בשיחה הקבוצתית · %4$s</item>
         <item quantity="many">%1$s, %2$s ועוד %3$d אחרים בשיחה הקבוצתית · %4$s</item>
         <item quantity="other">%1$s, %2$s ועוד %3$d אחרים בשיחה הקבוצתית · %4$s</item>
     </plurals>
 
-    <plurals name="MessageRecord_s_s_and_d_others_are_in_the_group_call">
+    <!-- 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 ועוד %3$d אחר בשיחה הקבוצתית</item>
         <item quantity="two">%1$s, %2$s ועוד %3$d אחרים בשיחה הקבוצתית</item>
         <item quantity="many">%1$s, %2$s ועוד %3$d אחרים בשיחה הקבוצתית</item>
@@ -2221,6 +2266,7 @@
     <!-- Generic error when the app is unable to request an SMS code for an unknown reason. -->
     <string name="RegistrationActivity_unable_to_request_verification_code">לא ניתן לבקש קוד אימות. כדאי לבדוק את חיבור הרשת שלך ולנסות שוב.</string>
     <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">Molly Android - תסדיר מספר טלפון</string>
     <!--    Small "toast" notification to the user confirming that they have requested a new code via voice call.-->
@@ -2367,7 +2413,7 @@
     <string name="SubmitDebugLogActivity_this_log_will_be_posted_publicly_online_for_contributors">יומן זה יפורסם באופן ציבורי ומקוון עבור מתנדבים כדי שיצפו בו, אתה יכול לבחון אותו לפני העלאה.</string>
 
     <!-- SupportEmailUtil -->
-  <!-- Removed by excludeNonTranslatables <string name="SupportEmailUtil_support_email" translatable="false">support@molly.im</string> -->
+  <!-- Removed by excludeNonTranslatables <string name="SupportEmailUtil_support_email" translatable="false">support@signal.org</string> -->
     <string name="SupportEmailUtil_filter">סנן:</string>
     <string name="SupportEmailUtil_device_info">מידע מכשיר:</string>
     <string name="SupportEmailUtil_android_version">גרסת Android:</string>
@@ -2883,6 +2929,8 @@
     <string name="ConversationUpdateItem_loading">טוען</string>
     <string name="ConversationUpdateItem_learn_more">למד עוד</string>
     <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_call_is_full">השיחה מלאה</string>
     <string name="ConversationUpdateItem_invite_friends">הזמן חברים</string>
@@ -2947,6 +2995,7 @@
     <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>
 
     <!-- EnableCallNotificationSettingsDialog__call_notifications_checklist -->
@@ -3274,6 +3323,7 @@
 
     <string name="arrays__default">ברירת מחדל</string>
     <string name="arrays__high">גבוה</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">מרבי</string>
 
     <!-- plurals.xml -->
@@ -3551,7 +3601,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">אפשר להשתמש ב–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">תשלומים ב־Molly אינם זמינים יותר. אתה עדיין יכול להעביר כספים אל מסחר אבל אתה לא יכול יותר לשלוח ולקבל תשלומים או להוסיף כספים.</string>
@@ -3600,6 +3650,14 @@
     <!-- Storage permission row description -->
     <string name="GrantPermissionsFragment__send_photos_videos_and_files">לשלוח תמונות, סרטונים וקבצים מהמכשיר שלך.</string>
 
+    <!-- PermissionDeniedBottomSheet -->
+    <!-- Sheet describing step 1 on how to give permissions by opening settings -->
+    <string name="PermissionDeniedBottomSheet__1_tap_settings_below">1. Tap “Settings” below</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 Allow the permission</string>
+    <!-- Label for button at the bottom of the sheet which opens the system permission settings -->
+    <string name="PermissionDeniedBottomSheet__settings">Settings</string>
+
     <!-- PaymentsSecuritySetupFragment -->
     <!-- Toolbar title -->
     <string name="PaymentsSecuritySetupFragment__security_setup">הגדרות אבטחה</string>
@@ -3640,6 +3698,7 @@
     <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__information">פרטי עסקה כולל סכום התשלום וזמן העסקה הם חלק מ–MobileCoin Ledger.</string>
@@ -3702,6 +3761,7 @@
     <string name="ConfirmPayment__confirm_payment">אשר תשלום</string>
     <string name="ConfirmPayment__network_fee">עמלת רשת</string>
     <string name="ConfirmPayment__estimated_s">משוער %1$s</string>
+    <!-- Prefix to a name to indicate who a payment will be sent to -->
     <string name="ConfirmPayment__to">אל</string>
     <string name="ConfirmPayment__total_amount">סכום כולל</string>
     <string name="ConfirmPayment__balance_s">מאזן: %1$s</string>
@@ -3856,6 +3916,14 @@
     <string name="conversation_group_options__conversation">צ׳אט</string>
     <string name="conversation_group_options__broadcast">שידור</string>
 
+    <!-- DoubleTapEditEducationSheet -->
+    <!-- Displayed as the title of the education bottom sheet -->
+    <string name="DoubleTapEditEducationSheet__double_tap_edit_title">Double tap to edit</string>
+    <!-- Text on the sheet explaining how double tapping on a message will let them edit it -->
+    <string name="DoubleTapEditEducationSheet__quickly_tap_twice">Quickly tap twice on your messages to edit them. You can edit your messages up to 24hrs after they’ve been sent.</string>
+    <!-- Button label to dismiss sheet -->
+    <string name="DoubleTapEditEducationSheet__got_it">Got it</string>
+
     <!-- text_secure_normal -->
     <string name="text_secure_normal__menu_new_group">קבוצה חדשה</string>
     <string name="text_secure_normal__menu_settings">הגדרות</string>
@@ -4324,6 +4392,7 @@
     <string name="RecipientBottomSheet_copied_to_clipboard">הועתק ללוח</string>
 
     <string name="GroupRecipientListItem_admin">מנהלן</string>
+    <!-- Button text to approve a user that has requested to join a group -->
     <string name="GroupRecipientListItem_approve_description">אשר</string>
     <string name="GroupRecipientListItem_deny_description">דחה</string>
 
@@ -4351,6 +4420,7 @@
 
     <!-- VoiceNoteMediaDescriptionCompatFactory -->
     <string name="VoiceNoteMediaItemFactory__voice_message">הודעה קולית · %1$s</string>
+    <!-- This is a title in a banner describing the conversation sender to receiver placeholders of the currently playing voice memo. -->
     <string name="VoiceNoteMediaItemFactory__s_to_s">%1$s אל %2$s</string>
 
     <!-- StorageUtil -->
@@ -4364,8 +4434,20 @@
     <string name="ReviewCardDialogFragment__review_members">סקירת חברי קבוצה</string>
     <!-- Title of a screen where the user will be prompted to review a message request matching the name of someone they already know -->
     <string name="ReviewCardDialogFragment__review_request">סקירת בקשה</string>
-    <string name="ReviewCardDialogFragment__d_group_members_have_the_same_name">אל %1$d חברי קבוצה יש אותו שם, סקור את חברי הקבוצה למטה ובחר לנקוט בפעולה.</string>
-    <string name="ReviewCardDialogFragment__if_youre_not_sure">אם אינך בטוח ממי הבקשה, סקור את חברי הקבוצה למטה ונקוט בפעולה.</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="two">%1$d group members have the same name, review the members below and choose to take action.</item>
+        <item quantity="many">%1$d group members have the same name, review the members 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 -->
+    <plurals name="ReviewCardDialogFragment__if_youre_not_sure">
+        <item quantity="one">If you\'re not sure who the request is from, review the contact below and take action.</item>
+        <item quantity="two">If you\'re not sure who the request is from, review the contacts below and take action.</item>
+        <item quantity="many">If you\'re not sure who the request is from, review the contacts below and take action.</item>
+        <item quantity="other">If you\'re not sure who the request is from, review the contacts below and take action.</item>
+    </plurals>
     <string name="ReviewCardDialogFragment__no_other_groups_in_common">אין קבוצות אחרות במשותף.</string>
     <string name="ReviewCardDialogFragment__no_groups_in_common">אין קבוצות במשותף.</string>
     <plurals name="ReviewCardDialogFragment__d_other_groups_in_common">
@@ -4400,11 +4482,24 @@
     <string name="CallParticipantsListUpdatePopupWindow__s_joined">%1$s הצטרף/ה</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_and_s_joined">%1$s וגם %2$s הצטרפו</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_s_and_s_joined">%1$s, %2$s וגם %3$s הצטרפו</string>
-    <string name="CallParticipantsListUpdatePopupWindow__s_s_and_d_others_joined">%1$s, %2$s ועוד %3$d אחרים הצטרפו</string>
+    <!-- Toast message shown in group call when 3 or more people join -->
+    <plurals name="CallParticipantsListUpdatePopupWindow__s_s_and_d_others_joined">
+        <item quantity="one">%1$s, %2$s and %3$d other joined</item>
+        <item quantity="two">%1$s, %2$s and %3$d others joined</item>
+        <item quantity="many">%1$s, %2$s and %3$d others joined</item>
+        <item quantity="other">%1$s, %2$s and %3$d others joined</item>
+    </plurals>
+    <!-- Toast/popup text shown when someone leaves a group call -->
     <string name="CallParticipantsListUpdatePopupWindow__s_left">%1$s עזב/ה</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_and_s_left">%1$s וגם %2$s עזבו</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_s_and_s_left">%1$s, %2$s וגם %3$s עזבו</string>
-    <string name="CallParticipantsListUpdatePopupWindow__s_s_and_d_others_left">%1$s, %2$s ועוד %3$d אחרים עזבו</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 and %3$d other left</item>
+        <item quantity="two">%1$s, %2$s and %3$d others left</item>
+        <item quantity="many">%1$s, %2$s and %3$d others left</item>
+        <item quantity="other">%1$s, %2$s and %3$d others left</item>
+    </plurals>
 
     <string name="CallParticipant__you">את/ה</string>
     <string name="CallParticipant__you_on_another_device">את/ה (במכשיר אחר)</string>
@@ -4778,10 +4873,17 @@
 
     <!-- PrivacySettingsFragment -->
     <string name="PrivacySettingsFragment__blocked">חסום/ה</string>
-    <string name="PrivacySettingsFragment__d_contacts">%1$d אנשי קשר</string>
+    <!-- Settings label that shows the number blocked contacts -->
+    <plurals name="PrivacySettingsFragment__d_contacts">
+        <item quantity="one">%1$d contact</item>
+        <item quantity="two">%1$d contacts</item>
+        <item quantity="many">%1$d contacts</item>
+        <item quantity="other">%1$d contacts</item>
+    </plurals>
     <string name="PrivacySettingsFragment__messaging">תכתובת</string>
     <string name="PrivacySettingsFragment__disappearing_messages">הודעות נעלמות</string>
     <string name="PrivacySettingsFragment__app_security">אבטחת יישום</string>
+    <!-- This refers to the multi-tasking overview (recent apps) from the Android operating system.-->
     <string name="PrivacySettingsFragment__block_screenshots_in_the_recents_list_and_inside_the_app">חסימת צילומי מסך ברשימת השיחות האחרונות ובתוך האפליקציה</string>
     <string name="PrivacySettingsFragment__signal_message_and_calls">הודעות ושיחות של Signal, ממסר שיחות תמיד, ושולח אטום</string>
     <string name="PrivacySettingsFragment__default_timer_for_new_changes">קוצב זמן ברירת מחדל עבור צ׳אטים חדשים</string>
@@ -4838,11 +4940,14 @@
     <string name="DataAndStorageSettingsFragment__media_quality">איכות מדיה</string>
     <string name="DataAndStorageSettingsFragment__sent_media_quality">הגדר איכות מדיה</string>
     <string name="DataAndStorageSettingsFragment__sending_high_quality_media_will_use_more_data">שליחת מדיה באיכות גבוהה תשתמש ביותר נתונים.</string>
+    <!-- Setting option that can be selected to default media to be sent as high quality by default -->
     <string name="DataAndStorageSettingsFragment__high">גבוהה</string>
+    <!-- Setting option that can be selected to default media to be sent as standard quality by default -->
     <string name="DataAndStorageSettingsFragment__standard">תקנית</string>
     <string name="DataAndStorageSettingsFragment__calls">שיחות</string>
 
     <!-- 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__use_custom_colors">השתמש בצבעים מותאמים אישית</string>
     <string name="ChatColorSelectionFragment__chat_color">צבע צ\'אט</string>
@@ -5060,6 +5165,7 @@
     <string name="AvatarPickerFragment__take_a_picture">צלם</string>
     <string name="AvatarPickerFragment__choose_a_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>
     <string name="AvatarPickerFragment__clear_avatar">נקה יצגן</string>
@@ -5128,7 +5234,7 @@
     <string name="MediaReviewFragment__add_a_message">הוסף הודעה</string>
     <string name="MediaReviewFragment__add_a_reply">הוסף תשובה</string>
     <string name="MediaReviewFragment__send_to">שליחה אל</string>
-    <string name="MediaReviewFragment__view_once_message">הודעה לצפייה חד־פעמית</string>
+    <string name="MediaReviewFragment__view_once_message">מדיה לצפייה חד פעמית</string>
     <string name="MediaReviewFragment__one_or_more_items_were_too_large">פריט אחד או יותר היו יותר מדי גדולים</string>
     <string name="MediaReviewFragment__one_or_more_items_were_invalid">פריט אחד או יותר היו בלתי תקפים</string>
     <string name="MediaReviewFragment__too_many_items_selected">יותר מדי פריטים נבחרו</string>
@@ -5731,7 +5837,7 @@
     <string name="StoryViewerFragment__s_s">%1$s%2$s</string>
     <!-- Displayed when viewing a post you sent -->
     <string name="StoryViewerPageFragment__you">את/ה</string>
-    <!-- Displayed when viewing a post displayed to a group -->
+    <!-- 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 -->
     <string name="StoryViewerPageFragment__reply">השב</string>
@@ -6996,5 +7102,26 @@
     <!-- Content description for opening the note editor -->
     <string name="ViewNoteSheet__edit_note">עריכת הערה</string>
 
+    <!-- BackupProgressService -->
+    <!-- Notification title shown while backup restore job is running -->
+    <string name="BackupProgressService_title">משחזרים גיבוי…</string>
+    <!-- Notification title shown while downloading backup restore data -->
+    <string name="BackupProgressService_title_downloading">מורידים נתוני גיבוי…</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>
+    <!-- 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 -->
+    <string name="BackupsTypeSettingsFragment__google_pay">Google Pay</string>
+    <!-- Displayed as the user\'s payment method as a label in a preference row -->
+    <string name="BackupsTypeSettingsFragment__bank_transfer">Bank transfer</string>
+    <!-- Displayed as the user\'s payment method as a label in a preference row -->
+    <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>
+
+
     <!-- 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 6e92cbf3cc..3ae38750f0 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -1,6 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- smartling.instruction_comments_enabled = on -->
-<resources>
+<?xml version="1.0" encoding="UTF-8"?><!-- 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> -->
@@ -89,6 +87,16 @@
     <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">Allow access to your location</string>
+    <!-- Dialog description that will explain the steps needed to give location permission -->
+    <string name="AttachmentManager_signal_to_send_location">To send your location:</string>
+    <!-- Alert dialog description asking for location permission -->
+    <string name="AttachmentManager_signal_allow_signal_access_location">Allow Molly access to send your location.</string>
+    <!-- Toast text explaining Signal\'s need for location access -->
+    <string name="AttachmentManager_signal_needs_location_access">Molly needs location access to send your location.</string>
+
     <!-- Alert dialog title to show the recipient has not activated payments -->
     <string name="AttachmentManager__not_activated_payments">%1$s さんは決済機能を有効にしていません </string>
     <!-- Alert dialog description to send the recipient a request to activate payments -->
@@ -240,7 +248,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>
@@ -302,7 +310,7 @@
 
     <!-- ConversationItem -->
     <string name="ConversationItem_error_not_sent_tap_for_details">送信されませんでした。タップして詳細を表示</string>
-    <string name="ConversationItem_error_partially_not_delivered">一部だけ送信しました。タップして詳細を表示</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_send_paused">送信保留中</string>
@@ -383,8 +391,16 @@
     <string name="ConversationActivity_your_request_to_join_has_been_sent_to_the_group_admin">あなたの参加申請はグループ管理者に送信されました。応答があると通知されます。</string>
     <string name="ConversationActivity_cancel_request">申請をキャンセル</string>
 
-    <string name="ConversationActivity_to_send_audio_messages_allow_signal_access_to_your_microphone">音声メッセージを送るには、Mollyのマイクへのアクセスを許可してください。</string>
+    <!-- Dialog title asking users for microphone permission -->
+    <string name="ConversationActivity_allow_access_microphone">Allow access to your microphone</string>
+    <!-- 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>
+    <!-- Toast text explaining Signal\'s need for microphone access -->
+    <string name="ConversationActivity_signal_needs_microphone_access_voice_message">Molly needs microphone access to record a voice message.</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 と通話するには、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>
@@ -408,10 +424,17 @@
     <string name="ConversationActivity_you_will_leave_this_group_and_it_will_be_deleted_from_all_of_your_devices">このグループから抜けて、すべての端末から消去します。</string>
     <string name="ConversationActivity_delete">消去する</string>
     <string name="ConversationActivity_delete_and_leave">消去して抜ける</string>
-    <string name="ConversationActivity__to_call_s_signal_needs_access_to_your_microphone">%1$sと通話するには、Mollyにマイクへのアクセスを許可してください。</string>
+
+    <!-- Dialog description that will explain the steps needed to give microphone permissions for a voice call -->
+    <string name="ConversationActivity__to_start_call">To start a 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">To start a call, allow Molly access to your microphone.</string>
+    <!-- Toast text explaining Signal\'s need for microphone access for a voice call -->
+    <string name="ConversationActivity_signal_needs_microphone_access_voice_call">Molly needs microphone access to start a call.</string>
 
 
     <string name="ConversationActivity_join">参加する</string>
+    <!-- Button text for an active group call but the call is currently full and unjoinable -->
     <string name="ConversationActivity_full">満席</string>
 
     <string name="ConversationActivity_error_sending_media">メディア送信エラー</string>
@@ -597,6 +620,7 @@
     <string name="ConversationListFragment_unarchive">アーカイブを解除する</string>
     <string name="ConversationListFragment_delete">消去する</string>
     <string name="ConversationListFragment_select_all">すべて選択する</string>
+    <!-- Screen title shown when selecting multiple items from a list like conversation threads or call logs. -->
     <plurals name="ConversationListFragment_s_selected">
         <item quantity="other">%1$d件選択済み</item>
     </plurals>
@@ -845,6 +869,7 @@
     <plurals name="GroupManagement_invitation_sent">
         <item quantity="other">%1$d件の招待を送信済み</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">「%1$s」を自動的にこのグループに追加することはできません。\n\nユーザーは招待を受け入れるまで、グループメッセージを閲覧できません。</string>
     <string name="GroupManagement_invite_multiple_users">これらのユーザーをを自動的にこのグループに追加することはできません。\n\nユーザーは招待を受け入れるまで、グループメッセージを閲覧できません。</string>
 
@@ -1009,7 +1034,9 @@
 
     <string name="ManageGroupActivity_edit_name_and_picture">名前と写真の編集</string>
     <string name="ManageGroupActivity_legacy_group">レガシーグループ</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">これはレガシーグループです。グループ管理者などの機能は新しいグループでのみ利用可能です。</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">これはレガシーグループです。@メンションや管理者などの新機能を使用するには、</string>
     <string name="ManageGroupActivity_legacy_group_too_large">このレガシーグループは大きすぎるため、新しいグループにアップグレードできません。グループの最大人数は%1$d人です。</string>
     <string name="ManageGroupActivity_upgrade_this_group">このグループをアップグレードしてください。</string>
@@ -1227,6 +1254,7 @@
         <item quantity="other">消去</item>
     </plurals>
 
+    <!-- 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="other">%1$d件選択済み (%2$s)</item>
     </plurals>
@@ -1290,17 +1318,13 @@
     <string name="MessageRecord_left_group">グループを抜けました。</string>
     <string name="MessageRecord_you_updated_group">グループを更新しました。</string>
     <string name="MessageRecord_the_group_was_updated">グループが更新されました。</string>
-    <!-- Update message shown when placing an outgoing 1:1 voice/audio call and it\'s answered by the other party -->
+    <!-- Update message shown when placing an outgoing 1:1 voice/audio call -->
     <string name="MessageRecord_outgoing_voice_call">音声通話発信</string>
-    <!-- Update message shown when placing an outgoing 1:1 video call and it\'s answered by the other party -->
+    <!-- Update message shown when placing an outgoing 1:1 video call -->
     <string name="MessageRecord_outgoing_video_call">ビデオ通話発信</string>
-    <!-- Update message shown when placing an outgoing 1:1 voice/audio call and it\'s not answered by the other party -->
-    <string name="MessageRecord_unanswered_voice_call">音声通話応答なし</string>
-    <!-- Update message shown when placing an outgoing 1:1 video call and it\'s not answered by the other party -->
-    <string name="MessageRecord_unanswered_video_call">ビデオ通話応答なし</string>
-    <!-- Update message shown when receiving an incoming 1:1 voice/audio call and it\'s answered -->
+    <!-- Update message shown when receiving an incoming 1:1 voice/audio call and it\'s answered or ringing -->
     <string name="MessageRecord_incoming_voice_call">音声通話着信</string>
-    <!-- Update message shown when receiving an incoming 1:1 video call and answered -->
+    <!-- Update message shown when receiving an incoming 1:1 video call and answered or ringing -->
     <string name="MessageRecord_incoming_video_call">ビデオ通話着信</string>
     <!-- Update message shown when receiving an incoming 1:1 voice/audio call and not answered -->
     <string name="MessageRecord_missed_voice_call">音声通話着信あり</string>
@@ -1310,10 +1334,6 @@
     <string name="MessageRecord_missed_voice_call_notification_profile">通知プロファイルがオンのときに不在着信になった音声通話がありました</string>
     <!-- Update message shown when receiving an incoming video call and declined due to notification profile -->
     <string name="MessageRecord_missed_video_call_notification_profile">通知プロファイルがオンのときに不在着信になったビデオ通話がありました</string>
-    <!-- Update message shown when receiving an incoming 1:1 voice/audio call and explicitly declined -->
-    <string name="MessageRecord_you_declined_a_voice_call">音声通話を拒否しました</string>
-    <!-- Update message shown when receiving an incoming 1:1 video call and explicitly declined -->
-    <string name="MessageRecord_you_declined_a_video_call">ビデオ通話を拒否しました</string>
     <!-- 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>
@@ -1514,28 +1534,53 @@
     <string name="MessageRecord_can_accept_payments">%1$s さんが決済機能を有効にしました</string>
 
     <!-- Group Calling update messages -->
-    <string name="MessageRecord_s_started_a_group_call_s">%1$s がグループ通話を開始しました · %2$s</string>
-    <string name="MessageRecord_you_started_a_group_call_s">グループ通話を開始しました · %1$s</string>
-    <string name="MessageRecord_s_is_in_the_group_call_s">%1$s はグループ通話中です · %2$s</string>
-    <string name="MessageRecord_you_are_in_the_group_call_s1">グループ通話中です · %1$s</string>
-    <string name="MessageRecord_s_and_s_are_in_the_group_call_s1">%1$s と %2$s はグループ通話中です · %3$s</string>
-    <string name="MessageRecord_group_call_s">グループ通話 · %1$s</string>
-
-    <string name="MessageRecord_s_started_a_group_call">%1$s がグループ通話を開始しました</string>
-    <string name="MessageRecord_you_started_a_group_call">グループ通話を開始しました</string>
-    <string name="MessageRecord_s_is_in_the_group_call">%1$s はグループ通話中です</string>
-    <string name="MessageRecord_you_are_in_the_group_call">グループ通話中です</string>
-    <string name="MessageRecord_s_and_s_are_in_the_group_call">%1$s と %2$s はグループ通話中です</string>
-    <string name="MessageRecord_group_call">グループ通話</string>
+    <!-- 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は通話中です・%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">あなたは通話中です・%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と%2$sが通話中です・%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は通話中です</string>
+    <!-- Chat log text for an ongoing group call only the local user has joined -->
+    <string name="MessageRecord_you_are_in_the_call">あなたは通話中です</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と%2$sが通話中です</string>
+    <!-- Chat log text for a group call that ended within the last 5 minutes -->
+    <string name="MessageRecord__the_video_call_has_ended">ビデオ通話が終了しました</string>
+    <!-- Chat log text for a group call that ended within the last 5 minutes with a placeholder for formatted time -->
+    <string name="MessageRecord__the_video_call_has_ended_s">ビデオ通話が終了しました・%1$s</string>
+    <!-- Chat log text for a group call that ended more than 5 minutes ago and was missed -->
+    <string name="MessageRecord__missed_video_call">ビデオ通話着信あり</string>
+    <!-- Chat log text for a group call that ended more than 5 minutes ago and was missed with a placeholder for formatted time -->
+    <string name="MessageRecord__missed_video_call_s">ビデオ通話着信あり · %1$s</string>
+    <!-- Chat log text for a group call that ended that the local user did not start -->
+    <string name="MessageRecord__incoming_video_call">ビデオ通話着信</string>
+    <!-- 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">ビデオ通話着信・%1$s</string>
+    <!-- Chat log text for a group call that ended that the local user started -->
+    <string name="MessageRecord__outgoing_video_call">ビデオ通話発信</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">ビデオ通話発信・%1$s</string>
+    <!-- Chat log text for an ongoing group call that the local user started -->
+    <string name="MessageRecord__you_started_a_video_call">ビデオ通話を開始しました</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">ビデオ通話を開始しました・%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はビデオ通話を開始しました</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はビデオ通話を開始しました・%2$s</string>
 
     <string name="MessageRecord_you">あなた</string>
 
-    <plurals name="MessageRecord_s_s_and_d_others_are_in_the_group_call_s">
-        <item quantity="other">%1$s, %2$s ほか%3$d名がグループ通話中です · %4$s</item>
+    <!-- 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="other">%1$s、%2$sほか%3$d名がグループ通話中です · %4$s</item>
     </plurals>
 
-    <plurals name="MessageRecord_s_s_and_d_others_are_in_the_group_call">
-        <item quantity="other">%1$s, %2$s ほか%3$d名がグループ通話中です</item>
+    <!-- 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="other">%1$s、%2$sほか%3$d名がグループ通話中です</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. -->
@@ -1984,6 +2029,7 @@
     <!-- Generic error when the app is unable to request an SMS code for an unknown reason. -->
     <string name="RegistrationActivity_unable_to_request_verification_code">認証コードをリクエストできません。ネットワーク接続を確認して再度試してください。</string>
     <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">Molly Android - 電話番号フォーマット</string>
     <!--    Small "toast" notification to the user confirming that they have requested a new code via voice call.-->
@@ -2127,7 +2173,7 @@
     <string name="SubmitDebugLogActivity_this_log_will_be_posted_publicly_online_for_contributors">このログはコントリビュータにオンラインで公開されます。アップロードする前に内容を確認できます。</string>
 
     <!-- SupportEmailUtil -->
-  <!-- Removed by excludeNonTranslatables <string name="SupportEmailUtil_support_email" translatable="false">support@molly.im</string> -->
+  <!-- Removed by excludeNonTranslatables <string name="SupportEmailUtil_support_email" translatable="false">support@signal.org</string> -->
     <string name="SupportEmailUtil_filter">フィルタ:</string>
     <string name="SupportEmailUtil_device_info">Device info:</string>
     <string name="SupportEmailUtil_android_version">Android version:</string>
@@ -2622,6 +2668,8 @@
     <string name="ConversationUpdateItem_loading">読み込んでいます</string>
     <string name="ConversationUpdateItem_learn_more">詳しく見る</string>
     <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_call_is_full">満席です</string>
     <string name="ConversationUpdateItem_invite_friends">友達を招待する</string>
@@ -2686,6 +2734,7 @@
     <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>
 
     <!-- EnableCallNotificationSettingsDialog__call_notifications_checklist -->
@@ -2992,6 +3041,7 @@
 
     <string name="arrays__default">既定</string>
     <string name="arrays__high">高</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">最大</string>
 
     <!-- plurals.xml -->
@@ -3260,7 +3310,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">Mollyの決済機能は、利用できなくなりました。取引所への振替は可能ですが、送金や受け取り、入金はできません。</string>
@@ -3309,6 +3359,14 @@
     <!-- Storage permission row description -->
     <string name="GrantPermissionsFragment__send_photos_videos_and_files">端末から写真、動画、ファイルを送信します。</string>
 
+    <!-- PermissionDeniedBottomSheet -->
+    <!-- Sheet describing step 1 on how to give permissions by opening settings -->
+    <string name="PermissionDeniedBottomSheet__1_tap_settings_below">1. Tap “Settings” below</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 Allow the permission</string>
+    <!-- Label for button at the bottom of the sheet which opens the system permission settings -->
+    <string name="PermissionDeniedBottomSheet__settings">Settings</string>
+
     <!-- PaymentsSecuritySetupFragment -->
     <!-- Toolbar title -->
     <string name="PaymentsSecuritySetupFragment__security_setup">セキュリティ設定</string>
@@ -3349,6 +3407,7 @@
     <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__information">決済金額や決済時刻などの取引の詳細は、MobileCoin台帳に記載されます。</string>
@@ -3411,6 +3470,7 @@
     <string name="ConfirmPayment__confirm_payment">決済を確認</string>
     <string name="ConfirmPayment__network_fee">ネットワーク手数料</string>
     <string name="ConfirmPayment__estimated_s">概算 %1$s</string>
+    <!-- Prefix to a name to indicate who a payment will be sent to -->
     <string name="ConfirmPayment__to">宛先</string>
     <string name="ConfirmPayment__total_amount">合計金額</string>
     <string name="ConfirmPayment__balance_s">残高: %1$s</string>
@@ -3559,6 +3619,14 @@
     <string name="conversation_group_options__conversation">チャット</string>
     <string name="conversation_group_options__broadcast">一斉送信</string>
 
+    <!-- DoubleTapEditEducationSheet -->
+    <!-- Displayed as the title of the education bottom sheet -->
+    <string name="DoubleTapEditEducationSheet__double_tap_edit_title">Double tap to edit</string>
+    <!-- Text on the sheet explaining how double tapping on a message will let them edit it -->
+    <string name="DoubleTapEditEducationSheet__quickly_tap_twice">Quickly tap twice on your messages to edit them. You can edit your messages up to 24hrs after they’ve been sent.</string>
+    <!-- Button label to dismiss sheet -->
+    <string name="DoubleTapEditEducationSheet__got_it">Got it</string>
+
     <!-- text_secure_normal -->
     <string name="text_secure_normal__menu_new_group">新規グループ</string>
     <string name="text_secure_normal__menu_settings">設定</string>
@@ -4006,6 +4074,7 @@
     <string name="RecipientBottomSheet_copied_to_clipboard">クリップボードにコピーしました</string>
 
     <string name="GroupRecipientListItem_admin">管理者</string>
+    <!-- Button text to approve a user that has requested to join a group -->
     <string name="GroupRecipientListItem_approve_description">承認する</string>
     <string name="GroupRecipientListItem_deny_description">拒否する</string>
 
@@ -4033,6 +4102,7 @@
 
     <!-- VoiceNoteMediaDescriptionCompatFactory -->
     <string name="VoiceNoteMediaItemFactory__voice_message">音声メッセージ · %1$s</string>
+    <!-- This is a title in a banner describing the conversation sender to receiver placeholders of the currently playing voice memo. -->
     <string name="VoiceNoteMediaItemFactory__s_to_s">%1$s から %2$s</string>
 
     <!-- StorageUtil -->
@@ -4046,8 +4116,14 @@
     <string name="ReviewCardDialogFragment__review_members">メンバーの確認</string>
     <!-- Title of a screen where the user will be prompted to review a message request matching the name of someone they already know -->
     <string name="ReviewCardDialogFragment__review_request">申請の確認</string>
-    <string name="ReviewCardDialogFragment__d_group_members_have_the_same_name">%1$d人のグループメンバーが同じ名前です。以下のメンバーを確認して、対応してください。</string>
-    <string name="ReviewCardDialogFragment__if_youre_not_sure">この申請者が誰であるか不確かな場合、以下の連絡先を確認して対応してください。</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="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 -->
+    <plurals name="ReviewCardDialogFragment__if_youre_not_sure">
+        <item quantity="other">If you\'re not sure who the request is from, review the contacts below and take action.</item>
+    </plurals>
     <string name="ReviewCardDialogFragment__no_other_groups_in_common">他の共通のグループはありません</string>
     <string name="ReviewCardDialogFragment__no_groups_in_common">共通のグループはありません</string>
     <plurals name="ReviewCardDialogFragment__d_other_groups_in_common">
@@ -4076,11 +4152,18 @@
     <string name="CallParticipantsListUpdatePopupWindow__s_joined">%1$s が参加しました</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_and_s_joined">%1$s と %2$s が参加しました</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_s_and_s_joined">%1$s, %2$s および %3$s が参加しました</string>
-    <string name="CallParticipantsListUpdatePopupWindow__s_s_and_d_others_joined">%1$s, %2$s ほか%3$d名が参加しました</string>
+    <!-- Toast message shown in group call when 3 or more people join -->
+    <plurals name="CallParticipantsListUpdatePopupWindow__s_s_and_d_others_joined">
+        <item quantity="other">%1$s, %2$s and %3$d others joined</item>
+    </plurals>
+    <!-- Toast/popup text shown when someone leaves a group call -->
     <string name="CallParticipantsListUpdatePopupWindow__s_left">%1$s が退出しました</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_and_s_left">%1$s と %2$s が退出しました</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_s_and_s_left">%1$s, %2$s および %3$s が退出しました</string>
-    <string name="CallParticipantsListUpdatePopupWindow__s_s_and_d_others_left">%1$s, %2$s ほか%3$d名が退出しました</string>
+    <!-- Toast message shown in group call when 3 or more people leave -->
+    <plurals name="CallParticipantsListUpdatePopupWindow__s_s_and_d_others_left">
+        <item quantity="other">%1$s, %2$s and %3$d others left</item>
+    </plurals>
 
     <string name="CallParticipant__you">あなた</string>
     <string name="CallParticipant__you_on_another_device">あなた (別端末)</string>
@@ -4448,10 +4531,14 @@
 
     <!-- PrivacySettingsFragment -->
     <string name="PrivacySettingsFragment__blocked">ブロック済</string>
-    <string name="PrivacySettingsFragment__d_contacts">%1$d人</string>
+    <!-- Settings label that shows the number blocked contacts -->
+    <plurals name="PrivacySettingsFragment__d_contacts">
+        <item quantity="other">%1$d contacts</item>
+    </plurals>
     <string name="PrivacySettingsFragment__messaging">メッセージ送受信</string>
     <string name="PrivacySettingsFragment__disappearing_messages">消えるメッセージ</string>
     <string name="PrivacySettingsFragment__app_security">アプリのセキュリティ</string>
+    <!-- This refers to the multi-tasking overview (recent apps) from the Android operating system.-->
     <string name="PrivacySettingsFragment__block_screenshots_in_the_recents_list_and_inside_the_app">「最近使ったアプリ」やアプリ内でのスクリーンショットをブロックします。</string>
     <string name="PrivacySettingsFragment__signal_message_and_calls">Signalメッセージと通話、通話を常に中継、送信者の秘匿化</string>
     <string name="PrivacySettingsFragment__default_timer_for_new_changes">新規チャットの既定タイマー</string>
@@ -4508,11 +4595,14 @@
     <string name="DataAndStorageSettingsFragment__media_quality">メディアの画質</string>
     <string name="DataAndStorageSettingsFragment__sent_media_quality">送信メディアの画質</string>
     <string name="DataAndStorageSettingsFragment__sending_high_quality_media_will_use_more_data">高画質なメディアの送信には、より多くのデータを使用します。</string>
+    <!-- Setting option that can be selected to default media to be sent as high quality by default -->
     <string name="DataAndStorageSettingsFragment__high">高画質</string>
+    <!-- Setting option that can be selected to default media to be sent as standard quality by default -->
     <string name="DataAndStorageSettingsFragment__standard">標準</string>
     <string name="DataAndStorageSettingsFragment__calls">通話</string>
 
     <!-- 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__use_custom_colors">カスタム色を使用</string>
     <string name="ChatColorSelectionFragment__chat_color">チャットの色</string>
@@ -4721,6 +4811,7 @@
     <string name="AvatarPickerFragment__take_a_picture">写真を撮影</string>
     <string name="AvatarPickerFragment__choose_a_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>
     <string name="AvatarPickerFragment__clear_avatar">アバターを削除</string>
@@ -4777,7 +4868,7 @@
     <string name="MediaReviewFragment__add_a_message">メッセージを追加してください</string>
     <string name="MediaReviewFragment__add_a_reply">返信を追加</string>
     <string name="MediaReviewFragment__send_to">宛先</string>
-    <string name="MediaReviewFragment__view_once_message">使い捨てメッセージ</string>
+    <string name="MediaReviewFragment__view_once_message">使い捨てメディア</string>
     <string name="MediaReviewFragment__one_or_more_items_were_too_large">1つ以上のアイテムのサイズが大きすぎます</string>
     <string name="MediaReviewFragment__one_or_more_items_were_invalid">1つ以上のアイテムが不正です</string>
     <string name="MediaReviewFragment__too_many_items_selected">選択されたアイテムが多すぎます</string>
@@ -5365,7 +5456,7 @@
     <string name="StoryViewerFragment__s_s">%1$s %2$s</string>
     <!-- Displayed when viewing a post you sent -->
     <string name="StoryViewerPageFragment__you">あなた</string>
-    <!-- Displayed when viewing a post displayed to a group -->
+    <!-- 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 -->
     <string name="StoryViewerPageFragment__reply">返信</string>
@@ -6558,5 +6649,26 @@
     <!-- Content description for opening the note editor -->
     <string name="ViewNoteSheet__edit_note">メモを編集する</string>
 
+    <!-- BackupProgressService -->
+    <!-- Notification title shown while backup restore job is running -->
+    <string name="BackupProgressService_title">バックアップを復元しています…</string>
+    <!-- Notification title shown while downloading backup restore data -->
+    <string name="BackupProgressService_title_downloading">バックアップデータをダウンロードしています…</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>
+    <!-- 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 -->
+    <string name="BackupsTypeSettingsFragment__google_pay">Google Pay</string>
+    <!-- Displayed as the user\'s payment method as a label in a preference row -->
+    <string name="BackupsTypeSettingsFragment__bank_transfer">Bank transfer</string>
+    <!-- Displayed as the user\'s payment method as a label in a preference row -->
+    <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>
+
+
     <!-- 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 eb921e719e..1b2d2239d2 100644
--- a/app/src/main/res/values-ka/strings.xml
+++ b/app/src/main/res/values-ka/strings.xml
@@ -1,6 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- smartling.instruction_comments_enabled = on -->
-<resources>
+<?xml version="1.0" encoding="UTF-8"?><!-- 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> -->
@@ -89,6 +87,16 @@
     <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">Allow access to your location</string>
+    <!-- Dialog description that will explain the steps needed to give location permission -->
+    <string name="AttachmentManager_signal_to_send_location">To send your location:</string>
+    <!-- Alert dialog description asking for location permission -->
+    <string name="AttachmentManager_signal_allow_signal_access_location">Allow Molly access to send your location.</string>
+    <!-- Toast text explaining Signal\'s need for location access -->
+    <string name="AttachmentManager_signal_needs_location_access">Molly needs location access to send your location.</string>
+
     <!-- Alert dialog title to show the recipient has not activated payments -->
     <string name="AttachmentManager__not_activated_payments">%1$s-ს ტრანზაქციები არ გაუაქტიურებია </string>
     <!-- Alert dialog description to send the recipient a request to activate payments -->
@@ -241,7 +249,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>
@@ -386,8 +394,16 @@
     <string name="ConversationActivity_your_request_to_join_has_been_sent_to_the_group_admin">შენი გაწევრიანების მოთხოვნა იქნა გაგზავნილი ჯგუფის ადმინთან. შენ მიიღებ შეტყობინებას, როდესაც ისინი რამეს მოიმოქმედებენ.</string>
     <string name="ConversationActivity_cancel_request">მოთხოვნის გაუქმება</string>
 
-    <string name="ConversationActivity_to_send_audio_messages_allow_signal_access_to_your_microphone">აუდიო შეტყობინებების გასაგზავნად, მიეცი Molly-ს წვდომა შენს მიკროფონზე.</string>
+    <!-- Dialog title asking users for microphone permission -->
+    <string name="ConversationActivity_allow_access_microphone">Allow access to your microphone</string>
+    <!-- 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>
+    <!-- Toast text explaining Signal\'s need for microphone access -->
+    <string name="ConversationActivity_signal_needs_microphone_access_voice_message">Molly needs microphone access to record a voice message.</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-თან დასარეკად 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>
@@ -411,10 +427,17 @@
     <string name="ConversationActivity_you_will_leave_this_group_and_it_will_be_deleted_from_all_of_your_devices">ამ ჯგუფს დატოვებ და ის შენი ყველა მოწყობილობიდან წაიშლება.</string>
     <string name="ConversationActivity_delete">წაშლა</string>
     <string name="ConversationActivity_delete_and_leave">წაშლა და დატოვება</string>
-    <string name="ConversationActivity__to_call_s_signal_needs_access_to_your_microphone">%1$s-თან დასარეკად, Molly-ს შენს მიკროფონზე წვდომა სჭირდება</string>
+
+    <!-- Dialog description that will explain the steps needed to give microphone permissions for a voice call -->
+    <string name="ConversationActivity__to_start_call">To start a 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">To start a call, allow Molly access to your microphone.</string>
+    <!-- Toast text explaining Signal\'s need for microphone access for a voice call -->
+    <string name="ConversationActivity_signal_needs_microphone_access_voice_call">Molly needs microphone access to start a call.</string>
 
 
     <string name="ConversationActivity_join">შემოუერთდი</string>
+    <!-- Button text for an active group call but the call is currently full and unjoinable -->
     <string name="ConversationActivity_full">სრული</string>
 
     <string name="ConversationActivity_error_sending_media">მედია ფაილის გაგზავნისას შეცდომა მოხდა</string>
@@ -613,6 +636,7 @@
     <string name="ConversationListFragment_unarchive">დეარქივაცია</string>
     <string name="ConversationListFragment_delete">წაშლა</string>
     <string name="ConversationListFragment_select_all">მონიშნე ყველა</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 არჩეულია</item>
         <item quantity="other">%1$d არჩეულია</item>
@@ -864,6 +888,7 @@
         <item quantity="one">მოწვევა გაგზავნილია</item>
         <item quantity="other">გაგზავნილია %1$d მოწვევა</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">“%1$s”-ის შენს მიერ ამ ჯგუფში ავტომატურად დამატება შეუძლებელია.\n\nისინი მოწვეულნი არიან გასაწევრიანებლად და ვერ ნახავენ ჯგუფურ შეტყობინებებს, სანამ მოწვევას არ დაეთანხმებიან.</string>
     <string name="GroupManagement_invite_multiple_users">შენ მიერ ამ მომხმარებლების ამ ჯგუფში ავტომატურად დამატება შეუძლებელია.\n\nისინი მოწვეული არიან ჯგუფში გასაწევრიანებლად და ვერ ნახავენ ჯგუფურ შეტყობინებებს, სანამ მოწვევას არ დაეთანხმებიან.</string>
 
@@ -1044,7 +1069,9 @@
 
     <string name="ManageGroupActivity_edit_name_and_picture">სახელისა და სურათის რედაქტირება</string>
     <string name="ManageGroupActivity_legacy_group">მოძველებული ჯგუფი</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">ეს მოძველებული ჯგუფია. ჯგუფის ადმინების მსგავსი ფუნქციები მხოლოდ ახალი ჯგუფებისთვისაა ხელმისაწვდომი.</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">ეს მოძველებული ჯგუფია. იმისათვის, რომ მიიღო წვდომა ახალ ფუნქციებზე, მაგალითად @მონიშვნებსა და ადმინებზე,</string>
     <string name="ManageGroupActivity_legacy_group_too_large">ეს მოძველებული ჯგუფი ვერ განახლდება ახალ ჯგუფად, რადგან ზედმეტად დიდია. ჯგუფის მაქსიმალური ზომა არის %1$d.</string>
     <string name="ManageGroupActivity_upgrade_this_group">ამ ჯგუფის განახლება.</string>
@@ -1271,6 +1298,7 @@
         <item quantity="other">წაშლა</item>
     </plurals>
 
+    <!-- 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 არჩეულია (%2$s)</item>
         <item quantity="other">%1$d არჩეულია (%2$s)</item>
@@ -1335,17 +1363,13 @@
     <string name="MessageRecord_left_group">შენ დატოვე ჯგუფი.</string>
     <string name="MessageRecord_you_updated_group">შენ განაახლე ჯგუფი.</string>
     <string name="MessageRecord_the_group_was_updated">ჯგუფი განახლებულია.</string>
-    <!-- Update message shown when placing an outgoing 1:1 voice/audio call and it\'s answered by the other party -->
+    <!-- Update message shown when placing an outgoing 1:1 voice/audio call -->
     <string name="MessageRecord_outgoing_voice_call">გამავალი ხმოვანი ზარი</string>
-    <!-- Update message shown when placing an outgoing 1:1 video call and it\'s answered by the other party -->
+    <!-- Update message shown when placing an outgoing 1:1 video call -->
     <string name="MessageRecord_outgoing_video_call">გამავალი ვიდეო ზარი</string>
-    <!-- Update message shown when placing an outgoing 1:1 voice/audio call and it\'s not answered by the other party -->
-    <string name="MessageRecord_unanswered_voice_call">უპასუხო ხმოვანი ზარი</string>
-    <!-- Update message shown when placing an outgoing 1:1 video call and it\'s not answered by the other party -->
-    <string name="MessageRecord_unanswered_video_call">უპასუხო ვიდეო ზარი</string>
-    <!-- Update message shown when receiving an incoming 1:1 voice/audio call and it\'s answered -->
+    <!-- Update message shown when receiving an incoming 1:1 voice/audio call and it\'s answered or ringing -->
     <string name="MessageRecord_incoming_voice_call">შემომავალი ხმოვანი ზარი</string>
-    <!-- Update message shown when receiving an incoming 1:1 video call and answered -->
+    <!-- Update message shown when receiving an incoming 1:1 video call and answered or ringing -->
     <string name="MessageRecord_incoming_video_call">შემომავალი ვიდეო ზარი</string>
     <!-- Update message shown when receiving an incoming 1:1 voice/audio call and not answered -->
     <string name="MessageRecord_missed_voice_call">გამოტოვებული ხმოვანი ზარი</string>
@@ -1355,10 +1379,6 @@
     <string name="MessageRecord_missed_voice_call_notification_profile">გამოტოვებული ხმოვანი ზარი ჩართული შეტყობინების პროფილის დროს</string>
     <!-- Update message shown when receiving an incoming video call and declined due to notification profile -->
     <string name="MessageRecord_missed_video_call_notification_profile">გამოტოვებული ვიდეო ზარი ჩართული შეტყობინების პროფილის დროს</string>
-    <!-- Update message shown when receiving an incoming 1:1 voice/audio call and explicitly declined -->
-    <string name="MessageRecord_you_declined_a_voice_call">შენ უარყავი ხმოვანი ზარი</string>
-    <!-- Update message shown when receiving an incoming 1:1 video call and explicitly declined -->
-    <string name="MessageRecord_you_declined_a_video_call">შენ უარყავი ვიდეო ზარი</string>
     <!-- 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>
@@ -1567,28 +1587,53 @@
     <string name="MessageRecord_can_accept_payments">%1$s-ს უკვე შეუძლია ტრანზაქციები მიიღოს</string>
 
     <!-- Group Calling update messages -->
-    <string name="MessageRecord_s_started_a_group_call_s">%1$s-მა ჯგუფური ზარი წამოიწყო · %2$s</string>
-    <string name="MessageRecord_you_started_a_group_call_s">შენ დიწყე ჯგუფური ზარი · %1$s</string>
-    <string name="MessageRecord_s_is_in_the_group_call_s">%1$s ჯგუფურ ზარზეა · %2$s</string>
-    <string name="MessageRecord_you_are_in_the_group_call_s1">ჯგუფურ ზარზე ხარ · %1$s</string>
-    <string name="MessageRecord_s_and_s_are_in_the_group_call_s1">%1$s და %2$s ჯგუფურ ზარზე არიან · %3$s</string>
-    <string name="MessageRecord_group_call_s">ჯგუფური ზარი · %1$s</string>
-
-    <string name="MessageRecord_s_started_a_group_call">%1$s-მა ჯგუფური ზარი წამოიწყო</string>
-    <string name="MessageRecord_you_started_a_group_call">შენ დაიწყე ჯგუფური ზარი</string>
-    <string name="MessageRecord_s_is_in_the_group_call">%1$s ჯგუფურ ზარზეა</string>
-    <string name="MessageRecord_you_are_in_the_group_call">ჯგუფურ ზარზე ხარ</string>
-    <string name="MessageRecord_s_and_s_are_in_the_group_call">%1$s და %2$s ჯგუფურ ზარზე არიან</string>
-    <string name="MessageRecord_group_call">ჯგუფური ზარი</string>
+    <!-- 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 არის ამ ზარზე · %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">შენ ხარ ამ ზარზე · %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 და %2$s ამ ზარზე არიან · %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 ამ ზარზეა</string>
+    <!-- Chat log text for an ongoing group call only the local user has joined -->
+    <string name="MessageRecord_you_are_in_the_call">ამ ზარზე ხარ</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 და %2$s ამ ზარზე არიან</string>
+    <!-- Chat log text for a group call that ended within the last 5 minutes -->
+    <string name="MessageRecord__the_video_call_has_ended">ეს ვიდეო ზარი დასრულდა</string>
+    <!-- Chat log text for a group call that ended within the last 5 minutes with a placeholder for formatted time -->
+    <string name="MessageRecord__the_video_call_has_ended_s">ეს ვიდეო ზარი დასრულდა · %1$s</string>
+    <!-- Chat log text for a group call that ended more than 5 minutes ago and was missed -->
+    <string name="MessageRecord__missed_video_call">გამოტოვებული ვიდეო ზარი</string>
+    <!-- Chat log text for a group call that ended more than 5 minutes ago and was missed with a placeholder for formatted time -->
+    <string name="MessageRecord__missed_video_call_s">გამოტოვებული ვიდეო ზარი · %1$s</string>
+    <!-- Chat log text for a group call that ended that the local user did not start -->
+    <string name="MessageRecord__incoming_video_call">შემომავალი ვიდეო ზარი</string>
+    <!-- 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">შემომავალი ვიდეო ზარი · %1$s</string>
+    <!-- Chat log text for a group call that ended that the local user started -->
+    <string name="MessageRecord__outgoing_video_call">გამავალი ვიდეო ზარი</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">გამავალი ვიდეო ზარი · %1$s</string>
+    <!-- Chat log text for an ongoing group call that the local user started -->
+    <string name="MessageRecord__you_started_a_video_call">შენ წამოიწყე ვიდეო ზარი</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">შენ წამოიწყე ვიდეო ზარი · %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-მა ვიდეო ზარი წამოიწყო</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-მა ვიდეო ზარი წამოიწყო · %2$s</string>
 
     <string name="MessageRecord_you">შენ</string>
 
-    <plurals name="MessageRecord_s_s_and_d_others_are_in_the_group_call_s">
+    <!-- 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, და %3$d სხვა ჯგუფურ ზარში არიან · %4$s</item>
         <item quantity="other">%1$s, %2$s, და %3$d სხვა ჯგუფურ ზარზე არიან · %4$s</item>
     </plurals>
 
-    <plurals name="MessageRecord_s_s_and_d_others_are_in_the_group_call">
+    <!-- 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, და %3$d სხვა ჯგუფურ ზარში არიან</item>
         <item quantity="other">%1$s, %2$s, და %3$d სხვა ჯგუფურ ზარზე არიან</item>
     </plurals>
@@ -2063,6 +2108,7 @@
     <!-- Generic error when the app is unable to request an SMS code for an unknown reason. -->
     <string name="RegistrationActivity_unable_to_request_verification_code">ვერიფიკაციის კოდის მოთხოვნა შეუძლებელია. გთხოვთ, შეამოწმო შენი ქსელის კავშირი და თავიდან სცადო.</string>
     <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">Molly Android-ი - ტელეფონის ნომრის ფორმატი</string>
     <!--    Small "toast" notification to the user confirming that they have requested a new code via voice call.-->
@@ -2207,7 +2253,7 @@
     <string name="SubmitDebugLogActivity_this_log_will_be_posted_publicly_online_for_contributors">ეს რეესტრი საჯაროდ გამოქვეყნდება ინტერნეტში, რომ კონტრიბუტორებმა ნახონ. მისი შემოწმება ატვირთვამდე შეგიძლია.</string>
 
     <!-- SupportEmailUtil -->
-  <!-- Removed by excludeNonTranslatables <string name="SupportEmailUtil_support_email" translatable="false">support@molly.im</string> -->
+  <!-- Removed by excludeNonTranslatables <string name="SupportEmailUtil_support_email" translatable="false">support@signal.org</string> -->
     <string name="SupportEmailUtil_filter">ფილტრი:</string>
     <string name="SupportEmailUtil_device_info">ინფორმაცია მოწყობილობაზე:</string>
     <string name="SupportEmailUtil_android_version">Android-ის ვერსია:</string>
@@ -2709,6 +2755,8 @@
     <string name="ConversationUpdateItem_loading">იტვირთება</string>
     <string name="ConversationUpdateItem_learn_more">გაიგე მეტი</string>
     <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_call_is_full">ზარი გადავსებულია</string>
     <string name="ConversationUpdateItem_invite_friends">მოიწვიე მეგობრები</string>
@@ -2773,6 +2821,7 @@
     <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">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>
 
     <!-- EnableCallNotificationSettingsDialog__call_notifications_checklist -->
@@ -3086,6 +3135,7 @@
 
     <string name="arrays__default">ძირითადი</string>
     <string name="arrays__high">მაღალი</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">მაქსიმალური</string>
 
     <!-- plurals.xml -->
@@ -3357,7 +3407,7 @@
     <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">ტრანზაქციები Molly-ში აღარ არის ხელმისაწვდომი. ისევ შეგიძლია თანხების გადარიცხვა ბირჟაზე, მაგრამ აღარ შეგიძლია ტრანზაქციების გაგზავნა და მიღება, ან თანხის დამატება.</string>
@@ -3406,6 +3456,14 @@
     <!-- Storage permission row description -->
     <string name="GrantPermissionsFragment__send_photos_videos_and_files">გაგზავნე ფოტოები, ვიდეოები და ფაილები შენი მოწყობილობიდან.</string>
 
+    <!-- PermissionDeniedBottomSheet -->
+    <!-- Sheet describing step 1 on how to give permissions by opening settings -->
+    <string name="PermissionDeniedBottomSheet__1_tap_settings_below">1. Tap “Settings” below</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 Allow the permission</string>
+    <!-- Label for button at the bottom of the sheet which opens the system permission settings -->
+    <string name="PermissionDeniedBottomSheet__settings">Settings</string>
+
     <!-- PaymentsSecuritySetupFragment -->
     <!-- Toolbar title -->
     <string name="PaymentsSecuritySetupFragment__security_setup">უსაფრთხოების პარამეტრების დაყენება</string>
@@ -3446,6 +3504,7 @@
     <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">To</string>
     <string name="PaymentsDetailsFragment__from">From</string>
     <string name="PaymentsDetailsFragment__information">ტრანზაქციის დეტალები, მათ შორის გადახდის თანხა და ტრანზაქციის დრო, არის MobileCoin Ledger-ის ნაწილი.</string>
@@ -3508,6 +3567,7 @@
     <string name="ConfirmPayment__confirm_payment">ტრანზაქციის დადასტურება</string>
     <string name="ConfirmPayment__network_fee">ქსელის საფასური</string>
     <string name="ConfirmPayment__estimated_s">ნავარაუდევი %1$s</string>
+    <!-- Prefix to a name to indicate who a payment will be sent to -->
     <string name="ConfirmPayment__to">To</string>
     <string name="ConfirmPayment__total_amount">ჯამი</string>
     <string name="ConfirmPayment__balance_s">ბალანსი: %1$s</string>
@@ -3658,6 +3718,14 @@
     <string name="conversation_group_options__conversation">ჩატი</string>
     <string name="conversation_group_options__broadcast">მაუწყებლობა</string>
 
+    <!-- DoubleTapEditEducationSheet -->
+    <!-- Displayed as the title of the education bottom sheet -->
+    <string name="DoubleTapEditEducationSheet__double_tap_edit_title">Double tap to edit</string>
+    <!-- Text on the sheet explaining how double tapping on a message will let them edit it -->
+    <string name="DoubleTapEditEducationSheet__quickly_tap_twice">Quickly tap twice on your messages to edit them. You can edit your messages up to 24hrs after they’ve been sent.</string>
+    <!-- Button label to dismiss sheet -->
+    <string name="DoubleTapEditEducationSheet__got_it">Got it</string>
+
     <!-- text_secure_normal -->
     <string name="text_secure_normal__menu_new_group">ახალი ჯგუფი</string>
     <string name="text_secure_normal__menu_settings">Settings</string>
@@ -4112,6 +4180,7 @@
     <string name="RecipientBottomSheet_copied_to_clipboard">დაკოპირებულია ბუფერში</string>
 
     <string name="GroupRecipientListItem_admin">ადმინი</string>
+    <!-- Button text to approve a user that has requested to join a group -->
     <string name="GroupRecipientListItem_approve_description">დადასტურება</string>
     <string name="GroupRecipientListItem_deny_description">უარყოფა</string>
 
@@ -4139,6 +4208,7 @@
 
     <!-- VoiceNoteMediaDescriptionCompatFactory -->
     <string name="VoiceNoteMediaItemFactory__voice_message">ხმოვანი შეტყობინება · %1$s</string>
+    <!-- This is a title in a banner describing the conversation sender to receiver placeholders of the currently playing voice memo. -->
     <string name="VoiceNoteMediaItemFactory__s_to_s">%1$s %2$s-ს</string>
 
     <!-- StorageUtil -->
@@ -4152,8 +4222,16 @@
     <string name="ReviewCardDialogFragment__review_members">წევრების განხილვა</string>
     <!-- Title of a screen where the user will be prompted to review a message request matching the name of someone they already know -->
     <string name="ReviewCardDialogFragment__review_request">მოთხოვნის განხილვა</string>
-    <string name="ReviewCardDialogFragment__d_group_members_have_the_same_name">ჯგუფის %1$d წევრს აქვს იგივე სახელი, გადახედე ქვემოთ მოცემულ წევრებს და აირჩიე მოქმედება.</string>
-    <string name="ReviewCardDialogFragment__if_youre_not_sure">თუ არ ხარ დარწმუნებული, ვისგან არის მოთხოვნა, გადახედე ქვემოთ მოცემულ კონტაქტებს და მიიღე ზომები.</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="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 -->
+    <plurals name="ReviewCardDialogFragment__if_youre_not_sure">
+        <item quantity="one">If you\'re not sure who the request is from, review the contact below and take action.</item>
+        <item quantity="other">If you\'re not sure who the request is from, review the contacts below and take action.</item>
+    </plurals>
     <string name="ReviewCardDialogFragment__no_other_groups_in_common">არცერთი სხვა საერთო ჯგუფი.</string>
     <string name="ReviewCardDialogFragment__no_groups_in_common">არცერთი საერთო ჯგუფი.</string>
     <plurals name="ReviewCardDialogFragment__d_other_groups_in_common">
@@ -4184,11 +4262,20 @@
     <string name="CallParticipantsListUpdatePopupWindow__s_joined">%1$s შემოგიერთდათ</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_and_s_joined">%1$s და %2$s შემოგიერთდნენ</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_s_and_s_joined">%1$s, %2$s და %3$s შემოგიერთდნენ</string>
-    <string name="CallParticipantsListUpdatePopupWindow__s_s_and_d_others_joined">%1$s, %2$s და %3$d სხვები შემოგიერთდნენ</string>
+    <!-- Toast message shown in group call when 3 or more people join -->
+    <plurals name="CallParticipantsListUpdatePopupWindow__s_s_and_d_others_joined">
+        <item quantity="one">%1$s, %2$s and %3$d other joined</item>
+        <item quantity="other">%1$s, %2$s and %3$d others joined</item>
+    </plurals>
+    <!-- Toast/popup text shown when someone leaves a group call -->
     <string name="CallParticipantsListUpdatePopupWindow__s_left">%1$s გავიდა</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_and_s_left">%1$s და %2$s გავიდნენ</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_s_and_s_left">%1$s, %2$s და %3$s გავიდნენ</string>
-    <string name="CallParticipantsListUpdatePopupWindow__s_s_and_d_others_left">%1$s, %2$s და %3$d სხვები გავიდნენ</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 and %3$d other left</item>
+        <item quantity="other">%1$s, %2$s and %3$d others left</item>
+    </plurals>
 
     <string name="CallParticipant__you">შენ</string>
     <string name="CallParticipant__you_on_another_device">შენ (სხვა მოწყობილობით)</string>
@@ -4558,10 +4645,15 @@
 
     <!-- PrivacySettingsFragment -->
     <string name="PrivacySettingsFragment__blocked">დაბლოკილია</string>
-    <string name="PrivacySettingsFragment__d_contacts">%1$d კონტაქტი</string>
+    <!-- Settings label that shows the number blocked contacts -->
+    <plurals name="PrivacySettingsFragment__d_contacts">
+        <item quantity="one">%1$d contact</item>
+        <item quantity="other">%1$d contacts</item>
+    </plurals>
     <string name="PrivacySettingsFragment__messaging">მიმოწერა</string>
     <string name="PrivacySettingsFragment__disappearing_messages">გაქრობადი შეტყობინებები</string>
     <string name="PrivacySettingsFragment__app_security">აპის უსაფრთხოება</string>
+    <!-- This refers to the multi-tasking overview (recent apps) from the Android operating system.-->
     <string name="PrivacySettingsFragment__block_screenshots_in_the_recents_list_and_inside_the_app">მიმდინარე სიასა და აპის შიგნით სქრინშოტების დაბლოკვა</string>
     <string name="PrivacySettingsFragment__signal_message_and_calls">Signal-ის შეტყობინებები და ზარები, ყოველთვის გადამისამართებული ზარებია და დაფარული გამომგზავნი</string>
     <string name="PrivacySettingsFragment__default_timer_for_new_changes">ნაგულისხმევი ტაიმერი ახალი ჩატებისთვის</string>
@@ -4618,11 +4710,14 @@
     <string name="DataAndStorageSettingsFragment__media_quality">მედია-ფაილების ხარისხი</string>
     <string name="DataAndStorageSettingsFragment__sent_media_quality">გაგზავნილი მედია-ფაილების ხარისხი</string>
     <string name="DataAndStorageSettingsFragment__sending_high_quality_media_will_use_more_data">მაღალი ხარისხის მედია-ფაილის გაგზავნა უფრო მეტ მობილურ ინტერნეტს გამოიყენებს.</string>
+    <!-- Setting option that can be selected to default media to be sent as high quality by default -->
     <string name="DataAndStorageSettingsFragment__high">მაღალი</string>
+    <!-- Setting option that can be selected to default media to be sent as standard quality by default -->
     <string name="DataAndStorageSettingsFragment__standard">სტანდარტული</string>
     <string name="DataAndStorageSettingsFragment__calls">ზარები</string>
 
     <!-- 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__use_custom_colors">ფერების მორგება</string>
     <string name="ChatColorSelectionFragment__chat_color">ჩატის ფერი</string>
@@ -4834,6 +4929,7 @@
     <string name="AvatarPickerFragment__take_a_picture">სურათის გადაღება</string>
     <string name="AvatarPickerFragment__choose_a_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>
     <string name="AvatarPickerFragment__clear_avatar">ავატარის წაშლა</string>
@@ -4894,7 +4990,7 @@
     <string name="MediaReviewFragment__add_a_message">შეტყობინების დამატება</string>
     <string name="MediaReviewFragment__add_a_reply">პასუხის დამატება</string>
     <string name="MediaReviewFragment__send_to">გაეგზავნოთ ჩამოთვლილებს</string>
-    <string name="MediaReviewFragment__view_once_message">ერთხელ სანახავი შეტყობინება</string>
+    <string name="MediaReviewFragment__view_once_message">ერთხელ სანახავი მედია-ფაილი</string>
     <string name="MediaReviewFragment__one_or_more_items_were_too_large">ერთი ან მეტი ელემენტი ზედმეტად დიდი იყო</string>
     <string name="MediaReviewFragment__one_or_more_items_were_invalid">ერთი ან მეტი ელემენტი არავალიდური იყო</string>
     <string name="MediaReviewFragment__too_many_items_selected">მონიშნულია ზედმეტი ელემენტი</string>
@@ -5487,7 +5583,7 @@
     <string name="StoryViewerFragment__s_s">%1$s %2$s</string>
     <!-- Displayed when viewing a post you sent -->
     <string name="StoryViewerPageFragment__you">შენ</string>
-    <!-- Displayed when viewing a post displayed to a group -->
+    <!-- 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 -->
     <string name="StoryViewerPageFragment__reply">პასუხი</string>
@@ -6704,5 +6800,26 @@
     <!-- Content description for opening the note editor -->
     <string name="ViewNoteSheet__edit_note">ჩანიშვნის რედაქტირება</string>
 
+    <!-- BackupProgressService -->
+    <!-- Notification title shown while backup restore job is running -->
+    <string name="BackupProgressService_title">მიმდინარეობს სარეზერვო მონაცემების აღდგენა…</string>
+    <!-- Notification title shown while downloading backup restore data -->
+    <string name="BackupProgressService_title_downloading">მიმდინარეობს სარეზერვო მონაცემების გადმოწერა…</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>
+    <!-- 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 -->
+    <string name="BackupsTypeSettingsFragment__google_pay">Google Pay</string>
+    <!-- Displayed as the user\'s payment method as a label in a preference row -->
+    <string name="BackupsTypeSettingsFragment__bank_transfer">Bank transfer</string>
+    <!-- Displayed as the user\'s payment method as a label in a preference row -->
+    <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>
+
+
     <!-- 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 ad0c53b8b4..d1ddeaa1f7 100644
--- a/app/src/main/res/values-kk/strings.xml
+++ b/app/src/main/res/values-kk/strings.xml
@@ -1,6 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- smartling.instruction_comments_enabled = on -->
-<resources>
+<?xml version="1.0" encoding="UTF-8"?><!-- 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> -->
@@ -89,6 +87,16 @@
     <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">Allow access to your location</string>
+    <!-- Dialog description that will explain the steps needed to give location permission -->
+    <string name="AttachmentManager_signal_to_send_location">To send your location:</string>
+    <!-- Alert dialog description asking for location permission -->
+    <string name="AttachmentManager_signal_allow_signal_access_location">Allow Molly access to send your location.</string>
+    <!-- Toast text explaining Signal\'s need for location access -->
+    <string name="AttachmentManager_signal_needs_location_access">Molly needs location access to send your location.</string>
+
     <!-- Alert dialog title to show the recipient has not activated payments -->
     <string name="AttachmentManager__not_activated_payments">%1$s Төлемдерді белсендірмеді </string>
     <!-- Alert dialog description to send the recipient a request to activate payments -->
@@ -241,7 +249,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>
@@ -386,8 +394,16 @@
     <string name="ConversationActivity_your_request_to_join_has_been_sent_to_the_group_admin">Топқа қосылу туралы өтінішіңіз топ әкімшісіне жіберілді. Олар шара қолданғанда, сізге хабарландыру келеді.</string>
     <string name="ConversationActivity_cancel_request">Өтініштен бас тарту</string>
 
-    <string name="ConversationActivity_to_send_audio_messages_allow_signal_access_to_your_microphone">Аудио хаттар жіберу үшін Molly қолданбасына микрофонды пайдалануына рұқсат етіңіз.</string>
+    <!-- Dialog title asking users for microphone permission -->
+    <string name="ConversationActivity_allow_access_microphone">Allow access to your microphone</string>
+    <!-- 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>
+    <!-- Toast text explaining Signal\'s need for microphone access -->
+    <string name="ConversationActivity_signal_needs_microphone_access_voice_message">Molly needs microphone access to record a voice message.</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 қоңырау шалу үшін 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>
@@ -411,10 +427,17 @@
     <string name="ConversationActivity_you_will_leave_this_group_and_it_will_be_deleted_from_all_of_your_devices">Сіз бұл топтан шығып кетесіз және ол сіздің барлық құрылғыларыңыздан жойылады.</string>
     <string name="ConversationActivity_delete">Жою</string>
     <string name="ConversationActivity_delete_and_leave">Жойып, шығып кету</string>
-    <string name="ConversationActivity__to_call_s_signal_needs_access_to_your_microphone">%1$s қоңырау шалу үшін Molly қолданбасына микрофонды пайдалануға рұқсат керек</string>
+
+    <!-- Dialog description that will explain the steps needed to give microphone permissions for a voice call -->
+    <string name="ConversationActivity__to_start_call">To start a 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">To start a call, allow Molly access to your microphone.</string>
+    <!-- Toast text explaining Signal\'s need for microphone access for a voice call -->
+    <string name="ConversationActivity_signal_needs_microphone_access_voice_call">Molly needs microphone access to start a call.</string>
 
 
     <string name="ConversationActivity_join">Қосылу</string>
+    <!-- Button text for an active group call but the call is currently full and unjoinable -->
     <string name="ConversationActivity_full">Толы</string>
 
     <string name="ConversationActivity_error_sending_media">Мультимедианы жіберу кезінде қате шықты</string>
@@ -613,6 +636,7 @@
     <string name="ConversationListFragment_unarchive">Мұрағатты ашу</string>
     <string name="ConversationListFragment_delete">Жою</string>
     <string name="ConversationListFragment_select_all">Барлығ. таңдау</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 таңдалды</item>
         <item quantity="other">%1$d таңдалды</item>
@@ -864,6 +888,7 @@
         <item quantity="one">Шақыру жіберілді</item>
         <item quantity="other">%1$d шақыру жіберілді</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">Сіз “%1$s” контактісін бұл топқа автоматты түрде қоса алмайсыз.\n\nОған шақыру жіберілді, ол шақыруды қабылдамайынша, топтағы хаттарды көре алмайды.</string>
     <string name="GroupManagement_invite_multiple_users">Сіз бұл пайдаланушыларды бұл топқа автоматты түрде қоса алмайсыз.\n\nОларға шақыру жіберілді, олар шақыруды қабылдамайынша, топтағы хаттарды көре алмайды.</string>
 
@@ -1044,7 +1069,9 @@
 
     <string name="ManageGroupActivity_edit_name_and_picture">Атауы мен суретін өзгерту</string>
     <string name="ManageGroupActivity_legacy_group">Ескі топ</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">Бұл – ескі топ. Топ әкімшілері сияқты функциялар тек Жаңа топтарда қолжетімді.</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">Бұл – ескі топ. @атап өту және әкімшілер сияқты жаңа функцияларды пайдалану үшін</string>
     <string name="ManageGroupActivity_legacy_group_too_large">Бұл Ескі топты Жаңа топқа жаңарту мүмкін емес, себебі ол өте үлкен. Максималды топ өлшемі – %1$d.</string>
     <string name="ManageGroupActivity_upgrade_this_group">осы топты жаңартыңыз.</string>
@@ -1271,6 +1298,7 @@
         <item quantity="other">Жою</item>
     </plurals>
 
+    <!-- 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 таңдалды (%2$s)</item>
         <item quantity="other">%1$d таңдалды (%2$s)</item>
@@ -1335,17 +1363,13 @@
     <string name="MessageRecord_left_group">Сіз топтан шығып кетіңіз.</string>
     <string name="MessageRecord_you_updated_group">Сіз аватарды жаңарттыңыз.</string>
     <string name="MessageRecord_the_group_was_updated">Бұл топ жаңартылды.</string>
-    <!-- Update message shown when placing an outgoing 1:1 voice/audio call and it\'s answered by the other party -->
+    <!-- Update message shown when placing an outgoing 1:1 voice/audio call -->
     <string name="MessageRecord_outgoing_voice_call">Шығыс дауыстық қоңырау</string>
-    <!-- Update message shown when placing an outgoing 1:1 video call and it\'s answered by the other party -->
+    <!-- Update message shown when placing an outgoing 1:1 video call -->
     <string name="MessageRecord_outgoing_video_call">Шығыс видеоқоңырау</string>
-    <!-- Update message shown when placing an outgoing 1:1 voice/audio call and it\'s not answered by the other party -->
-    <string name="MessageRecord_unanswered_voice_call">Жауап берілмеген дауыстық қоңырау</string>
-    <!-- Update message shown when placing an outgoing 1:1 video call and it\'s not answered by the other party -->
-    <string name="MessageRecord_unanswered_video_call">Жауап берілмеген видеоқоңырау</string>
-    <!-- Update message shown when receiving an incoming 1:1 voice/audio call and it\'s answered -->
+    <!-- Update message shown when receiving an incoming 1:1 voice/audio call and it\'s answered or ringing -->
     <string name="MessageRecord_incoming_voice_call">Кіріс дауыстық қоңырау</string>
-    <!-- Update message shown when receiving an incoming 1:1 video call and answered -->
+    <!-- Update message shown when receiving an incoming 1:1 video call and answered or ringing -->
     <string name="MessageRecord_incoming_video_call">Кіріс видеоқоңырау</string>
     <!-- Update message shown when receiving an incoming 1:1 voice/audio call and not answered -->
     <string name="MessageRecord_missed_voice_call">Қабылданбаған дауыстық қоңырау</string>
@@ -1355,10 +1379,6 @@
     <string name="MessageRecord_missed_voice_call_notification_profile">Хабарландыру профилі ашылып тұрғанда, дауыстық қоңырау қабылданбады</string>
     <!-- Update message shown when receiving an incoming video call and declined due to notification profile -->
     <string name="MessageRecord_missed_video_call_notification_profile">Хабарландыру профилі ашылып тұрғанда, видеоқоңырау қабылданбады</string>
-    <!-- Update message shown when receiving an incoming 1:1 voice/audio call and explicitly declined -->
-    <string name="MessageRecord_you_declined_a_voice_call">Дауыстық қоңырауды көтермедіңіз</string>
-    <!-- Update message shown when receiving an incoming 1:1 video call and explicitly declined -->
-    <string name="MessageRecord_you_declined_a_video_call">Видеоқоңырауды көтермедіңіз</string>
     <!-- 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>
@@ -1567,28 +1587,53 @@
     <string name="MessageRecord_can_accept_payments">%1$s енді Төлемдер қабылдай алады</string>
 
     <!-- Group Calling update messages -->
-    <string name="MessageRecord_s_started_a_group_call_s">%1$s топтық қоңырауды бастады · %2$s</string>
-    <string name="MessageRecord_you_started_a_group_call_s">Топтық қоңырау басталған уақыт · %1$s</string>
-    <string name="MessageRecord_s_is_in_the_group_call_s">%1$s топтық қоңырауға қатысып отыр · %2$s</string>
-    <string name="MessageRecord_you_are_in_the_group_call_s1">Топтық қоңырауға қатысып отырсыз · %1$s</string>
-    <string name="MessageRecord_s_and_s_are_in_the_group_call_s1">%1$s және %2$s топтық қоңырауға қатысып отыр · %3$s</string>
-    <string name="MessageRecord_group_call_s">Топтық қоңырау · %1$s</string>
-
-    <string name="MessageRecord_s_started_a_group_call">%1$s топтық қоңырауды бастады</string>
-    <string name="MessageRecord_you_started_a_group_call">Топтық қоңырау бастадыңыз</string>
-    <string name="MessageRecord_s_is_in_the_group_call">%1$s топтық қоңырауға қатысып отыр</string>
-    <string name="MessageRecord_you_are_in_the_group_call">Топтық қоңырауға қатысып отырсыз</string>
-    <string name="MessageRecord_s_and_s_are_in_the_group_call">%1$s және %2$s топтық қоңырауға қатысып отыр</string>
-    <string name="MessageRecord_group_call">Топтық қоңырау</string>
+    <!-- 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 байланыста · %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">Сіз байланыстасыз · %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 және %2$s  байланыста · %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 байланыста</string>
+    <!-- Chat log text for an ongoing group call only the local user has joined -->
+    <string name="MessageRecord_you_are_in_the_call">Сіз байланыстасыз</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 және %2$s байланыста</string>
+    <!-- Chat log text for a group call that ended within the last 5 minutes -->
+    <string name="MessageRecord__the_video_call_has_ended">Видеоқоңырау аяқталды</string>
+    <!-- Chat log text for a group call that ended within the last 5 minutes with a placeholder for formatted time -->
+    <string name="MessageRecord__the_video_call_has_ended_s">Видеоқоңырау аяқталды · %1$s</string>
+    <!-- Chat log text for a group call that ended more than 5 minutes ago and was missed -->
+    <string name="MessageRecord__missed_video_call">Қабылданбаған видеоқоңырау</string>
+    <!-- Chat log text for a group call that ended more than 5 minutes ago and was missed with a placeholder for formatted time -->
+    <string name="MessageRecord__missed_video_call_s">Өткізіп алған видеоқоңырау · %1$s</string>
+    <!-- Chat log text for a group call that ended that the local user did not start -->
+    <string name="MessageRecord__incoming_video_call">Кіріс видеоқоңырау</string>
+    <!-- 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">Сізге видеоқоңырау шалынды · %1$s</string>
+    <!-- Chat log text for a group call that ended that the local user started -->
+    <string name="MessageRecord__outgoing_video_call">Шығыс видеоқоңырау</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">Сіз видеоқоңырау шалдыңыз · %1$s</string>
+    <!-- Chat log text for an ongoing group call that the local user started -->
+    <string name="MessageRecord__you_started_a_video_call">Видеоқоңырауды бастадыңыз</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">Видеоқоңырау бастадыңыз · %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 видеоқоңырау бастады</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 видеоқоңырау бастады · %2$s</string>
 
     <string name="MessageRecord_you">Сіз</string>
 
-    <plurals name="MessageRecord_s_s_and_d_others_are_in_the_group_call_s">
+    <!-- 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 және тағы %3$d адам топтық қоңырауға қатысып отыр · %4$s</item>
         <item quantity="other">%1$s, %2$s және тағы %3$d адам топтық қоңырауға қатысып отыр · %4$s</item>
     </plurals>
 
-    <plurals name="MessageRecord_s_s_and_d_others_are_in_the_group_call">
+    <!-- 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 және тағы %3$d адам топтық қоңырауға қатысып отыр</item>
         <item quantity="other">%1$s, %2$s және тағы %3$d адам топтық қоңырауға қатысып отыр</item>
     </plurals>
@@ -2063,6 +2108,7 @@
     <!-- Generic error when the app is unable to request an SMS code for an unknown reason. -->
     <string name="RegistrationActivity_unable_to_request_verification_code">Верификация кодын сұрау мүмкін емес. Желі байланысын тексеріп, қайталап көріңіз.</string>
     <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">Molly Android - Телефон нөмірінің форматы</string>
     <!--    Small "toast" notification to the user confirming that they have requested a new code via voice call.-->
@@ -2207,7 +2253,7 @@
     <string name="SubmitDebugLogActivity_this_log_will_be_posted_publicly_online_for_contributors">Қатысушылардың көруі үшін, бұл журнал жалпыға ортақ жарияланады. Оны жүктеп салмас бұрын тексеруіңізге болады.</string>
 
     <!-- SupportEmailUtil -->
-  <!-- Removed by excludeNonTranslatables <string name="SupportEmailUtil_support_email" translatable="false">support@molly.im</string> -->
+  <!-- Removed by excludeNonTranslatables <string name="SupportEmailUtil_support_email" translatable="false">support@signal.org</string> -->
     <string name="SupportEmailUtil_filter">Сүзгі:</string>
     <string name="SupportEmailUtil_device_info">Құрылғы ақпараты:</string>
     <string name="SupportEmailUtil_android_version">Android нұсқасы:</string>
@@ -2709,6 +2755,8 @@
     <string name="ConversationUpdateItem_loading">Жүктеу</string>
     <string name="ConversationUpdateItem_learn_more">Толық ақпарат</string>
     <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_call_is_full">Қоңырауға бұдан артық адам қосыла алмайды</string>
     <string name="ConversationUpdateItem_invite_friends">Достарды шақыру</string>
@@ -2773,6 +2821,7 @@
     <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">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>
 
     <!-- EnableCallNotificationSettingsDialog__call_notifications_checklist -->
@@ -3086,6 +3135,7 @@
 
     <string name="arrays__default">Әдепкі параметр</string>
     <string name="arrays__high">Жоғары</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">Макс.</string>
 
     <!-- plurals.xml -->
@@ -3357,7 +3407,7 @@
     <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">Molly қолданбасындағы төлемдер бұдан былай қолжетімді емес. Сонда да қаражатты айырбастау платформасына жіберуіңізге болады, дегенмен енді төлемдер жіберу және қабылдау немесе қаражатты қосу мүмкін емес.</string>
@@ -3406,6 +3456,14 @@
     <!-- Storage permission row description -->
     <string name="GrantPermissionsFragment__send_photos_videos_and_files">Құрылғыңыздан фотосуреттер, видеолар және файлдар жіберіңіз.</string>
 
+    <!-- PermissionDeniedBottomSheet -->
+    <!-- Sheet describing step 1 on how to give permissions by opening settings -->
+    <string name="PermissionDeniedBottomSheet__1_tap_settings_below">1. Tap “Settings” below</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 Allow the permission</string>
+    <!-- Label for button at the bottom of the sheet which opens the system permission settings -->
+    <string name="PermissionDeniedBottomSheet__settings">Settings</string>
+
     <!-- PaymentsSecuritySetupFragment -->
     <!-- Toolbar title -->
     <string name="PaymentsSecuritySetupFragment__security_setup">Қауіпсіздік параметрлерін реттеу</string>
@@ -3446,6 +3504,7 @@
     <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">To</string>
     <string name="PaymentsDetailsFragment__from">From</string>
     <string name="PaymentsDetailsFragment__information">Транзакция мәліметтері, оның ішінде төлем сомасы және транзакция уақыты – MobileCoin тіркеу кітабының бір бөлігі.</string>
@@ -3508,6 +3567,7 @@
     <string name="ConfirmPayment__confirm_payment">Төлемді растау</string>
     <string name="ConfirmPayment__network_fee">Желі ақысы</string>
     <string name="ConfirmPayment__estimated_s">Болжалды %1$s</string>
+    <!-- Prefix to a name to indicate who a payment will be sent to -->
     <string name="ConfirmPayment__to">To</string>
     <string name="ConfirmPayment__total_amount">Жалпы сома</string>
     <string name="ConfirmPayment__balance_s">Баланс: %1$s</string>
@@ -3658,6 +3718,14 @@
     <string name="conversation_group_options__conversation">Чат</string>
     <string name="conversation_group_options__broadcast">Трансляция</string>
 
+    <!-- DoubleTapEditEducationSheet -->
+    <!-- Displayed as the title of the education bottom sheet -->
+    <string name="DoubleTapEditEducationSheet__double_tap_edit_title">Double tap to edit</string>
+    <!-- Text on the sheet explaining how double tapping on a message will let them edit it -->
+    <string name="DoubleTapEditEducationSheet__quickly_tap_twice">Quickly tap twice on your messages to edit them. You can edit your messages up to 24hrs after they’ve been sent.</string>
+    <!-- Button label to dismiss sheet -->
+    <string name="DoubleTapEditEducationSheet__got_it">Got it</string>
+
     <!-- text_secure_normal -->
     <string name="text_secure_normal__menu_new_group">Жаңа топ</string>
     <string name="text_secure_normal__menu_settings">Параметрлер</string>
@@ -4112,6 +4180,7 @@
     <string name="RecipientBottomSheet_copied_to_clipboard">Буферге көшірілді</string>
 
     <string name="GroupRecipientListItem_admin">Әкімші</string>
+    <!-- Button text to approve a user that has requested to join a group -->
     <string name="GroupRecipientListItem_approve_description">Мақұлдау</string>
     <string name="GroupRecipientListItem_deny_description">Қабылдамау</string>
 
@@ -4139,6 +4208,7 @@
 
     <!-- VoiceNoteMediaDescriptionCompatFactory -->
     <string name="VoiceNoteMediaItemFactory__voice_message">Дауыстық хат · %1$s</string>
+    <!-- This is a title in a banner describing the conversation sender to receiver placeholders of the currently playing voice memo. -->
     <string name="VoiceNoteMediaItemFactory__s_to_s">%1$s – %2$s</string>
 
     <!-- StorageUtil -->
@@ -4152,8 +4222,16 @@
     <string name="ReviewCardDialogFragment__review_members">Топ мүшелерін қарап шығу</string>
     <!-- Title of a screen where the user will be prompted to review a message request matching the name of someone they already know -->
     <string name="ReviewCardDialogFragment__review_request">Өтінішті қарап шығу</string>
-    <string name="ReviewCardDialogFragment__d_group_members_have_the_same_name">%1$d топ мүшесінің аттары бірдей, төмендегі топ мүшелерін қарап шығып, тиісті шара қолданыңыз.</string>
-    <string name="ReviewCardDialogFragment__if_youre_not_sure">Бұл өтініштің кімнен келгенін біле алмасаңыз, төмендегі контактілерді қарап шығып, тиісті шара қолданыңыз.</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="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 -->
+    <plurals name="ReviewCardDialogFragment__if_youre_not_sure">
+        <item quantity="one">If you\'re not sure who the request is from, review the contact below and take action.</item>
+        <item quantity="other">If you\'re not sure who the request is from, review the contacts below and take action.</item>
+    </plurals>
     <string name="ReviewCardDialogFragment__no_other_groups_in_common">Басқа ортақ топтар жоқ.</string>
     <string name="ReviewCardDialogFragment__no_groups_in_common">Ортақ топтар жоқ.</string>
     <plurals name="ReviewCardDialogFragment__d_other_groups_in_common">
@@ -4184,11 +4262,20 @@
     <string name="CallParticipantsListUpdatePopupWindow__s_joined">%1$s қосылды</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_and_s_joined">%1$s және %2$s қосылды</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_s_and_s_joined">%1$s, %2$s және %3$s қосылды</string>
-    <string name="CallParticipantsListUpdatePopupWindow__s_s_and_d_others_joined">%1$s, %2$s және тағы %3$d адам қосылды</string>
+    <!-- Toast message shown in group call when 3 or more people join -->
+    <plurals name="CallParticipantsListUpdatePopupWindow__s_s_and_d_others_joined">
+        <item quantity="one">%1$s, %2$s and %3$d other joined</item>
+        <item quantity="other">%1$s, %2$s and %3$d others joined</item>
+    </plurals>
+    <!-- Toast/popup text shown when someone leaves a group call -->
     <string name="CallParticipantsListUpdatePopupWindow__s_left">%1$s шығып кетті</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_and_s_left">%1$s және %2$s шығып кетті</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_s_and_s_left">%1$s, %2$s және %3$s шығып кетті</string>
-    <string name="CallParticipantsListUpdatePopupWindow__s_s_and_d_others_left">%1$s, %2$s және тағы %3$d адам шығып кетті</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 and %3$d other left</item>
+        <item quantity="other">%1$s, %2$s and %3$d others left</item>
+    </plurals>
 
     <string name="CallParticipant__you">Сіз</string>
     <string name="CallParticipant__you_on_another_device">Сіз (басқа құрылғыда)</string>
@@ -4558,10 +4645,15 @@
 
     <!-- PrivacySettingsFragment -->
     <string name="PrivacySettingsFragment__blocked">Блокталған</string>
-    <string name="PrivacySettingsFragment__d_contacts">%1$d контакт</string>
+    <!-- Settings label that shows the number blocked contacts -->
+    <plurals name="PrivacySettingsFragment__d_contacts">
+        <item quantity="one">%1$d contact</item>
+        <item quantity="other">%1$d contacts</item>
+    </plurals>
     <string name="PrivacySettingsFragment__messaging">Хат алмасу</string>
     <string name="PrivacySettingsFragment__disappearing_messages">Disappearing messages</string>
     <string name="PrivacySettingsFragment__app_security">Қолданба қауіпсіздігі</string>
+    <!-- This refers to the multi-tasking overview (recent apps) from the Android operating system.-->
     <string name="PrivacySettingsFragment__block_screenshots_in_the_recents_list_and_inside_the_app">Соңғылар тізімінде және қолданбаның ішінде скиншоттарды блоктау</string>
     <string name="PrivacySettingsFragment__signal_message_and_calls">Signal хаттары мен қоңыраулары, үнемі ретрансляциялық қоңыраулар және қорғалған жіберуші</string>
     <string name="PrivacySettingsFragment__default_timer_for_new_changes">Жаңа чаттарға арналған әдепкі таймер</string>
@@ -4618,11 +4710,14 @@
     <string name="DataAndStorageSettingsFragment__media_quality">Мультимедиа сапасы</string>
     <string name="DataAndStorageSettingsFragment__sent_media_quality">Жіберілген мультимедиа сапасы</string>
     <string name="DataAndStorageSettingsFragment__sending_high_quality_media_will_use_more_data">Жоғары сапалы мультимедианы жібергенде, трафик көбірек қолданылады.</string>
+    <!-- Setting option that can be selected to default media to be sent as high quality by default -->
     <string name="DataAndStorageSettingsFragment__high">Жоғары</string>
+    <!-- Setting option that can be selected to default media to be sent as standard quality by default -->
     <string name="DataAndStorageSettingsFragment__standard">Стандарт</string>
     <string name="DataAndStorageSettingsFragment__calls">Қоңыраулар</string>
 
     <!-- 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__use_custom_colors">Реттелмелі түстерді қолдану</string>
     <string name="ChatColorSelectionFragment__chat_color">Чат түсі</string>
@@ -4834,6 +4929,7 @@
     <string name="AvatarPickerFragment__take_a_picture">Суретке түсіру</string>
     <string name="AvatarPickerFragment__choose_a_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>
     <string name="AvatarPickerFragment__clear_avatar">Аватарды тазарту</string>
@@ -4894,7 +4990,7 @@
     <string name="MediaReviewFragment__add_a_message">Хат қосу</string>
     <string name="MediaReviewFragment__add_a_reply">Жауап қосу</string>
     <string name="MediaReviewFragment__send_to">Алушы</string>
-    <string name="MediaReviewFragment__view_once_message">Бір рет көрінетін хат</string>
+    <string name="MediaReviewFragment__view_once_message">Бір рет көрілетін мультимедиа</string>
     <string name="MediaReviewFragment__one_or_more_items_were_too_large">Бір немесе бірнеше элемент өте үлкен болды</string>
     <string name="MediaReviewFragment__one_or_more_items_were_invalid">Бір немесе бірнеше элемент дұрыс болмады</string>
     <string name="MediaReviewFragment__too_many_items_selected">Тым көп элемент таңдалды</string>
@@ -5487,7 +5583,7 @@
     <string name="StoryViewerFragment__s_s">%1$s %2$s</string>
     <!-- Displayed when viewing a post you sent -->
     <string name="StoryViewerPageFragment__you">Сіз</string>
-    <!-- Displayed when viewing a post displayed to a group -->
+    <!-- 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 -->
     <string name="StoryViewerPageFragment__reply">Жауап қату</string>
@@ -6680,7 +6776,7 @@
     <!-- Title displayed at the top of the screen -->
     <string name="NicknameActivity__nickname">Лақап ат</string>
     <!-- Subtitle displayed under title -->
-    <string name="NicknameActivity__nicknames_amp_notes">Nicknames &amp; notes are stored with Signal and end-to-end encrypted. They are only visible to you.</string>
+    <string name="NicknameActivity__nicknames_amp_notes">Лақап аттар мен ескертпелер Signal-да сақталады және толықтай шифрланады. Ол тек сізге көрінеді.</string>
     <!-- Field label for given name -->
     <string name="NicknameActivity__first_name">Аты</string>
     <!-- Content description for first name clear button -->
@@ -6694,9 +6790,9 @@
     <!-- Button label to save -->
     <string name="NicknameActivity__save">Сақтау</string>
     <!-- Dialog title for note and name deletion -->
-    <string name="NicknameActivity__delete_nickname">Delete?</string>
+    <string name="NicknameActivity__delete_nickname">Жою керек пе?</string>
     <!-- Dialog message for note and name deletion -->
-    <string name="NicknameActivity__this_will_permanently_delete_this_nickname_and_note">This will permanently delete any nickname and note you’ve set.</string>
+    <string name="NicknameActivity__this_will_permanently_delete_this_nickname_and_note">Бұл функция сіз орнатқан кез келген лақап атты және ескертпені біржола жояды.</string>
 
     <!-- ViewNoteBottomSheetDialogFragment -->
     <!-- Sheet title -->
@@ -6704,5 +6800,26 @@
     <!-- Content description for opening the note editor -->
     <string name="ViewNoteSheet__edit_note">Ескертпені өзгерту</string>
 
+    <!-- BackupProgressService -->
+    <!-- Notification title shown while backup restore job is running -->
+    <string name="BackupProgressService_title">Резервтік дерек қалпына келтірілуде…</string>
+    <!-- Notification title shown while downloading backup restore data -->
+    <string name="BackupProgressService_title_downloading">Резервтік дерек жүктеп алынуда…</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>
+    <!-- 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 -->
+    <string name="BackupsTypeSettingsFragment__google_pay">Google Pay</string>
+    <!-- Displayed as the user\'s payment method as a label in a preference row -->
+    <string name="BackupsTypeSettingsFragment__bank_transfer">Bank transfer</string>
+    <!-- Displayed as the user\'s payment method as a label in a preference row -->
+    <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>
+
+
     <!-- 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 e7620a5453..37e1e9767d 100644
--- a/app/src/main/res/values-km/strings.xml
+++ b/app/src/main/res/values-km/strings.xml
@@ -1,6 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- smartling.instruction_comments_enabled = on -->
-<resources>
+<?xml version="1.0" encoding="UTF-8"?><!-- 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> -->
@@ -89,6 +87,16 @@
     <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">Allow access to your location</string>
+    <!-- Dialog description that will explain the steps needed to give location permission -->
+    <string name="AttachmentManager_signal_to_send_location">To send your location:</string>
+    <!-- Alert dialog description asking for location permission -->
+    <string name="AttachmentManager_signal_allow_signal_access_location">Allow Molly access to send your location.</string>
+    <!-- Toast text explaining Signal\'s need for location access -->
+    <string name="AttachmentManager_signal_needs_location_access">Molly needs location access to send your location.</string>
+
     <!-- Alert dialog title to show the recipient has not activated payments -->
     <string name="AttachmentManager__not_activated_payments">%1$s មិនទាន់បានបើកដំណើរការការបង់ប្រាក់ </string>
     <!-- Alert dialog description to send the recipient a request to activate payments -->
@@ -240,7 +248,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>
@@ -383,8 +391,16 @@
     <string name="ConversationActivity_your_request_to_join_has_been_sent_to_the_group_admin">ការស្នើសុំរបស់អ្នកដើម្បីចូលក្រុម ត្រូវបានផ្ញើទៅកាន់អ្នកគ្រប់គ្រងក្រុម។ អ្នកនឹងទទួលដំណឹង នៅពេលគេមានសកម្មភាព។</string>
     <string name="ConversationActivity_cancel_request">បោះបង់ការស្នើសុំ</string>
 
-    <string name="ConversationActivity_to_send_audio_messages_allow_signal_access_to_your_microphone">ដើម្បីផ្ញើសារជាសំឡេង អនុញ្ញាតឱ្យ Molly ចូលទៅប្រើប្រាស់មីក្រូហ្វូនរបស់អ្នក។</string>
+    <!-- Dialog title asking users for microphone permission -->
+    <string name="ConversationActivity_allow_access_microphone">Allow access to your microphone</string>
+    <!-- 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>
+    <!-- Toast text explaining Signal\'s need for microphone access -->
+    <string name="ConversationActivity_signal_needs_microphone_access_voice_message">Molly needs microphone access to record a voice message.</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">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>
@@ -408,10 +424,17 @@
     <string name="ConversationActivity_you_will_leave_this_group_and_it_will_be_deleted_from_all_of_your_devices">អ្នកនឹងចាកចេញពីក្រុមនេះ ហើយវានឹងត្រូវបានលុបចេញពីឧបករណ៍របស់អ្នកទាំងអស់។</string>
     <string name="ConversationActivity_delete">លុប</string>
     <string name="ConversationActivity_delete_and_leave">លុប និងចាកចេញ</string>
-    <string name="ConversationActivity__to_call_s_signal_needs_access_to_your_microphone">ដើម្បីហៅទៅ %1$s, Molly ត្រូវការចូលប្រើប្រាស់ម៉ៃក្រូហ្វូនរបស់អ្នក។</string>
+
+    <!-- Dialog description that will explain the steps needed to give microphone permissions for a voice call -->
+    <string name="ConversationActivity__to_start_call">To start a 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">To start a call, allow Molly access to your microphone.</string>
+    <!-- Toast text explaining Signal\'s need for microphone access for a voice call -->
+    <string name="ConversationActivity_signal_needs_microphone_access_voice_call">Molly needs microphone access to start a call.</string>
 
 
     <string name="ConversationActivity_join">ចូលរួម</string>
+    <!-- Button text for an active group call but the call is currently full and unjoinable -->
     <string name="ConversationActivity_full">ពេញ</string>
 
     <string name="ConversationActivity_error_sending_media">បញ្ហាបញ្ជូនមេឌា</string>
@@ -597,6 +620,7 @@
     <string name="ConversationListFragment_unarchive">លុបពីបណ្ណសារ</string>
     <string name="ConversationListFragment_delete">លុប</string>
     <string name="ConversationListFragment_select_all">រើសយកទាំងអស់</string>
+    <!-- Screen title shown when selecting multiple items from a list like conversation threads or call logs. -->
     <plurals name="ConversationListFragment_s_selected">
         <item quantity="other">%1$d បានជ្រើសរើស</item>
     </plurals>
@@ -845,6 +869,7 @@
     <plurals name="GroupManagement_invitation_sent">
         <item quantity="other">ការអញ្ជើញ%1$d បានផ្ញើ</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">“%1$s” មិនអាចបន្ថែមដោយស្វ័យប្រវត្តិចូលក្រុមនេះដោយអ្នកបានទេ។.\n\nពួកគេត្រូវបានអញ្ជើញចូលរួម ហើយនឹងមិនឃើញសារក្នុងក្រុម នោះទេ រហូតដល់ពួកគេយល់ព្រមការចូលរួម។</string>
     <string name="GroupManagement_invite_multiple_users">អ្នកប្រើប្រាស់ទាំងនេះ មិនអាចបន្ថែមដោយស្វ័យប្រវត្តិចូលក្រុមនេះដោយអ្នកបានទេ។.\n\nពួកគេត្រូវបានអញ្ជើញចូលរួម ហើយពួកគេនឹងមិនឃើញសារក្នុងក្រុមនោះទេ រហូតដល់ពួកគេយល់ព្រមការចូលរួម។</string>
 
@@ -1009,7 +1034,9 @@
 
     <string name="ManageGroupActivity_edit_name_and_picture">កែប្រែឈ្មោះ និងរូបភាព</string>
     <string name="ManageGroupActivity_legacy_group">ក្រុមមុន</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">នេះជាក្រុមជំនាន់មុនមួយ។ មុខងារដូចជា អ្នកគ្រប់គ្រងក្រុម មានតែសម្រាប់ក្រុមថ្មីប៉ុណ្ណោះ។</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">នេះជាក្រុមជំនាន់មុន។ ដើម្បីចូលប្រើប្រាស់មុខងារថ្មី ដូចជា @mentions និងអ្នកគ្រប់គ្រង</string>
     <string name="ManageGroupActivity_legacy_group_too_large">នេះជាក្រុមជំនាន់មុន មិនអាចដំឡើងទៅក្រុមថ្មីបាន ដោយសារវាមានទំហំធំពេក។ ទំហំអតិបរមារបស់ក្រុមគឺ %1$d។</string>
     <string name="ManageGroupActivity_upgrade_this_group">ដំឡើងក្រុមនេះ។</string>
@@ -1227,6 +1254,7 @@
         <item quantity="other">លុប</item>
     </plurals>
 
+    <!-- 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="other">%1$d បានជ្រើសរើស (%2$s)</item>
     </plurals>
@@ -1290,17 +1318,13 @@
     <string name="MessageRecord_left_group">អ្នកបានចាកចេញពីក្រុម។</string>
     <string name="MessageRecord_you_updated_group">អ្នកបានធ្វើបច្ចុប្បន្នភាពក្រុម។</string>
     <string name="MessageRecord_the_group_was_updated">ក្រុមនេះ ត្រូវបានធ្វើបច្ចុប្បន្នភាព។</string>
-    <!-- Update message shown when placing an outgoing 1:1 voice/audio call and it\'s answered by the other party -->
+    <!-- Update message shown when placing an outgoing 1:1 voice/audio call -->
     <string name="MessageRecord_outgoing_voice_call">ការហៅចេញជាសំឡេង</string>
-    <!-- Update message shown when placing an outgoing 1:1 video call and it\'s answered by the other party -->
+    <!-- Update message shown when placing an outgoing 1:1 video call -->
     <string name="MessageRecord_outgoing_video_call">ការហៅចេញជាវីដេអូ</string>
-    <!-- Update message shown when placing an outgoing 1:1 voice/audio call and it\'s not answered by the other party -->
-    <string name="MessageRecord_unanswered_voice_call">ការហៅជាសំឡេងដែលមិនបានឆ្លើយតប</string>
-    <!-- Update message shown when placing an outgoing 1:1 video call and it\'s not answered by the other party -->
-    <string name="MessageRecord_unanswered_video_call">ការហៅជាវីដេអូដែលមិនបានឆ្លើយតប</string>
-    <!-- Update message shown when receiving an incoming 1:1 voice/audio call and it\'s answered -->
+    <!-- Update message shown when receiving an incoming 1:1 voice/audio call and it\'s answered or ringing -->
     <string name="MessageRecord_incoming_voice_call">ការហៅចូលជាសំឡេង</string>
-    <!-- Update message shown when receiving an incoming 1:1 video call and answered -->
+    <!-- Update message shown when receiving an incoming 1:1 video call and answered or ringing -->
     <string name="MessageRecord_incoming_video_call">ការហៅចូលជាវីដេអូ</string>
     <!-- Update message shown when receiving an incoming 1:1 voice/audio call and not answered -->
     <string name="MessageRecord_missed_voice_call">ការហៅជាសំឡេងខកមិនបានទទួល</string>
@@ -1310,10 +1334,6 @@
     <string name="MessageRecord_missed_voice_call_notification_profile">ខកមិនបានទទួលការហៅជាសំឡេង ពេលបើកប្រូហ្វាល់ជូនដំណឹង</string>
     <!-- Update message shown when receiving an incoming video call and declined due to notification profile -->
     <string name="MessageRecord_missed_video_call_notification_profile">ខកមិនបានទទួលការហៅជាវីដេអូ ពេលបើកប្រូហ្វាល់ជូនដំណឹង</string>
-    <!-- Update message shown when receiving an incoming 1:1 voice/audio call and explicitly declined -->
-    <string name="MessageRecord_you_declined_a_voice_call">អ្នកមិនព្រមទទួលការហៅជាសំឡេង</string>
-    <!-- Update message shown when receiving an incoming 1:1 video call and explicitly declined -->
-    <string name="MessageRecord_you_declined_a_video_call">អ្នកមិនព្រមទទួលការហៅជាវីដេអូ</string>
     <!-- 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>
@@ -1514,27 +1534,52 @@
     <string name="MessageRecord_can_accept_payments">%1$s ឥឡូវអាចទទួលយកការបង់ប្រាក់បាន</string>
 
     <!-- Group Calling update messages -->
-    <string name="MessageRecord_s_started_a_group_call_s">%1$s បានចាប់ផ្តើមការហៅជាក្រុម · %2$s</string>
-    <string name="MessageRecord_you_started_a_group_call_s">អ្នកបានចាប់ផ្តើមការហៅជាក្រុម · %1$s</string>
-    <string name="MessageRecord_s_is_in_the_group_call_s">%1$s នៅក្នុងការហៅជាក្រុម · %2$s</string>
-    <string name="MessageRecord_you_are_in_the_group_call_s1">អ្នកនៅក្នុងការហៅជាក្រុម · %1$s</string>
-    <string name="MessageRecord_s_and_s_are_in_the_group_call_s1">%1$s និង %2$s នៅក្នុងការហៅជាក្រុម · %3$s</string>
-    <string name="MessageRecord_group_call_s">ការហៅជាក្រុម · %1$s</string>
-
-    <string name="MessageRecord_s_started_a_group_call">%1$s បានចាប់ផ្តើមការហៅជាក្រុម</string>
-    <string name="MessageRecord_you_started_a_group_call">អ្នកបានចាប់ផ្តើមការហៅជាក្រុម</string>
-    <string name="MessageRecord_s_is_in_the_group_call">%1$s នៅក្នុងការហៅជាក្រុម</string>
-    <string name="MessageRecord_you_are_in_the_group_call">អ្នកនៅក្នុងការហៅជាក្រុម</string>
-    <string name="MessageRecord_s_and_s_are_in_the_group_call">%1$s និង %2$s នៅក្នុងការហៅជាក្រុម</string>
-    <string name="MessageRecord_group_call">ការហៅជាក្រុម</string>
+    <!-- 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 កំពុងនៅក្នុងការហៅ · %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">អ្នកកំពុងនៅក្នុងការហៅ · %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 និង %2$s កំពុងនៅក្នុងការហៅ · %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 កំពុងនៅក្នុងការហៅ</string>
+    <!-- Chat log text for an ongoing group call only the local user has joined -->
+    <string name="MessageRecord_you_are_in_the_call">អ្នកកំពុងនៅក្នុងការហៅ</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 និង %2$s កំពុងនៅក្នុងការហៅនេះ</string>
+    <!-- Chat log text for a group call that ended within the last 5 minutes -->
+    <string name="MessageRecord__the_video_call_has_ended">ការហៅជាវីដេអូបានបញ្ចប់</string>
+    <!-- Chat log text for a group call that ended within the last 5 minutes with a placeholder for formatted time -->
+    <string name="MessageRecord__the_video_call_has_ended_s">ការហៅជាវីដេអូបានបញ្ចប់ · %1$s</string>
+    <!-- Chat log text for a group call that ended more than 5 minutes ago and was missed -->
+    <string name="MessageRecord__missed_video_call">ការហៅជាវីដេអូខកមិនបានទទួល</string>
+    <!-- Chat log text for a group call that ended more than 5 minutes ago and was missed with a placeholder for formatted time -->
+    <string name="MessageRecord__missed_video_call_s">ខកខានការហៅជាវីដេអូ · %1$s</string>
+    <!-- Chat log text for a group call that ended that the local user did not start -->
+    <string name="MessageRecord__incoming_video_call">ការហៅចូលជាវីដេអូ</string>
+    <!-- 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">ការហៅចូលជាវីដេអូ · %1$s</string>
+    <!-- Chat log text for a group call that ended that the local user started -->
+    <string name="MessageRecord__outgoing_video_call">ការហៅចេញជាវីដេអូ</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">ការហៅចេញជាវីដេអូ · %1$s</string>
+    <!-- Chat log text for an ongoing group call that the local user started -->
+    <string name="MessageRecord__you_started_a_video_call">អ្នកបានចាប់ផ្តើមការហៅជាវីដេអូ</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">អ្នកបានចាប់ផ្តើមការហៅជាវីដេអូ · %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 បានចាប់ផ្តើមការហៅជាវីដេអូ</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 បានចាប់ផ្តើមការហៅជាវីដេអូ · %2$s</string>
 
     <string name="MessageRecord_you">អ្នក</string>
 
-    <plurals name="MessageRecord_s_s_and_d_others_are_in_the_group_call_s">
+    <!-- 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="other">%1$s, %2$s, និង%3$d ផ្សេងទៀតនៅក្នុងការហៅជាក្រុម · %4$s</item>
     </plurals>
 
-    <plurals name="MessageRecord_s_s_and_d_others_are_in_the_group_call">
+    <!-- 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="other">%1$s, %2$s, និង%3$d ផ្សេងទៀតនៅក្នុងការហៅជាក្រុម</item>
     </plurals>
 
@@ -1984,6 +2029,7 @@
     <!-- Generic error when the app is unable to request an SMS code for an unknown reason. -->
     <string name="RegistrationActivity_unable_to_request_verification_code">មិនអាចស្នើសុំលេខកូដផ្ទៀងផ្ទាត់បានទេ។ សូមពិនិត្យមើលការតភ្ជាប់បណ្តាញរបស់អ្នក ហើយព្យាយាមម្តងទៀត។</string>
     <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">Molly Android - ទម្រង់លេខទូរស័ព្ទ</string>
     <!--    Small "toast" notification to the user confirming that they have requested a new code via voice call.-->
@@ -2127,7 +2173,7 @@
     <string name="SubmitDebugLogActivity_this_log_will_be_posted_publicly_online_for_contributors">កំណត់ត្រានេះ នឹងបិទផ្សាយជាសាធារណៈតាមអនឡាញ បង្ហាញដល់អ្នករួមចំណែក។ អ្នកអាចពិនិត្យមុនពេលផ្ទុក។</string>
 
     <!-- SupportEmailUtil -->
-  <!-- Removed by excludeNonTranslatables <string name="SupportEmailUtil_support_email" translatable="false">support@molly.im</string> -->
+  <!-- Removed by excludeNonTranslatables <string name="SupportEmailUtil_support_email" translatable="false">support@signal.org</string> -->
     <string name="SupportEmailUtil_filter">តម្រង៖</string>
     <string name="SupportEmailUtil_device_info">ព័ត៌មានឧបករណ៍៖</string>
     <string name="SupportEmailUtil_android_version">ជំនាន់ Android៖</string>
@@ -2622,6 +2668,8 @@
     <string name="ConversationUpdateItem_loading">កំពុងផ្ទុក</string>
     <string name="ConversationUpdateItem_learn_more">សិក្សាបន្ថែម</string>
     <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_call_is_full">ការហៅពេញ</string>
     <string name="ConversationUpdateItem_invite_friends">អញ្ជើញមិត្តភក្តិ</string>
@@ -2686,6 +2734,7 @@
     <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>
 
     <!-- EnableCallNotificationSettingsDialog__call_notifications_checklist -->
@@ -2992,6 +3041,7 @@
 
     <string name="arrays__default">លំនាំដើម</string>
     <string name="arrays__high">ខ្ពស់</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">អតិបរិមា</string>
 
     <!-- plurals.xml -->
@@ -3260,7 +3310,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">អ្នកអាចប្រើ 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">ការទូទាត់នៅក្នុង Molly លែងមានហើយ។ អ្នកនៅតែអាចផ្ទេរប្រាក់ទៅកន្លែងប្តូរប្រាក់បាន ប៉ុន្តែអ្នកមិនអាចផ្ញើ និងទទួលការទូទាត់ ឬបន្ថែមថវិកាបានទេ។</string>
@@ -3309,6 +3359,14 @@
     <!-- Storage permission row description -->
     <string name="GrantPermissionsFragment__send_photos_videos_and_files">ផ្ញើរូបថត វីដេអូ និងឯកសារពីឧបករណ៍របស់អ្នក។</string>
 
+    <!-- PermissionDeniedBottomSheet -->
+    <!-- Sheet describing step 1 on how to give permissions by opening settings -->
+    <string name="PermissionDeniedBottomSheet__1_tap_settings_below">1. Tap “Settings” below</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 Allow the permission</string>
+    <!-- Label for button at the bottom of the sheet which opens the system permission settings -->
+    <string name="PermissionDeniedBottomSheet__settings">Settings</string>
+
     <!-- PaymentsSecuritySetupFragment -->
     <!-- Toolbar title -->
     <string name="PaymentsSecuritySetupFragment__security_setup">ការរៀបចំប្រព័ន្ធសុវត្ថិភាព</string>
@@ -3349,6 +3407,7 @@
     <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__information">ព័ត៌មានលម្អិតអំពីប្រតិបត្តិការ រួមទាំងចំនួនទឹកប្រាក់បង់ និងពេលវេលានៃប្រតិបត្តិការ គឺជាផ្នែកមួយនៃ MobileCoin Ledger។</string>
@@ -3411,6 +3470,7 @@
     <string name="ConfirmPayment__confirm_payment">បញ្ជាក់ការទូទាត់</string>
     <string name="ConfirmPayment__network_fee">ថ្លៃសេវាបណ្តាញ</string>
     <string name="ConfirmPayment__estimated_s">ប៉ាន់ស្មាន %1$s</string>
+    <!-- Prefix to a name to indicate who a payment will be sent to -->
     <string name="ConfirmPayment__to">ទៅ</string>
     <string name="ConfirmPayment__total_amount">ចំនួនសរុប</string>
     <string name="ConfirmPayment__balance_s">សមតុល្យ៖ %1$s</string>
@@ -3559,6 +3619,14 @@
     <string name="conversation_group_options__conversation">ការជជែក</string>
     <string name="conversation_group_options__broadcast">ផ្សព្វផ្សាយ</string>
 
+    <!-- DoubleTapEditEducationSheet -->
+    <!-- Displayed as the title of the education bottom sheet -->
+    <string name="DoubleTapEditEducationSheet__double_tap_edit_title">Double tap to edit</string>
+    <!-- Text on the sheet explaining how double tapping on a message will let them edit it -->
+    <string name="DoubleTapEditEducationSheet__quickly_tap_twice">Quickly tap twice on your messages to edit them. You can edit your messages up to 24hrs after they’ve been sent.</string>
+    <!-- Button label to dismiss sheet -->
+    <string name="DoubleTapEditEducationSheet__got_it">Got it</string>
+
     <!-- text_secure_normal -->
     <string name="text_secure_normal__menu_new_group">ក្រុមថ្មី</string>
     <string name="text_secure_normal__menu_settings">ការកំណត់</string>
@@ -4006,6 +4074,7 @@
     <string name="RecipientBottomSheet_copied_to_clipboard">បានចម្លងទៅ clipboard</string>
 
     <string name="GroupRecipientListItem_admin">អ្នកគ្រប់គ្រង</string>
+    <!-- Button text to approve a user that has requested to join a group -->
     <string name="GroupRecipientListItem_approve_description">អនុញាតិ</string>
     <string name="GroupRecipientListItem_deny_description">បដិសេធ</string>
 
@@ -4033,6 +4102,7 @@
 
     <!-- VoiceNoteMediaDescriptionCompatFactory -->
     <string name="VoiceNoteMediaItemFactory__voice_message">សារជាសម្លេង%1$s</string>
+    <!-- This is a title in a banner describing the conversation sender to receiver placeholders of the currently playing voice memo. -->
     <string name="VoiceNoteMediaItemFactory__s_to_s">%1$s ទៅ%2$s</string>
 
     <!-- StorageUtil -->
@@ -4046,8 +4116,14 @@
     <string name="ReviewCardDialogFragment__review_members">ពិនិត្យមើលសមាជិក</string>
     <!-- Title of a screen where the user will be prompted to review a message request matching the name of someone they already know -->
     <string name="ReviewCardDialogFragment__review_request">ពិនិត្យមើលសំណើ</string>
-    <string name="ReviewCardDialogFragment__d_group_members_have_the_same_name">សមាជិកក្រុមចំនួន %1$dមានឈ្មោះដូចគ្នា សូមពិនិត្យសមាជិកក្រុមទាំងអស់ខាងក្រោម ហើយចាត់វិធានការ</string>
-    <string name="ReviewCardDialogFragment__if_youre_not_sure">ប្រសិនបើអ្នកមិនច្បាស់ថាសំណើរនេះមកពីណាទេ សូមពិនិត្យលេខទំនាក់ទំនងនៅខាងក្រោមហើយចាត់វិធានការ</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="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 -->
+    <plurals name="ReviewCardDialogFragment__if_youre_not_sure">
+        <item quantity="other">If you\'re not sure who the request is from, review the contacts below and take action.</item>
+    </plurals>
     <string name="ReviewCardDialogFragment__no_other_groups_in_common">មិនមានក្រុមដទៃទៀតរួមគ្នាទេ</string>
     <string name="ReviewCardDialogFragment__no_groups_in_common">មិនមានក្រុមរួមគ្នាទេ</string>
     <plurals name="ReviewCardDialogFragment__d_other_groups_in_common">
@@ -4076,11 +4152,18 @@
     <string name="CallParticipantsListUpdatePopupWindow__s_joined">%1$s បានចូលរួម</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_and_s_joined">%1$s និង %2$s បានចូលរួម</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_s_and_s_joined">%1$s %2$s និង %3$s បានចូលរួម</string>
-    <string name="CallParticipantsListUpdatePopupWindow__s_s_and_d_others_joined">%1$s %2$s និង %3$d បានចូលរួម</string>
+    <!-- Toast message shown in group call when 3 or more people join -->
+    <plurals name="CallParticipantsListUpdatePopupWindow__s_s_and_d_others_joined">
+        <item quantity="other">%1$s, %2$s and %3$d others joined</item>
+    </plurals>
+    <!-- Toast/popup text shown when someone leaves a group call -->
     <string name="CallParticipantsListUpdatePopupWindow__s_left">%1$s នៅសល់</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_and_s_left">%1$s និង %2$s នៅសល់</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_s_and_s_left">%1$s %2$s និង %3$s នៅសល់</string>
-    <string name="CallParticipantsListUpdatePopupWindow__s_s_and_d_others_left">%1$s %2$s និង %3$d ផ្សេងទៀតដែលនៅសល់</string>
+    <!-- Toast message shown in group call when 3 or more people leave -->
+    <plurals name="CallParticipantsListUpdatePopupWindow__s_s_and_d_others_left">
+        <item quantity="other">%1$s, %2$s and %3$d others left</item>
+    </plurals>
 
     <string name="CallParticipant__you">អ្នក</string>
     <string name="CallParticipant__you_on_another_device">អ្នក (នៅលើឧបករណ៍មួយផ្សេងទៀត)</string>
@@ -4448,10 +4531,14 @@
 
     <!-- PrivacySettingsFragment -->
     <string name="PrivacySettingsFragment__blocked">បានទប់ស្កាត់</string>
-    <string name="PrivacySettingsFragment__d_contacts">%1$d លេខទំនាក់ទំនង</string>
+    <!-- Settings label that shows the number blocked contacts -->
+    <plurals name="PrivacySettingsFragment__d_contacts">
+        <item quantity="other">%1$d contacts</item>
+    </plurals>
     <string name="PrivacySettingsFragment__messaging">ការផ្ញើសារ</string>
     <string name="PrivacySettingsFragment__disappearing_messages">សារដែលបាត់ទៅវិញ</string>
     <string name="PrivacySettingsFragment__app_security">សន្តិសុខកម្មវិធី</string>
+    <!-- This refers to the multi-tasking overview (recent apps) from the Android operating system.-->
     <string name="PrivacySettingsFragment__block_screenshots_in_the_recents_list_and_inside_the_app">ទប់ស្កាត់រូបថតអេក្រង់នៅក្នុងបញ្ជីថ្មីៗនេះ និងក្នុងកម្មវិធី</string>
     <string name="PrivacySettingsFragment__signal_message_and_calls">សារ និងការហៅ Signal តែងតែបញ្ជូនការហៅទូរសព្ទ និងអ្នកផ្ញើដែលបិទជិត</string>
     <string name="PrivacySettingsFragment__default_timer_for_new_changes">ពេលវេលាតាមលំនាំដើមសម្រាប់ការសន្ទនាថ្មីៗ</string>
@@ -4508,11 +4595,14 @@
     <string name="DataAndStorageSettingsFragment__media_quality">គុណភាពមេឌៀ</string>
     <string name="DataAndStorageSettingsFragment__sent_media_quality">មេឌៀគុណភាពល្អត្រូវបានផ្ញើចេញ</string>
     <string name="DataAndStorageSettingsFragment__sending_high_quality_media_will_use_more_data">ការផ្ញើឯកសារមេឌៀដែលមានគុណភាពខ្ពស់នឹងអស់ទិន្នន័យអុីនធឺណិតច្រើន</string>
+    <!-- Setting option that can be selected to default media to be sent as high quality by default -->
     <string name="DataAndStorageSettingsFragment__high">ខ្ពស់</string>
+    <!-- Setting option that can be selected to default media to be sent as standard quality by default -->
     <string name="DataAndStorageSettingsFragment__standard">ស្ដង់ដារ</string>
     <string name="DataAndStorageSettingsFragment__calls">ការហៅ</string>
 
     <!-- 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__use_custom_colors">ប្រើពណ៌បង្កើតខ្លួនឯង</string>
     <string name="ChatColorSelectionFragment__chat_color">ពណ៌ការជជែក</string>
@@ -4721,6 +4811,7 @@
     <string name="AvatarPickerFragment__take_a_picture">ថតរូប</string>
     <string name="AvatarPickerFragment__choose_a_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>
     <string name="AvatarPickerFragment__clear_avatar">លុបរូបតំណាង</string>
@@ -4777,7 +4868,7 @@
     <string name="MediaReviewFragment__add_a_message">បន្ថែមសារមួយ</string>
     <string name="MediaReviewFragment__add_a_reply">បន្ថែមការឆ្លើយតប</string>
     <string name="MediaReviewFragment__send_to">ផ្ញើទៅ</string>
-    <string name="MediaReviewFragment__view_once_message">មើលសារម្ដង</string>
+    <string name="MediaReviewFragment__view_once_message">មេឌៀមើលបានតែម្តង</string>
     <string name="MediaReviewFragment__one_or_more_items_were_too_large">ធាតុមួយ ឬច្រើនមានទំហំធំពេក</string>
     <string name="MediaReviewFragment__one_or_more_items_were_invalid">មានធាតុមួយ ឬច្រើនមិនត្រឹមត្រូវ</string>
     <string name="MediaReviewFragment__too_many_items_selected">ធាតុដែលបានជ្រើសរើសច្រើនពេក</string>
@@ -5365,7 +5456,7 @@
     <string name="StoryViewerFragment__s_s">%1$s %2$s</string>
     <!-- Displayed when viewing a post you sent -->
     <string name="StoryViewerPageFragment__you">អ្នក</string>
-    <!-- Displayed when viewing a post displayed to a group -->
+    <!-- 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 -->
     <string name="StoryViewerPageFragment__reply">ឆ្លើយតប</string>
@@ -6534,7 +6625,7 @@
     <!-- Title displayed at the top of the screen -->
     <string name="NicknameActivity__nickname">ឈ្មោះហៅក្រៅ</string>
     <!-- Subtitle displayed under title -->
-    <string name="NicknameActivity__nicknames_amp_notes">Nicknames &amp; notes are stored with Signal and end-to-end encrypted. They are only visible to you.</string>
+    <string name="NicknameActivity__nicknames_amp_notes">ឈ្មោះហៅក្រៅ និងកំណត់ចំណាំត្រូវបានរក្សាទុកជាមួយ Signal និងត្រូវបានអ៊ីនគ្រីបទាំងសងខាង។ មានតែអ្នកទេដែលអាចមើលឃើញពួកវា។</string>
     <!-- Field label for given name -->
     <string name="NicknameActivity__first_name">ឈ្មោះ</string>
     <!-- Content description for first name clear button -->
@@ -6548,9 +6639,9 @@
     <!-- Button label to save -->
     <string name="NicknameActivity__save">រក្សាទុក</string>
     <!-- Dialog title for note and name deletion -->
-    <string name="NicknameActivity__delete_nickname">Delete?</string>
+    <string name="NicknameActivity__delete_nickname">លុបឬ?</string>
     <!-- Dialog message for note and name deletion -->
-    <string name="NicknameActivity__this_will_permanently_delete_this_nickname_and_note">This will permanently delete any nickname and note you’ve set.</string>
+    <string name="NicknameActivity__this_will_permanently_delete_this_nickname_and_note">ការធ្វើបែបនេះនឹងលុបជាអចិន្ត្រៃយ៍នូវឈ្មោះហៅក្រៅ និងកំណត់ចំណាំដែលអ្នកបានកំណត់។</string>
 
     <!-- ViewNoteBottomSheetDialogFragment -->
     <!-- Sheet title -->
@@ -6558,5 +6649,26 @@
     <!-- Content description for opening the note editor -->
     <string name="ViewNoteSheet__edit_note">កែកំណត់ចំណាំ</string>
 
+    <!-- BackupProgressService -->
+    <!-- Notification title shown while backup restore job is running -->
+    <string name="BackupProgressService_title">កំពុងស្ដារការបម្រុងទុក…</string>
+    <!-- Notification title shown while downloading backup restore data -->
+    <string name="BackupProgressService_title_downloading">កំពុងទាញយកទិន្នន័យបម្រុងទុក…</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>
+    <!-- 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 -->
+    <string name="BackupsTypeSettingsFragment__google_pay">Google Pay</string>
+    <!-- Displayed as the user\'s payment method as a label in a preference row -->
+    <string name="BackupsTypeSettingsFragment__bank_transfer">Bank transfer</string>
+    <!-- Displayed as the user\'s payment method as a label in a preference row -->
+    <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>
+
+
     <!-- 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 16449a9d49..e212fa8da9 100644
--- a/app/src/main/res/values-kn/strings.xml
+++ b/app/src/main/res/values-kn/strings.xml
@@ -1,6 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- smartling.instruction_comments_enabled = on -->
-<resources>
+<?xml version="1.0" encoding="UTF-8"?><!-- 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> -->
@@ -23,7 +21,7 @@
     <string name="delete">ಅಳಿಸಿ</string>
     <string name="please_wait">ದಯವಿಟ್ಟು ನಿರೀಕ್ಷಿಸಿ…</string>
     <string name="save">ಉಳಿಸಿ</string>
-    <string name="note_to_self">ಸ್ವಯಂ ಟಿಪ್ಪಣಿ</string>
+    <string name="note_to_self">ಸ್ವಯಂ ಬಳಕೆಗೆ ಟಿಪ್ಪಣಿ</string>
 
     <!-- Alternate label for the Signal Application in the device\'s home screen launcher, as in a weather/climate application. -->
     <string name="app_icon_label_weather">ಹವಾಮಾನ</string>
@@ -42,16 +40,16 @@
 
     <!-- ApplicationPreferencesActivity -->
     <string name="ApplicationPreferenceActivity_you_havent_set_a_passphrase_yet">ನೀವು ಇನ್ನೂ ಪಾಸ್‌ಫ್ರೇಸ್ ಹೊಂದಿಸಿಲ್ಲ!</string>
-    <string name="ApplicationPreferencesActivity_disable_passphrase">ಪಾಸ್‌ಫ್ರೇಸ್‌ ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಿ</string>
+    <string name="ApplicationPreferencesActivity_disable_passphrase">ಪಾಸ್‌ಫ್ರೇಸ್‌ ನಿಷ್ಕ್ರಿಯಗೊಳಿಸುವುದೇ?</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>
-    <string name="ApplicationPreferencesActivity_pin_created">ಪಿನ್ ರಚಿಸಲಾಗಿದೆ.</string>
-    <string name="ApplicationPreferencesActivity_pin_disabled">ಪಿನ್ ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ.</string>
-    <string name="ApplicationPreferencesActivity_record_payments_recovery_phrase">ಪೇಮೆಂಟ್ಸ್ ರಿಕವರಿ ಪದಗುಚ್ಛವನ್ನು ರೆಕಾರ್ಡ್‌ ಮಾಡಿ</string>
+    <string name="ApplicationPreferencesActivity_pin_created">PIN ರಚಿಸಲಾಗಿದೆ.</string>
+    <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> -->
@@ -89,6 +87,16 @@
     <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">Allow access to your location</string>
+    <!-- Dialog description that will explain the steps needed to give location permission -->
+    <string name="AttachmentManager_signal_to_send_location">To send your location:</string>
+    <!-- Alert dialog description asking for location permission -->
+    <string name="AttachmentManager_signal_allow_signal_access_location">Allow Molly access to send your location.</string>
+    <!-- Toast text explaining Signal\'s need for location access -->
+    <string name="AttachmentManager_signal_needs_location_access">Molly needs location access to send your location.</string>
+
     <!-- Alert dialog title to show the recipient has not activated payments -->
     <string name="AttachmentManager__not_activated_payments">%1$s ಅವರು ಪಾವತಿಗಳನ್ನು ಸಕ್ರಿಯಗೊಳಿಸಿಲ್ಲ </string>
     <!-- Alert dialog description to send the recipient a request to activate payments -->
@@ -126,7 +134,7 @@
     <!-- Displayed as a hint in the card number text field -->
     <string name="CreditCardFragment__card_number">ಕಾರ್ಡ್ ಸಂಖ್ಯೆ</string>
     <!-- Displayed as a hint in the card expiry text field -->
-    <string name="CreditCardFragment__mm_yy">MM/YY</string>
+    <string name="CreditCardFragment__mm_yy">ತಿತಿ/ವವ</string>
     <!-- Displayed as a hint in the card cvv text field -->
     <string name="CreditCardFragment__cvv">CVV</string>
     <!-- Error displayed under the card number text field when there is an invalid card number entered -->
@@ -173,7 +181,7 @@
     <!-- Message shown on block dialog when blocking the Signal release notes recipient -->
     <string name="BlockUnblockDialog_block_getting_signal_updates_and_news">ನಿರ್ಬಂಧವು Signal ಅಪ್‌ಡೇಟ್‌ಗಳು ಮತ್ತು ಸುದ್ದಿಯನ್ನು ಪಡೆಯುತ್ತದೆ.</string>
     <!-- Message shown on unblock dialog when unblocking the Signal release notes recipient -->
-    <string name="BlockUnblockDialog_resume_getting_signal_updates_and_news">ಪುನರಾರಂಭವು Signal ಅಪ್‌ಡೇಟ್‌ಗಳು ಮತ್ತು ಸುದ್ದಿಯನ್ನು ಪಡೆಯುತ್ತದೆ.</string>
+    <string name="BlockUnblockDialog_resume_getting_signal_updates_and_news">Signal ಅಪ್‌ಡೇಟ್‌ಗಳು ಮತ್ತು ಸುದ್ದಿ ಪಡೆಯುವುದನ್ನು ಮತ್ತೆ ಆರಂಭಿಸಿ.</string>
     <string name="BlockUnblockDialog_unblock_s">%1$sನಿರ್ಬಂಧ ತೆಗೆಯಬೇಕೇ?</string>
     <string name="BlockUnblockDialog_block">ನಿರ್ಬಂಧಿಸಿ</string>
     <string name="BlockUnblockDialog_block_and_leave">ನಿರ್ಬಂಧಿಸಿ ಹಾಗು ತೊರೆಯಿರಿ</string>
@@ -241,7 +249,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>
@@ -386,8 +394,16 @@
     <string name="ConversationActivity_your_request_to_join_has_been_sent_to_the_group_admin">ಗುಂಪು ಸೇರಲು ನಿಮ್ಮ ವಿನಂತಿಯನ್ನು ನಿರ್ವಾಹಕರಿಗೆ ಕಳುಹಿಸಲಾಗಿದೆ. ಅವರು ಕ್ರಮ ಕೈಗೊಂಡಾಗ ನಿಮಗೆ ಸೂಚಿಸಲಾಗುತ್ತದೆ.</string>
     <string name="ConversationActivity_cancel_request">ಕೋರಿಕೆಯನ್ನು ರದ್ದುಮಾಡಿ</string>
 
-    <string name="ConversationActivity_to_send_audio_messages_allow_signal_access_to_your_microphone">ಆಡಿಯೋ ಸಂದೇಶಗಳನ್ನು ಕಳುಹಿಸಲು, Molly ಗೆ ನಿಮ್ಮ ಮೈಕ್ರೋಫೋನ್ ಉಪಯೋಗಿಸಲು ಅನುಮತಿ ನೀಡಿ.</string>
+    <!-- Dialog title asking users for microphone permission -->
+    <string name="ConversationActivity_allow_access_microphone">Allow access to your microphone</string>
+    <!-- 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>
+    <!-- Toast text explaining Signal\'s need for microphone access -->
+    <string name="ConversationActivity_signal_needs_microphone_access_voice_message">Molly needs microphone access to record a voice message.</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 ಗೆ ಕರೆ ಮಾಡಲು 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>
@@ -411,10 +427,17 @@
     <string name="ConversationActivity_you_will_leave_this_group_and_it_will_be_deleted_from_all_of_your_devices">ನೀವು ಈ ಗ್ರೂಪ್ ಅನ್ನು ತೊರೆಯುತ್ತೀರಿ ಮತ್ತು ಇದನ್ನು ನಿಮ್ಮ ಎಲ್ಲ ಸಾಧನಗಳಿಂದಲೂ ಅಳಿಸಲಾಗುವುದು.</string>
     <string name="ConversationActivity_delete">ಅಳಿಸಿ</string>
     <string name="ConversationActivity_delete_and_leave">ಅಳಿಸಿ ಮತ್ತು ತೊರೆಯಿರಿ</string>
-    <string name="ConversationActivity__to_call_s_signal_needs_access_to_your_microphone">%1$s ಗೆ ಕರೆ ಮಾಡಲು, Molly ಗೆ ನಿಮ್ಮ ಮೈಕ್ರೊಫೋನ್ ಪ್ರವೇಶ ಅಗತ್ಯವಿದೆ.</string>
+
+    <!-- Dialog description that will explain the steps needed to give microphone permissions for a voice call -->
+    <string name="ConversationActivity__to_start_call">To start a 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">To start a call, allow Molly access to your microphone.</string>
+    <!-- Toast text explaining Signal\'s need for microphone access for a voice call -->
+    <string name="ConversationActivity_signal_needs_microphone_access_voice_call">Molly needs microphone access to start a call.</string>
 
 
     <string name="ConversationActivity_join">ಸೇರು</string>
+    <!-- Button text for an active group call but the call is currently full and unjoinable -->
     <string name="ConversationActivity_full">ಸಂಪೂರ್ಣ</string>
 
     <string name="ConversationActivity_error_sending_media">ಮೀಡಿಯಾ ಕಳುಹಿಸುವಲ್ಲಿ ದೋಷ</string>
@@ -613,6 +636,7 @@
     <string name="ConversationListFragment_unarchive">ಅನ್ಆ‌ರ್ಕೈವ್</string>
     <string name="ConversationListFragment_delete">ಅಳಿಸಿ</string>
     <string name="ConversationListFragment_select_all">ಎಲ್ಲ ಆಯ್ಕೆಮಾಡಿ</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 ಆಯ್ಕೆ ಮಾಡಲಾಗಿದೆ</item>
         <item quantity="other">%1$d ಆಯ್ಕೆ ಮಾಡಲಾಗಿದೆ</item>
@@ -864,6 +888,7 @@
         <item quantity="one">ಆಹ್ವಾನವನ್ನು ಕಳುಹಿಸಲಾಗಿದೆ</item>
         <item quantity="other">%1$d ಆಹ್ವಾನಗಳನ್ನು ಕಳುಹಿಸಲಾಗಿದೆ</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">\"%1$s\" ನೀವು ಈ ಗುಂಪಿಗೆ ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಸೇರಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ. ಅವರನ್ನು ಸೇರಲು ಆಹ್ವಾನಿಸಲಾಗಿದೆ, ಮತ್ತು ಅವರು ಸ್ವೀಕರಿಸುವವರೆಗೂ ಯಾವುದೇ ಗುಂಪು ಸಂದೇಶಗಳನ್ನು ನೋಡುವುದಿಲ್ಲ.</string>
     <string name="GroupManagement_invite_multiple_users">ಈ ಬಳಕೆದಾರರನ್ನು ನೀವು ಈ ಗುಂಪಿಗೆ ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಸೇರಿಸಲಾಗುವುದಿಲ್ಲ. ಅವರನ್ನು ಗುಂಪಿಗೆ ಸೇರಲು ಆಹ್ವಾನಿಸಲಾಗಿದೆ, ಮತ್ತು ಅವರು ಸ್ವೀಕರಿಸುವವರೆಗೆ ಯಾವುದೇ ಗುಂಪು ಸಂದೇಶಗಳನ್ನು ನೋಡುವುದಿಲ್ಲ.</string>
 
@@ -1044,7 +1069,9 @@
 
     <string name="ManageGroupActivity_edit_name_and_picture">ಹೆಸರು ಮತ್ತು ಚಿತ್ರವನ್ನು ಎಡಿಟ್ ಮಾಡಿ</string>
     <string name="ManageGroupActivity_legacy_group">ಹಳೆಯ ಗುಂಪು</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">ಇದು ಲೆಗಸಿ ಗ್ರೂಪ್. ಗ್ರೂಪ್‌ ಅಡ್ಮಿನ್‌ಗಳಂತಹ ವೈಶಿಷ್ಟ್ಯಗಳು ಹೊಸ ಗ್ರೂಪ್‌ಗಳಲ್ಲಿ ಮಾತ್ರ ಲಭ್ಯವಿರುತ್ತವೆ.</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">ಇದು ಲೆಗಸಿ ಗ್ರೂಪ್. @mentions ಮತ್ತು ಅಡ್ಮಿನ್‌ಗಳಂತಹ ಹೊಸ ವೈಶಿಷ್ಟ್ಯಗಳನ್ನು ಪ್ರವೇಶಿಸಲು,</string>
     <string name="ManageGroupActivity_legacy_group_too_large">ಈ ಹಳೆಯ ಗ್ರೂಪ್‌ ಅನ್ನು ಹೊಸ ಗ್ರೂಪ್‌ಗೆ ಅಪ್‌ಗ್ರೇಡ್ ಮಾಡಲಾಗದು. ಏಕೆಂದರೆ ಇದು ತುಂಬಾ ದೊಡ್ಡದಾಗಿದೆ. ಗರಿಷ್ಠ ಗ್ರೂಪ್ ಗಾತ್ರವು %1$d.</string>
     <string name="ManageGroupActivity_upgrade_this_group">ಈ ಗುಂಪನ್ನು ಅಪ್‌ಗ್ರೇಡ್ ಮಾಡಿ</string>
@@ -1271,6 +1298,7 @@
         <item quantity="other">ಅಳಿಸಿ</item>
     </plurals>
 
+    <!-- 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 ಅವರು (%2$s) ಆಯ್ಕೆ ಮಾಡಿದ್ದಾರೆ</item>
         <item quantity="other">%1$d ಅವರು (%2$s) ಆಯ್ಕೆ ಮಾಡಿದ್ದಾರೆ</item>
@@ -1335,17 +1363,13 @@
     <string name="MessageRecord_left_group">ನೀವು ಗುಂಪನ್ನು ಬಿಟ್ಟಿದ್ದೀರಿ.</string>
     <string name="MessageRecord_you_updated_group">ನೀವು ಗುಂಪನ್ನು ನವೀಕರಿಸಿದ್ದೀರಿ.</string>
     <string name="MessageRecord_the_group_was_updated">ಗ್ರೂಪ್ ಅನ್ನು ಅಪ್‌ಡೇಟ್ ಮಾಡಲಾಗಿದೆ.</string>
-    <!-- Update message shown when placing an outgoing 1:1 voice/audio call and it\'s answered by the other party -->
+    <!-- Update message shown when placing an outgoing 1:1 voice/audio call -->
     <string name="MessageRecord_outgoing_voice_call">ಹೊರಹೋಗುವ ವಾಯ್ಸ್ ಕಾಲ್</string>
-    <!-- Update message shown when placing an outgoing 1:1 video call and it\'s answered by the other party -->
+    <!-- Update message shown when placing an outgoing 1:1 video call -->
     <string name="MessageRecord_outgoing_video_call">ಹೊರಹೋಗುವ ವೀಡಿಯೊ ಕಾಲ್</string>
-    <!-- Update message shown when placing an outgoing 1:1 voice/audio call and it\'s not answered by the other party -->
-    <string name="MessageRecord_unanswered_voice_call">ಉತ್ತರಿಸದ ವಾಯ್ಸ್ ಕಾಲ್</string>
-    <!-- Update message shown when placing an outgoing 1:1 video call and it\'s not answered by the other party -->
-    <string name="MessageRecord_unanswered_video_call">ಉತ್ತರಿಸದ ವೀಡಿಯೊ ಕಾಲ್</string>
-    <!-- Update message shown when receiving an incoming 1:1 voice/audio call and it\'s answered -->
+    <!-- Update message shown when receiving an incoming 1:1 voice/audio call and it\'s answered or ringing -->
     <string name="MessageRecord_incoming_voice_call">ಒಳಬರುವ ವಾಯ್ಸ್ ಕಾಲ್</string>
-    <!-- Update message shown when receiving an incoming 1:1 video call and answered -->
+    <!-- Update message shown when receiving an incoming 1:1 video call and answered or ringing -->
     <string name="MessageRecord_incoming_video_call">ಒಳಬರುವ ವೀಡಿಯೊ ಕಾಲ್</string>
     <!-- Update message shown when receiving an incoming 1:1 voice/audio call and not answered -->
     <string name="MessageRecord_missed_voice_call">ಮಿಸ್ಡ್ ವಾಯ್ಸ್ ಕಾಲ್</string>
@@ -1355,10 +1379,6 @@
     <string name="MessageRecord_missed_voice_call_notification_profile">ಅಧಿಸೂಚನೆ ಪ್ರೊಫೈಲ್ ಆನ್ ಆಗಿರುವಾಗ ತಪ್ಪಿಹೋದ ಧ್ವನಿ ಕರೆ</string>
     <!-- Update message shown when receiving an incoming video call and declined due to notification profile -->
     <string name="MessageRecord_missed_video_call_notification_profile">ಅಧಿಸೂಚನೆ ಪ್ರೊಫೈಲ್ ಆನ್ ಆಗಿರುವಾಗ ತಪ್ಪಿಹೋದ ವೀಡಿಯೊ ಕರೆ</string>
-    <!-- Update message shown when receiving an incoming 1:1 voice/audio call and explicitly declined -->
-    <string name="MessageRecord_you_declined_a_voice_call">ನೀವು ವಾಯ್ಸ್ ಕಾಲ್ ಅನ್ನು ನಿರಾಕರಿಸಿದ್ದೀರಿ</string>
-    <!-- Update message shown when receiving an incoming 1:1 video call and explicitly declined -->
-    <string name="MessageRecord_you_declined_a_video_call">ನೀವು ಒಂದು ವೀಡಿಯೊ ಕಾಲ್ ಅನ್ನು ನಿರಾಕರಿಸಿದ್ದೀರಿ</string>
     <!-- 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>
@@ -1567,28 +1587,53 @@
     <string name="MessageRecord_can_accept_payments">%1$s ಅವರು ಈಗ ಪಾವತಿಗಳನ್ನು ಸ್ವೀಕರಿಸಬಹುದು</string>
 
     <!-- Group Calling update messages -->
-    <string name="MessageRecord_s_started_a_group_call_s">%1$s ಅವರು ಗ್ರೂಪ್ ಕಾಲ್ ಆರಂಭಿಸಿದ್ದಾರೆ · %2$s</string>
-    <string name="MessageRecord_you_started_a_group_call_s">ನೀವು ಗ್ರೂಪ್ ಕರೆಯನ್ನು ಪ್ರಾರಂಭಿಸಿದ್ದೀರಿ · %1$s</string>
-    <string name="MessageRecord_s_is_in_the_group_call_s">%1$s ಗ್ರೂಪ್‌ ಕಾಲ್‌ನಲ್ಲಿದ್ದಾರೆ · %2$s</string>
-    <string name="MessageRecord_you_are_in_the_group_call_s1">ನೀವು ಗ್ರೂಪ್‌ ಕಾಲ್‌ನಲ್ಲಿದ್ದೀರಿ · %1$s</string>
-    <string name="MessageRecord_s_and_s_are_in_the_group_call_s1">%1$s ಮತ್ತು %2$s ಗ್ರೂಪ್‌ ಕಾಲ್‌ನಲ್ಲಿದ್ದಾರೆ · %3$s</string>
-    <string name="MessageRecord_group_call_s">ಗ್ರೂಪ್ ಕಾಲ್ · %1$s</string>
-
-    <string name="MessageRecord_s_started_a_group_call">%1$s ಅವರು ಗ್ರೂಪ್ ಕಾಲ್ ಆರಂಭಿಸಿದ್ದಾರೆ</string>
-    <string name="MessageRecord_you_started_a_group_call">ನೀವು ಗುಂಪು ಕರೆಯೊಂದನ್ನು ಪ್ರಾರಂಭಿಸಿದ್ದೀರಿ</string>
-    <string name="MessageRecord_s_is_in_the_group_call">%1$s ಅವರು ಗ್ರೂಪ್ ಕಾಲ್‌ನಲ್ಲಿದ್ದಾರೆ</string>
-    <string name="MessageRecord_you_are_in_the_group_call">ನೀವು ಗ್ರೂಪ್‌ ಕಾಲ್‌ನಲ್ಲಿದ್ದೀರಿ</string>
-    <string name="MessageRecord_s_and_s_are_in_the_group_call">%1$s ಮತ್ತು %2$s ಗ್ರೂಪ್‌ ಕಾಲ್‌ನಲ್ಲಿದ್ದಾರೆ</string>
-    <string name="MessageRecord_group_call">ಗ್ರೂಪ್ ಕಾಲ್</string>
+    <!-- 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 ಅವರು ಕರೆಯಲ್ಲಿದ್ದಾರೆ · %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">ನೀವು ಕರೆಯಲ್ಲಿದ್ದೀರಿ · %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 ಮತ್ತು %2$s ಅವರು ಕರೆಯಲ್ಲಿದ್ದಾರೆ · %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 ಅವರು ಕರೆಯಲ್ಲಿದ್ದಾರೆ</string>
+    <!-- Chat log text for an ongoing group call only the local user has joined -->
+    <string name="MessageRecord_you_are_in_the_call">ನೀವು ಕರೆಯಲ್ಲಿದ್ದೀರಿ</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 ಮತ್ತು %2$s ಕರೆಯಲ್ಲಿದ್ದಾರೆ</string>
+    <!-- Chat log text for a group call that ended within the last 5 minutes -->
+    <string name="MessageRecord__the_video_call_has_ended">ವೀಡಿಯೊ ಕರೆ ಮುಕ್ತಾಯವಾಗಿದೆ</string>
+    <!-- Chat log text for a group call that ended within the last 5 minutes with a placeholder for formatted time -->
+    <string name="MessageRecord__the_video_call_has_ended_s">ವೀಡಿಯೊ ಕರೆ ಮುಕ್ತಾಯವಾಗಿದೆ · %1$s</string>
+    <!-- Chat log text for a group call that ended more than 5 minutes ago and was missed -->
+    <string name="MessageRecord__missed_video_call">ಮಿಸ್ಡ್ ವೀಡಿಯೊ ಕರೆ</string>
+    <!-- Chat log text for a group call that ended more than 5 minutes ago and was missed with a placeholder for formatted time -->
+    <string name="MessageRecord__missed_video_call_s">ಮಿಸ್ಡ್ ವೀಡಿಯೊ ಕರೆ · %1$s</string>
+    <!-- Chat log text for a group call that ended that the local user did not start -->
+    <string name="MessageRecord__incoming_video_call">ಒಳಬರುವ ವೀಡಿಯೊ ಕರೆ</string>
+    <!-- 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">ಒಳಬರುವ ವೀಡಿಯೊ ಕರೆ · %1$s</string>
+    <!-- Chat log text for a group call that ended that the local user started -->
+    <string name="MessageRecord__outgoing_video_call">ಹೊರಹೋಗುವ ವೀಡಿಯೊ ಕರೆ</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">ಹೊರಹೋಗುವ ವೀಡಿಯೊ ಕರೆ · %1$s</string>
+    <!-- Chat log text for an ongoing group call that the local user started -->
+    <string name="MessageRecord__you_started_a_video_call">ನೀವು ವೀಡಿಯೊ ಕರೆಯನ್ನು ಪ್ರಾರಂಭಿಸಿದ್ದೀರಿ</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">ನೀವು ವೀಡಿಯೊ ಕರೆಯನ್ನು ಪ್ರಾರಂಭಿಸಿದ್ದೀರಿ · %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 ಅವರು ವೀಡಿಯೊ ಕರೆಯನ್ನು ಪ್ರಾರಂಭಿಸಿದ್ದಾರೆ</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 ಅವರು ವೀಡಿಯೊ ಕರೆಯನ್ನು ಪ್ರಾರಂಭಿಸಿದ್ದಾರೆ · %2$s</string>
 
     <string name="MessageRecord_you">ನೀವು</string>
 
-    <plurals name="MessageRecord_s_s_and_d_others_are_in_the_group_call_s">
+    <!-- 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 ಮತ್ತು %3$d ಇತರರು ಗ್ರೂಪ್ ಕಾಲ್‌ನಲ್ಲಿದ್ದಾರೆ · %4$s</item>
         <item quantity="other">%1$s, %2$s ಮತ್ತು %3$d ಇತರರು ಗ್ರೂಪ್‌ ಕಾಲ್‌ನಲ್ಲಿದ್ದಾರೆ · %4$s</item>
     </plurals>
 
-    <plurals name="MessageRecord_s_s_and_d_others_are_in_the_group_call">
+    <!-- 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 ಮತ್ತು %3$d ಇತರರು ಗ್ರೂಪ್‌ ಕಾಲ್‌ನಲ್ಲಿದ್ದಾರೆ</item>
         <item quantity="other">%1$s, %2$s ಮತ್ತು %3$d ಇತರರು ಗ್ರೂಪ್‌ ಕಾಲ್‌ನಲ್ಲಿದ್ದಾರೆ</item>
     </plurals>
@@ -2063,6 +2108,7 @@
     <!-- Generic error when the app is unable to request an SMS code for an unknown reason. -->
     <string name="RegistrationActivity_unable_to_request_verification_code">ದೃಢೀಕರಣ ಕೋಡ್ ಅನ್ನು ವಿನಂತಿಸಲು ಸಾಧ್ಯವಾಗುತ್ತಿಲ್ಲ. ದಯವಿಟ್ಟು ನಿಮ್ಮ ನೆಟ್‌ವರ್ಕ್ ಸಂಪರ್ಕವನ್ನು ಪರಿಶೀಲಿಸಿ ಹಾಗೂ ಮತ್ತೊಮ್ಮೆ ಪ್ರಯತ್ನಿಸಿ.</string>
     <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">Molly ಆಂಡ್ರಾಯ್ಡ್ - ಫೋನ್ ಸಂಖ್ಯೆ ಸ್ವರೂಪ</string>
     <!--    Small "toast" notification to the user confirming that they have requested a new code via voice call.-->
@@ -2207,7 +2253,7 @@
     <string name="SubmitDebugLogActivity_this_log_will_be_posted_publicly_online_for_contributors">ಈ ದಾಖಲೆಯನ್ನು ಕೊಡುಗೆದಾರರ ವೀಕ್ಷಣೆಗೆ ಬಹಿರಂಗ ಅಂತರ್ಜಾಲಕ್ಕೆ ಪೋಸ್ಟ್ ಮಾಡಲಾಗುತ್ತದೆ. ನೀವು ಇದನ್ನು ಸಲ್ಲಿಸುವ ಮೊದಲು ಪರೀಕ್ಷಿಸಬಹುದು.</string>
 
     <!-- SupportEmailUtil -->
-  <!-- Removed by excludeNonTranslatables <string name="SupportEmailUtil_support_email" translatable="false">support@molly.im</string> -->
+  <!-- Removed by excludeNonTranslatables <string name="SupportEmailUtil_support_email" translatable="false">support@signal.org</string> -->
     <string name="SupportEmailUtil_filter">ಫಿಲ್ಟರ್:</string>
     <string name="SupportEmailUtil_device_info">ಸಾಧನ ಮಾಹಿತಿ:</string>
     <string name="SupportEmailUtil_android_version">ಆಂಡ್ರಾಯ್ಡ್ ಆವೃತ್ತಿ:</string>
@@ -2709,6 +2755,8 @@
     <string name="ConversationUpdateItem_loading">ಲೋಡ್ ಆಗುತ್ತಿದೆ</string>
     <string name="ConversationUpdateItem_learn_more">ಇನ್ನಷ್ಟು ತಿಳಿಯಿರಿ</string>
     <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_call_is_full">ಕರೆ ಭರ್ತಿಯಾಗಿದೆ</string>
     <string name="ConversationUpdateItem_invite_friends">ಸ್ನೇಹಿತರನ್ನು ಆಹ್ವಾನಿಸಿ</string>
@@ -2773,6 +2821,7 @@
     <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>
 
     <!-- EnableCallNotificationSettingsDialog__call_notifications_checklist -->
@@ -3086,6 +3135,7 @@
 
     <string name="arrays__default">ಡೀಫಾಲ್ಟ್</string>
     <string name="arrays__high">ಹೆಚ್ಚು</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">ಗರಿಷ್ಠ</string>
 
     <!-- plurals.xml -->
@@ -3357,7 +3407,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">Molly ನಲ್ಲಿ ಪೇಮೆಂಟ್ಸ್‌ ಇನ್ನು ಲಭ್ಯವಿರುವುದಿಲ್ಲ. ನೀವು ಇನ್ನೂ ಎಕ್ಸ್‌ಚೇಂಜ್‌ಗೆ ಹಣವನ್ನು ವರ್ಗಾವಣೆ ಮಾಡಬಹುದು. ಆದರೆ, ನೀವು ಇನ್ನು ಪೇಮೆಂಟ್‌ಗಳನ್ನು ಕಳುಹಿಸಲಾಗದು ಮತ್ತು ಸ್ವೀಕರಿಸಲಾಗದು ಅಥವಾ ಫಂಡ್‌ಗಳನ್ನು ಸೇರಿಸಲಾಗದು.</string>
@@ -3406,6 +3456,14 @@
     <!-- Storage permission row description -->
     <string name="GrantPermissionsFragment__send_photos_videos_and_files">ನಿಮ್ಮ ಸಾಧನದಿಂದ ಫೊಟೋಗಳು, ವೀಡಿಯೊಗಳು ಮತ್ತು ಫೈಲ್‌ಗಳನ್ನು ಕಳುಹಿಸಿ.</string>
 
+    <!-- PermissionDeniedBottomSheet -->
+    <!-- Sheet describing step 1 on how to give permissions by opening settings -->
+    <string name="PermissionDeniedBottomSheet__1_tap_settings_below">1. Tap “Settings” below</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 Allow the permission</string>
+    <!-- Label for button at the bottom of the sheet which opens the system permission settings -->
+    <string name="PermissionDeniedBottomSheet__settings">Settings</string>
+
     <!-- PaymentsSecuritySetupFragment -->
     <!-- Toolbar title -->
     <string name="PaymentsSecuritySetupFragment__security_setup">ಭದ್ರತಾ ಸೆಟ್ ಅಪ್</string>
@@ -3446,6 +3504,7 @@
     <string name="PaymentsDetailsFragment__sent_to_s">%1$s ಗೆ ಕಳುಹಿಸಲಾಗಿದೆ</string>
     <string name="PaymentsDetailsFragment__you_on_s_at_s">ನೀವು %2$s ರಲ್ಲಿ %1$s ಆಗಿದ್ದೀರಿ</string>
     <string name="PaymentsDetailsFragment__s_on_s_at_s">%1$s ರಂದು %3$s ರಲ್ಲಿ %2$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__information">ಪಾವತಿ ಮೊತ್ತ ಮತ್ತು ವಹಿವಾಟಿನ ಸಮಯ ಸೇರಿದಂತೆ ವಹಿವಾಟು ವಿವರಗಳು ಮೊಬೈಲ್‌ಕಾಯಿನ್‌ ಲೆಡ್ಜರ್‌ನ ಭಾಗವಾಗಿದೆ.</string>
@@ -3508,6 +3567,7 @@
     <string name="ConfirmPayment__confirm_payment">ಪೇಮೆಂಟ್ ದೃಢೀಕರಿಸಿ</string>
     <string name="ConfirmPayment__network_fee">ನೆಟ್‌ವರ್ಕ್‌ ಶುಲ್ಕ</string>
     <string name="ConfirmPayment__estimated_s">ಅಂದಾಜು ಮಾಡಿದ %1$s</string>
+    <!-- Prefix to a name to indicate who a payment will be sent to -->
     <string name="ConfirmPayment__to">ಗೆ</string>
     <string name="ConfirmPayment__total_amount">ಒಟ್ಟು ಮೊತ್ತ</string>
     <string name="ConfirmPayment__balance_s">ಬ್ಯಾಲೆನ್ಸ್: %1$s</string>
@@ -3658,6 +3718,14 @@
     <string name="conversation_group_options__conversation">ಚಾಟ್</string>
     <string name="conversation_group_options__broadcast">ಪ್ರಸಾರ ಮಾಡಿ</string>
 
+    <!-- DoubleTapEditEducationSheet -->
+    <!-- Displayed as the title of the education bottom sheet -->
+    <string name="DoubleTapEditEducationSheet__double_tap_edit_title">Double tap to edit</string>
+    <!-- Text on the sheet explaining how double tapping on a message will let them edit it -->
+    <string name="DoubleTapEditEducationSheet__quickly_tap_twice">Quickly tap twice on your messages to edit them. You can edit your messages up to 24hrs after they’ve been sent.</string>
+    <!-- Button label to dismiss sheet -->
+    <string name="DoubleTapEditEducationSheet__got_it">Got it</string>
+
     <!-- text_secure_normal -->
     <string name="text_secure_normal__menu_new_group">ಹೊಸ ಗುಂಪು</string>
     <string name="text_secure_normal__menu_settings">ಸೆಟ್ಟಿಂಗ್‌ಗಳು</string>
@@ -4112,6 +4180,7 @@
     <string name="RecipientBottomSheet_copied_to_clipboard">ಕ್ಲಿಪ್‌‌ಬೋರ್ಡಿಗೆ ನಕಲು ಮಾಡಲಾಗಿದೆ</string>
 
     <string name="GroupRecipientListItem_admin">ಅಡ್ಮಿನ್‌‌</string>
+    <!-- Button text to approve a user that has requested to join a group -->
     <string name="GroupRecipientListItem_approve_description">ಅನುಮತಿಸಿ</string>
     <string name="GroupRecipientListItem_deny_description">ನಿರಾಕರಿಸಿ</string>
 
@@ -4139,6 +4208,7 @@
 
     <!-- VoiceNoteMediaDescriptionCompatFactory -->
     <string name="VoiceNoteMediaItemFactory__voice_message">ಧ್ವನಿ ಸಂದೇಶ . %1$s</string>
+    <!-- This is a title in a banner describing the conversation sender to receiver placeholders of the currently playing voice memo. -->
     <string name="VoiceNoteMediaItemFactory__s_to_s">%1$s ಗೆ %2$s</string>
 
     <!-- StorageUtil -->
@@ -4152,8 +4222,16 @@
     <string name="ReviewCardDialogFragment__review_members">ಸದಸ್ಯರನ್ನು ಪರಿಶೀಲಿಸಿ</string>
     <!-- Title of a screen where the user will be prompted to review a message request matching the name of someone they already know -->
     <string name="ReviewCardDialogFragment__review_request">ವಿನಂತಿಯನ್ನು ಪರಿಶೀಲಿಸಿ</string>
-    <string name="ReviewCardDialogFragment__d_group_members_have_the_same_name">%1$d ಗುಂಪು ಸದಸ್ಯರು ಒಂದೇ ಹೆಸರನ್ನು ಹೊಂದಿದ್ದಾರೆ, ಕೆಳಗಿನ ಸದಸ್ಯರನ್ನು ಪರಿಶೀಲಿಸಿ ಮತ್ತು ಕ್ರಮ ತೆಗೆದುಕೊಳ್ಳಿರಿ.</string>
-    <string name="ReviewCardDialogFragment__if_youre_not_sure">ವಿನಂತಿ ಯಾರೆಂದು ನಿಮಗೆ ಖಚಿತವಿಲ್ಲದಿದ್ದರೆ, ಕೆಳಗಿನ ಸಂಪರ್ಕಗಳನ್ನು ಪರಿಶೀಲಿಸಿ ಮತ್ತು ಕ್ರಮ ತೆಗೆದುಕೊಳ್ಳಿರಿ.</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="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 -->
+    <plurals name="ReviewCardDialogFragment__if_youre_not_sure">
+        <item quantity="one">If you\'re not sure who the request is from, review the contact below and take action.</item>
+        <item quantity="other">If you\'re not sure who the request is from, review the contacts below and take action.</item>
+    </plurals>
     <string name="ReviewCardDialogFragment__no_other_groups_in_common">ಬೇರೆ ಯಾವುದೇ ಗುಂಪುಗಳು ಸಾಮಾನ್ಯವಾಗಿಲ್ಲ.</string>
     <string name="ReviewCardDialogFragment__no_groups_in_common">ಯಾವುದೇ ಒಂದೇ ಗುಂಪುಗಳಲ್ಲಿಲ್ಲ.</string>
     <plurals name="ReviewCardDialogFragment__d_other_groups_in_common">
@@ -4184,11 +4262,20 @@
     <string name="CallParticipantsListUpdatePopupWindow__s_joined">%1$s ಸೇರಿಕೊಂಡಿದ್ದಾರೆ</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_and_s_joined">%1$s ಹಾಗು %2$s ಸೇರಿಕೊಂಡಿದ್ದಾರೆ</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_s_and_s_joined">%1$s, %2$s ಹಾಗು %3$s ಸೇರಿಕೊಂಡಿದ್ದಾರೆ</string>
-    <string name="CallParticipantsListUpdatePopupWindow__s_s_and_d_others_joined">%1$s, %2$s ಹಾಗು %3$d ಇನ್ನಿತರು ಸೇರಿಕೊಂಡಿದ್ದಾರೆ</string>
+    <!-- Toast message shown in group call when 3 or more people join -->
+    <plurals name="CallParticipantsListUpdatePopupWindow__s_s_and_d_others_joined">
+        <item quantity="one">%1$s, %2$s and %3$d other joined</item>
+        <item quantity="other">%1$s, %2$s and %3$d others joined</item>
+    </plurals>
+    <!-- Toast/popup text shown when someone leaves a group call -->
     <string name="CallParticipantsListUpdatePopupWindow__s_left">%1$s ಉಳಿದಿದ್ದಾರೆ</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_and_s_left">%1$s ಹಾಗು %2$s ಉಳಿದಿದ್ದಾರೆ</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_s_and_s_left">%1$s, %2$s ಹಾಗು %3$s ಉಳಿದಿದ್ದಾರೆ</string>
-    <string name="CallParticipantsListUpdatePopupWindow__s_s_and_d_others_left">%1$s, %2$s ಹಾಗು %3$d ಇನ್ನಿತರು ಉಳಿದಿದ್ದಾರೆ</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 and %3$d other left</item>
+        <item quantity="other">%1$s, %2$s and %3$d others left</item>
+    </plurals>
 
     <string name="CallParticipant__you">ನೀವು</string>
     <string name="CallParticipant__you_on_another_device">ನೀವು (ಮತ್ತೊಂದು ಸಾಧನದಲ್ಲಿ)</string>
@@ -4558,10 +4645,15 @@
 
     <!-- PrivacySettingsFragment -->
     <string name="PrivacySettingsFragment__blocked">ನಿರ್ಬಂಧಿಸಲಾಗಿದೆ</string>
-    <string name="PrivacySettingsFragment__d_contacts">%1$d ಸಂಪರ್ಕಗಳು</string>
+    <!-- Settings label that shows the number blocked contacts -->
+    <plurals name="PrivacySettingsFragment__d_contacts">
+        <item quantity="one">%1$d contact</item>
+        <item quantity="other">%1$d contacts</item>
+    </plurals>
     <string name="PrivacySettingsFragment__messaging">ಸಂದೇಶ ಕಳುಹಿಸುವಿಕೆ</string>
     <string name="PrivacySettingsFragment__disappearing_messages">ಕಣ್ಮರೆಯಾಗುವ ಸಂದೇಶಗಳು</string>
     <string name="PrivacySettingsFragment__app_security">ಆಪ್ ಸುರಕ್ಷತೆ</string>
+    <!-- This refers to the multi-tasking overview (recent apps) from the Android operating system.-->
     <string name="PrivacySettingsFragment__block_screenshots_in_the_recents_list_and_inside_the_app">ಇತ್ತೀಚಿನ ಪಟ್ಟಿಯಲ್ಲಿ ಮತ್ತು ಆ್ಯಪ್‌ನ ಒಳಗೆ ಸ್ಕ್ರೀನ್‌ಶಾಟ್‌ಗಳನ್ನು ನಿರ್ಬಂಧಿಸಿ</string>
     <string name="PrivacySettingsFragment__signal_message_and_calls">Signal ಮೆಸೇಜ್‌ಗಳು ಮತ್ತು ಕಾಲ್‌ಗಳು, ಎಂದಿಗೂ ಕಾಲ್‌ಗಳನ್ನು ರಿಲೇ ಮಾಡಿ ಮತ್ತು ಸೀಲ್ ಮಾಡಿದ ಕಳುಹಿಸುವವರು</string>
     <string name="PrivacySettingsFragment__default_timer_for_new_changes">ಹೊಸ ಚಾಟ್‌ಗಳಿಗೆ ಡೀಫಾಲ್ಟ್ ಟೈಮರ್</string>
@@ -4618,11 +4710,14 @@
     <string name="DataAndStorageSettingsFragment__media_quality">ಮಾಧ್ಯಮ ಗುಣಮಟ್ಟ</string>
     <string name="DataAndStorageSettingsFragment__sent_media_quality">ಮಾಧ್ಯಮ ಗುಣಮಟ್ಟವನ್ನು ಕಳುಹಿಸಲಾಗಿದೆ</string>
     <string name="DataAndStorageSettingsFragment__sending_high_quality_media_will_use_more_data">ಉನ್ನತ ಗುಣಮಟ್ಟದ ಮಾಧ್ಯಮವನ್ನು ಕಳುಹಿಸುವಿಕೆಯು ಹೆಚ್ಚು ಡೇಟಾವನ್ನು ಬಳಸಲಿದೆ.</string>
+    <!-- Setting option that can be selected to default media to be sent as high quality by default -->
     <string name="DataAndStorageSettingsFragment__high">ಹೆಚ್ಚು</string>
+    <!-- Setting option that can be selected to default media to be sent as standard quality by default -->
     <string name="DataAndStorageSettingsFragment__standard">ಪ್ರಮಾಣಿತ</string>
     <string name="DataAndStorageSettingsFragment__calls">ಕರೆಗಳು</string>
 
     <!-- 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__use_custom_colors">ಕಸ್ಟಮ್ ಬಣ್ಣಗಳನ್ನು ಬಳಸಿ</string>
     <string name="ChatColorSelectionFragment__chat_color">ಚಾಟ್ ಬಣ್ಣ</string>
@@ -4834,6 +4929,7 @@
     <string name="AvatarPickerFragment__take_a_picture">ಚಿತ್ರವನ್ನು ತೆಗೆಯಿರಿ</string>
     <string name="AvatarPickerFragment__choose_a_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>
     <string name="AvatarPickerFragment__clear_avatar">ಅವತಾರವನ್ನು ತೆಗೆಯಿರಿ</string>
@@ -4894,7 +4990,7 @@
     <string name="MediaReviewFragment__add_a_message">ಮೆಸೇಜ್ ಸೇರಿಸಿ</string>
     <string name="MediaReviewFragment__add_a_reply">ಉತ್ತರ ಸೇರಿಸಿ</string>
     <string name="MediaReviewFragment__send_to">ಇವರಿಗೆ ಕಳುಹಿಸಿ</string>
-    <string name="MediaReviewFragment__view_once_message">ಏಕ ವೀಕ್ಷಣೆ ಮೆಸೇಜ್</string>
+    <string name="MediaReviewFragment__view_once_message">ಒಮ್ಮೆ ವೀಕ್ಷಿಸಬಹುದಾದ ಮೀಡಿಯಾ</string>
     <string name="MediaReviewFragment__one_or_more_items_were_too_large">ಒಂದು ಅಥವಾ ಹೆಚ್ಚು ಐಟಂಗಳು ತೀರಾ ದೊಡ್ಡದಾಗಿವೆ</string>
     <string name="MediaReviewFragment__one_or_more_items_were_invalid">ಒಂದು ಅಥವಾ ಹೆಚ್ಚು ಐಟಂಗಳು ಅಮಾನ್ಯವಾಗಿವೆ</string>
     <string name="MediaReviewFragment__too_many_items_selected">ತುಂಬಾ ಐಟಂಗಳನ್ನು ಆಯ್ಕೆ ಮಾಡಲಾಗಿದೆ</string>
@@ -5487,7 +5583,7 @@
     <string name="StoryViewerFragment__s_s">%1$s %2$s</string>
     <!-- Displayed when viewing a post you sent -->
     <string name="StoryViewerPageFragment__you">ನೀವು</string>
-    <!-- Displayed when viewing a post displayed to a group -->
+    <!-- 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 -->
     <string name="StoryViewerPageFragment__reply">ಉತ್ತರಿಸಿ</string>
@@ -6704,5 +6800,26 @@
     <!-- Content description for opening the note editor -->
     <string name="ViewNoteSheet__edit_note">ಟಿಪ್ಪಣಿ ಎಡಿಟ್ ಮಾಡಿ</string>
 
+    <!-- BackupProgressService -->
+    <!-- Notification title shown while backup restore job is running -->
+    <string name="BackupProgressService_title">ಬ್ಯಾಕಪ್ ಅನ್ನು ರಿಸ್ಟೋರ್ ಮಾಡಲಾಗುತ್ತಿದೆ…</string>
+    <!-- Notification title shown while downloading backup restore data -->
+    <string name="BackupProgressService_title_downloading">ಬ್ಯಾಕಪ್ ಡೇಟಾವನ್ನು ಡೌನ್‌ಲೋಡ್ ಮಾಡಲಾಗುತ್ತಿದೆ…</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>
+    <!-- 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 -->
+    <string name="BackupsTypeSettingsFragment__google_pay">Google Pay</string>
+    <!-- Displayed as the user\'s payment method as a label in a preference row -->
+    <string name="BackupsTypeSettingsFragment__bank_transfer">Bank transfer</string>
+    <!-- Displayed as the user\'s payment method as a label in a preference row -->
+    <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>
+
+
     <!-- 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 39f6a0695f..d05192eedd 100644
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@@ -1,6 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- smartling.instruction_comments_enabled = on -->
-<resources>
+<?xml version="1.0" encoding="UTF-8"?><!-- 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> -->
@@ -89,6 +87,16 @@
     <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">Allow access to your location</string>
+    <!-- Dialog description that will explain the steps needed to give location permission -->
+    <string name="AttachmentManager_signal_to_send_location">To send your location:</string>
+    <!-- Alert dialog description asking for location permission -->
+    <string name="AttachmentManager_signal_allow_signal_access_location">Allow Molly access to send your location.</string>
+    <!-- Toast text explaining Signal\'s need for location access -->
+    <string name="AttachmentManager_signal_needs_location_access">Molly needs location access to send your location.</string>
+
     <!-- Alert dialog title to show the recipient has not activated payments -->
     <string name="AttachmentManager__not_activated_payments">%1$s 님이 결제를 아직 활성화하지 않았습니다. </string>
     <!-- Alert dialog description to send the recipient a request to activate payments -->
@@ -240,7 +248,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>
@@ -383,8 +391,16 @@
     <string name="ConversationActivity_your_request_to_join_has_been_sent_to_the_group_admin">참가 요청이 그룹 관리자에게 전송되었습니다. 요청이 처리되면 알림을 받게 됩니다.</string>
     <string name="ConversationActivity_cancel_request">요청 취소하기</string>
 
-    <string name="ConversationActivity_to_send_audio_messages_allow_signal_access_to_your_microphone">음성 메시지를 보내려면 Molly이 마이크를 사용할 수 있도록 허용해 주세요.</string>
+    <!-- Dialog title asking users for microphone permission -->
+    <string name="ConversationActivity_allow_access_microphone">Allow access to your microphone</string>
+    <!-- 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>
+    <!-- Toast text explaining Signal\'s need for microphone access -->
+    <string name="ConversationActivity_signal_needs_microphone_access_voice_message">Molly needs microphone access to record a voice message.</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">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>
@@ -408,10 +424,17 @@
     <string name="ConversationActivity_you_will_leave_this_group_and_it_will_be_deleted_from_all_of_your_devices">당신은 그룹을 떠날 것이며, 당신의 모든 기기에서 삭제될 겁니다.</string>
     <string name="ConversationActivity_delete">삭제</string>
     <string name="ConversationActivity_delete_and_leave">삭제 후 나가기</string>
-    <string name="ConversationActivity__to_call_s_signal_needs_access_to_your_microphone">%1$s에게 통화하려면, Molly에서 마이크 권한이 필요합니다.</string>
+
+    <!-- Dialog description that will explain the steps needed to give microphone permissions for a voice call -->
+    <string name="ConversationActivity__to_start_call">To start a 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">To start a call, allow Molly access to your microphone.</string>
+    <!-- Toast text explaining Signal\'s need for microphone access for a voice call -->
+    <string name="ConversationActivity_signal_needs_microphone_access_voice_call">Molly needs microphone access to start a call.</string>
 
 
     <string name="ConversationActivity_join">참가</string>
+    <!-- Button text for an active group call but the call is currently full and unjoinable -->
     <string name="ConversationActivity_full">최대한도 도달</string>
 
     <string name="ConversationActivity_error_sending_media">미디어 전송 오류</string>
@@ -597,6 +620,7 @@
     <string name="ConversationListFragment_unarchive">보관 해제</string>
     <string name="ConversationListFragment_delete">삭제</string>
     <string name="ConversationListFragment_select_all">모두 선택</string>
+    <!-- Screen title shown when selecting multiple items from a list like conversation threads or call logs. -->
     <plurals name="ConversationListFragment_s_selected">
         <item quantity="other">%1$d개 선택됨</item>
     </plurals>
@@ -845,6 +869,7 @@
     <plurals name="GroupManagement_invitation_sent">
         <item quantity="other">%1$d에게 초대가 전송됨</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">\'%1$s\' 님을 내가 그룹에 자동으로 추가할 수 없습니다.\n\n가입 초대를 받았으며 수락할 때까지 그룹 메시지가 표시되지 않습니다.</string>
     <string name="GroupManagement_invite_multiple_users">이 사용자들을 내가 그룹에 자동으로 추가할 수 없습니다.\n\n그룹에 가입하도록 초대되었으며 수락할 때까지 그룹 메시지가 표시되지 않습니다.</string>
 
@@ -1009,7 +1034,9 @@
 
     <string name="ManageGroupActivity_edit_name_and_picture">이름과 그림 수정하기</string>
     <string name="ManageGroupActivity_legacy_group">구형 그룹</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">구형 그룹입니다. 그룹 관리자와 같은 기능은 새 그룹에서만 사용할 수 있습니다.</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">구형 그룹입니다. @멘션 및 관리자와 같은 새로운 기능에 액세스하려면</string>
     <string name="ManageGroupActivity_legacy_group_too_large">이 구형 그룹의 규모가 너무 커서 새 그룹으로 업그레이드할 수 없습니다. 최대 그룹 규모는 %1$d입니다.</string>
     <string name="ManageGroupActivity_upgrade_this_group">그룹을 업그레이드하세요.</string>
@@ -1227,6 +1254,7 @@
         <item quantity="other">삭제</item>
     </plurals>
 
+    <!-- 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="other">%1$d개 선택됨 (%2$s)</item>
     </plurals>
@@ -1290,17 +1318,13 @@
     <string name="MessageRecord_left_group">그룹에서 탈퇴했습니다.</string>
     <string name="MessageRecord_you_updated_group">그룹을 업데이트했습니다.</string>
     <string name="MessageRecord_the_group_was_updated">그룹이 업데이트 되었습니다.</string>
-    <!-- Update message shown when placing an outgoing 1:1 voice/audio call and it\'s answered by the other party -->
+    <!-- Update message shown when placing an outgoing 1:1 voice/audio call -->
     <string name="MessageRecord_outgoing_voice_call">발신 음성 통화</string>
-    <!-- Update message shown when placing an outgoing 1:1 video call and it\'s answered by the other party -->
+    <!-- Update message shown when placing an outgoing 1:1 video call -->
     <string name="MessageRecord_outgoing_video_call">발신 영상 통화</string>
-    <!-- Update message shown when placing an outgoing 1:1 voice/audio call and it\'s not answered by the other party -->
-    <string name="MessageRecord_unanswered_voice_call">미응답 음성 통화</string>
-    <!-- Update message shown when placing an outgoing 1:1 video call and it\'s not answered by the other party -->
-    <string name="MessageRecord_unanswered_video_call">미응답 영상 통화</string>
-    <!-- Update message shown when receiving an incoming 1:1 voice/audio call and it\'s answered -->
+    <!-- Update message shown when receiving an incoming 1:1 voice/audio call and it\'s answered or ringing -->
     <string name="MessageRecord_incoming_voice_call">수신 음성 통화</string>
-    <!-- Update message shown when receiving an incoming 1:1 video call and answered -->
+    <!-- Update message shown when receiving an incoming 1:1 video call and answered or ringing -->
     <string name="MessageRecord_incoming_video_call">수신 영상 통화</string>
     <!-- Update message shown when receiving an incoming 1:1 voice/audio call and not answered -->
     <string name="MessageRecord_missed_voice_call">부재중 음성 통화</string>
@@ -1310,10 +1334,6 @@
     <string name="MessageRecord_missed_voice_call_notification_profile">알림 프로필을 사용하는 동안 받지 못한 전화가 있습니다.</string>
     <!-- Update message shown when receiving an incoming video call and declined due to notification profile -->
     <string name="MessageRecord_missed_video_call_notification_profile">알림 프로필을 사용하는 동안 받지 못한 화상 통화가 있습니다.</string>
-    <!-- Update message shown when receiving an incoming 1:1 voice/audio call and explicitly declined -->
-    <string name="MessageRecord_you_declined_a_voice_call">음성 통화를 거부했습니다.</string>
-    <!-- Update message shown when receiving an incoming 1:1 video call and explicitly declined -->
-    <string name="MessageRecord_you_declined_a_video_call">영상 통화를 거부했습니다.</string>
     <!-- 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>
@@ -1514,28 +1534,53 @@
     <string name="MessageRecord_can_accept_payments">%1$s 님이 이제 결제를 수락할 수 있습니다.</string>
 
     <!-- Group Calling update messages -->
-    <string name="MessageRecord_s_started_a_group_call_s">%1$s 님이 그룹 통화를 시작했습니다(%2$s).</string>
-    <string name="MessageRecord_you_started_a_group_call_s">내가 그룹 통화를 시작함 · %1$s</string>
-    <string name="MessageRecord_s_is_in_the_group_call_s">%1$s 님이 그룹 통화 중입니다(%2$s).</string>
-    <string name="MessageRecord_you_are_in_the_group_call_s1">그룹 통화 중입니다(%1$s).</string>
-    <string name="MessageRecord_s_and_s_are_in_the_group_call_s1">%1$s 및 %2$s 님이 그룹 통화 중입니다(%3$s).</string>
-    <string name="MessageRecord_group_call_s">그룹 통화: %1$s</string>
-
-    <string name="MessageRecord_s_started_a_group_call">%1$s 님이 그룹 통화를 시작했습니다.</string>
-    <string name="MessageRecord_you_started_a_group_call">그룹 통화를 시작함</string>
-    <string name="MessageRecord_s_is_in_the_group_call">%1$s 님이 그룹 통화 중입니다.</string>
-    <string name="MessageRecord_you_are_in_the_group_call">그룹 통화 중입니다.</string>
-    <string name="MessageRecord_s_and_s_are_in_the_group_call">%1$s 및 %2$s 님이 그룹 통화 중입니다.</string>
-    <string name="MessageRecord_group_call">그룹 통화</string>
+    <!-- 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 님이 통화에 참여했습니다 · %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">통화에 참여했습니다 · %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 님과 %2$s 님이 통화에 참여했습니다 · %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 님이 통화에 참여했습니다</string>
+    <!-- Chat log text for an ongoing group call only the local user has joined -->
+    <string name="MessageRecord_you_are_in_the_call">통화에 참여했습니다</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 님과 %2$s 님이 통화에 참여했습니다</string>
+    <!-- Chat log text for a group call that ended within the last 5 minutes -->
+    <string name="MessageRecord__the_video_call_has_ended">화상 통화를 종료했습니다</string>
+    <!-- Chat log text for a group call that ended within the last 5 minutes with a placeholder for formatted time -->
+    <string name="MessageRecord__the_video_call_has_ended_s">화상 통화를 종료했습니다 · %1$s</string>
+    <!-- Chat log text for a group call that ended more than 5 minutes ago and was missed -->
+    <string name="MessageRecord__missed_video_call">부재중 영상 통화</string>
+    <!-- Chat log text for a group call that ended more than 5 minutes ago and was missed with a placeholder for formatted time -->
+    <string name="MessageRecord__missed_video_call_s">부재중 영상 통화 %1$s</string>
+    <!-- Chat log text for a group call that ended that the local user did not start -->
+    <string name="MessageRecord__incoming_video_call">수신 영상 통화</string>
+    <!-- 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">화상 통화 수신 중 · %1$s</string>
+    <!-- Chat log text for a group call that ended that the local user started -->
+    <string name="MessageRecord__outgoing_video_call">발신 영상 통화</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">화상 통화 발신 중 · %1$s</string>
+    <!-- Chat log text for an ongoing group call that the local user started -->
+    <string name="MessageRecord__you_started_a_video_call">화상 통화를 시작했습니다</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">화상 통화를 시작했습니다 · %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 님이 화상 통화를 시작했습니다</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 님이 화상 통화를 시작했습니다 · %2$s</string>
 
     <string name="MessageRecord_you">나</string>
 
-    <plurals name="MessageRecord_s_s_and_d_others_are_in_the_group_call_s">
-        <item quantity="other">%1$s, %2$s 및 %3$d명이 그룹 통화 중입니다(%4$s).</item>
+    <!-- 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="other">%1$s, %2$s 외 %3$d명이 그룹 통화 중입니다(%4$s).</item>
     </plurals>
 
-    <plurals name="MessageRecord_s_s_and_d_others_are_in_the_group_call">
-        <item quantity="other">%1$s, %2$s 및 %3$d명이 그룹 통화 중입니다.</item>
+    <!-- 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="other">%1$s, %2$s 외 %3$d명이 그룹 통화 중입니다.</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. -->
@@ -1984,6 +2029,7 @@
     <!-- Generic error when the app is unable to request an SMS code for an unknown reason. -->
     <string name="RegistrationActivity_unable_to_request_verification_code">확인 코드를 요청하지 못했습니다. 네트워크 연결을 확인하고 다시 시도하세요.</string>
     <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">Molly Android - 전화번호 형식</string>
     <!--    Small "toast" notification to the user confirming that they have requested a new code via voice call.-->
@@ -2127,7 +2173,7 @@
     <string name="SubmitDebugLogActivity_this_log_will_be_posted_publicly_online_for_contributors">이 로그는 기여자가 볼 수 있도록 온라인에 공개적으로 게시됩니다. 업로드하기 전에 검토할 수 있습니다.</string>
 
     <!-- SupportEmailUtil -->
-  <!-- Removed by excludeNonTranslatables <string name="SupportEmailUtil_support_email" translatable="false">support@molly.im</string> -->
+  <!-- Removed by excludeNonTranslatables <string name="SupportEmailUtil_support_email" translatable="false">support@signal.org</string> -->
     <string name="SupportEmailUtil_filter">필터:</string>
     <string name="SupportEmailUtil_device_info">기기 정보:</string>
     <string name="SupportEmailUtil_android_version">안드로이드 버전:</string>
@@ -2622,6 +2668,8 @@
     <string name="ConversationUpdateItem_loading">로드 중</string>
     <string name="ConversationUpdateItem_learn_more">더 알아보기</string>
     <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_call_is_full">통화 참가자 수 최대</string>
     <string name="ConversationUpdateItem_invite_friends">친구 초대</string>
@@ -2686,6 +2734,7 @@
     <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>
 
     <!-- EnableCallNotificationSettingsDialog__call_notifications_checklist -->
@@ -2992,6 +3041,7 @@
 
     <string name="arrays__default">기본</string>
     <string name="arrays__high">높음</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">최대</string>
 
     <!-- plurals.xml -->
@@ -3260,7 +3310,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">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">Molly 결제는 더 이상 사용할 수 없습니다. 여전히 거래소로 자금을 이체할 수 있지만 더 이상 지불을 주고받거나 자금을 추가할 수 없습니다.</string>
@@ -3309,6 +3359,14 @@
     <!-- Storage permission row description -->
     <string name="GrantPermissionsFragment__send_photos_videos_and_files">기기에서 사진, 동영상, 파일을 전송하세요.</string>
 
+    <!-- PermissionDeniedBottomSheet -->
+    <!-- Sheet describing step 1 on how to give permissions by opening settings -->
+    <string name="PermissionDeniedBottomSheet__1_tap_settings_below">1. Tap “Settings” below</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 Allow the permission</string>
+    <!-- Label for button at the bottom of the sheet which opens the system permission settings -->
+    <string name="PermissionDeniedBottomSheet__settings">Settings</string>
+
     <!-- PaymentsSecuritySetupFragment -->
     <!-- Toolbar title -->
     <string name="PaymentsSecuritySetupFragment__security_setup">보안 설정</string>
@@ -3349,6 +3407,7 @@
     <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__information">지불 금액 및 거래 시간을 비롯한 거래 세부 정보는 MobileCoin Ledger의 일부입니다.</string>
@@ -3411,6 +3470,7 @@
     <string name="ConfirmPayment__confirm_payment">결제 확인</string>
     <string name="ConfirmPayment__network_fee">네트워크 요금</string>
     <string name="ConfirmPayment__estimated_s">예상 %1$s</string>
+    <!-- Prefix to a name to indicate who a payment will be sent to -->
     <string name="ConfirmPayment__to">받는이:</string>
     <string name="ConfirmPayment__total_amount">총액</string>
     <string name="ConfirmPayment__balance_s">잔액: %1$s</string>
@@ -3559,6 +3619,14 @@
     <string name="conversation_group_options__conversation">대화</string>
     <string name="conversation_group_options__broadcast">방송</string>
 
+    <!-- DoubleTapEditEducationSheet -->
+    <!-- Displayed as the title of the education bottom sheet -->
+    <string name="DoubleTapEditEducationSheet__double_tap_edit_title">Double tap to edit</string>
+    <!-- Text on the sheet explaining how double tapping on a message will let them edit it -->
+    <string name="DoubleTapEditEducationSheet__quickly_tap_twice">Quickly tap twice on your messages to edit them. You can edit your messages up to 24hrs after they’ve been sent.</string>
+    <!-- Button label to dismiss sheet -->
+    <string name="DoubleTapEditEducationSheet__got_it">Got it</string>
+
     <!-- text_secure_normal -->
     <string name="text_secure_normal__menu_new_group">새 그룹</string>
     <string name="text_secure_normal__menu_settings">설정</string>
@@ -4006,6 +4074,7 @@
     <string name="RecipientBottomSheet_copied_to_clipboard">클립보드로 복사됨</string>
 
     <string name="GroupRecipientListItem_admin">관리자</string>
+    <!-- Button text to approve a user that has requested to join a group -->
     <string name="GroupRecipientListItem_approve_description">승인</string>
     <string name="GroupRecipientListItem_deny_description">거부</string>
 
@@ -4033,6 +4102,7 @@
 
     <!-- VoiceNoteMediaDescriptionCompatFactory -->
     <string name="VoiceNoteMediaItemFactory__voice_message">음성 메시지 %1$s</string>
+    <!-- This is a title in a banner describing the conversation sender to receiver placeholders of the currently playing voice memo. -->
     <string name="VoiceNoteMediaItemFactory__s_to_s">%1$s~%2$s</string>
 
     <!-- StorageUtil -->
@@ -4046,8 +4116,14 @@
     <string name="ReviewCardDialogFragment__review_members">구성원 검토</string>
     <!-- Title of a screen where the user will be prompted to review a message request matching the name of someone they already know -->
     <string name="ReviewCardDialogFragment__review_request">검토 요청</string>
-    <string name="ReviewCardDialogFragment__d_group_members_have_the_same_name">%1$d명의 그룹 멤버가 같은 이름을 가지고 있습니다. 아래 멤버를 검토한 후 조치를 취하세요.</string>
-    <string name="ReviewCardDialogFragment__if_youre_not_sure">요청의 출처가 확실하지 않은 경우 아래 연락처를 검토하고 조치를 취하세요.</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="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 -->
+    <plurals name="ReviewCardDialogFragment__if_youre_not_sure">
+        <item quantity="other">If you\'re not sure who the request is from, review the contacts below and take action.</item>
+    </plurals>
     <string name="ReviewCardDialogFragment__no_other_groups_in_common">공통된 다른 그룹이 없습니다.</string>
     <string name="ReviewCardDialogFragment__no_groups_in_common">공통된 그룹이 없습니다.</string>
     <plurals name="ReviewCardDialogFragment__d_other_groups_in_common">
@@ -4076,11 +4152,18 @@
     <string name="CallParticipantsListUpdatePopupWindow__s_joined">%1$s 가입함</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_and_s_joined">%1$s 및 %2$s 가입함</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_s_and_s_joined">%1$s, %2$s 및 %3$s 가입함</string>
-    <string name="CallParticipantsListUpdatePopupWindow__s_s_and_d_others_joined">%1$s, %2$s 및 %3$d명이 가입함</string>
+    <!-- Toast message shown in group call when 3 or more people join -->
+    <plurals name="CallParticipantsListUpdatePopupWindow__s_s_and_d_others_joined">
+        <item quantity="other">%1$s, %2$s and %3$d others joined</item>
+    </plurals>
+    <!-- Toast/popup text shown when someone leaves a group call -->
     <string name="CallParticipantsListUpdatePopupWindow__s_left">%1$s 남음</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_and_s_left">%1$s 및 %2$s 남음</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_s_and_s_left">%1$s, %2$s 및 %3$s 남음</string>
-    <string name="CallParticipantsListUpdatePopupWindow__s_s_and_d_others_left">%1$s, %2$s 및 %3$d명 남음</string>
+    <!-- Toast message shown in group call when 3 or more people leave -->
+    <plurals name="CallParticipantsListUpdatePopupWindow__s_s_and_d_others_left">
+        <item quantity="other">%1$s, %2$s and %3$d others left</item>
+    </plurals>
 
     <string name="CallParticipant__you">나</string>
     <string name="CallParticipant__you_on_another_device">나(다른 기기에서)</string>
@@ -4448,10 +4531,14 @@
 
     <!-- PrivacySettingsFragment -->
     <string name="PrivacySettingsFragment__blocked">차단함</string>
-    <string name="PrivacySettingsFragment__d_contacts">연락처 %1$d개</string>
+    <!-- Settings label that shows the number blocked contacts -->
+    <plurals name="PrivacySettingsFragment__d_contacts">
+        <item quantity="other">%1$d contacts</item>
+    </plurals>
     <string name="PrivacySettingsFragment__messaging">메시징</string>
     <string name="PrivacySettingsFragment__disappearing_messages">사라지는 메시지</string>
     <string name="PrivacySettingsFragment__app_security">애플리케이션 보안</string>
+    <!-- This refers to the multi-tasking overview (recent apps) from the Android operating system.-->
     <string name="PrivacySettingsFragment__block_screenshots_in_the_recents_list_and_inside_the_app">최근 사용 목록과 앱 내 스크린샷 차단</string>
     <string name="PrivacySettingsFragment__signal_message_and_calls">신호 메시지 및 통화, 항상 중계 통화 및 봉인된 발신자</string>
     <string name="PrivacySettingsFragment__default_timer_for_new_changes">새 대화를 위한 기본 타이머</string>
@@ -4508,11 +4595,14 @@
     <string name="DataAndStorageSettingsFragment__media_quality">미디어 품질</string>
     <string name="DataAndStorageSettingsFragment__sent_media_quality">미디어 전송 품질</string>
     <string name="DataAndStorageSettingsFragment__sending_high_quality_media_will_use_more_data">고품질 미디어는 더 많은 모바일 데이터를 사용할 수 있습니다.</string>
+    <!-- Setting option that can be selected to default media to be sent as high quality by default -->
     <string name="DataAndStorageSettingsFragment__high">높음</string>
+    <!-- Setting option that can be selected to default media to be sent as standard quality by default -->
     <string name="DataAndStorageSettingsFragment__standard">기본</string>
     <string name="DataAndStorageSettingsFragment__calls">전화</string>
 
     <!-- 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__use_custom_colors">사용자 지정 색상 사용하기</string>
     <string name="ChatColorSelectionFragment__chat_color">대화창 색</string>
@@ -4721,6 +4811,7 @@
     <string name="AvatarPickerFragment__take_a_picture">사진을 찍다</string>
     <string name="AvatarPickerFragment__choose_a_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>
     <string name="AvatarPickerFragment__clear_avatar">아바타 지우기</string>
@@ -4777,7 +4868,7 @@
     <string name="MediaReviewFragment__add_a_message">메시지 추가</string>
     <string name="MediaReviewFragment__add_a_reply">답장 추가</string>
     <string name="MediaReviewFragment__send_to">받는 사람</string>
-    <string name="MediaReviewFragment__view_once_message">한 번 보기 메시지</string>
+    <string name="MediaReviewFragment__view_once_message">한 번만 볼 수 있는 미디어</string>
     <string name="MediaReviewFragment__one_or_more_items_were_too_large">하나 이상의 항목이 너무 큽니다.</string>
     <string name="MediaReviewFragment__one_or_more_items_were_invalid">하나 이상의 항목이 유효하지 않습니다.</string>
     <string name="MediaReviewFragment__too_many_items_selected">항목을 너무 많이 선택했습니다.</string>
@@ -5365,7 +5456,7 @@
     <string name="StoryViewerFragment__s_s">%1$s %2$s</string>
     <!-- Displayed when viewing a post you sent -->
     <string name="StoryViewerPageFragment__you">나</string>
-    <!-- Displayed when viewing a post displayed to a group -->
+    <!-- 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 -->
     <string name="StoryViewerPageFragment__reply">답장</string>
@@ -6534,7 +6625,7 @@
     <!-- Title displayed at the top of the screen -->
     <string name="NicknameActivity__nickname">별칭</string>
     <!-- Subtitle displayed under title -->
-    <string name="NicknameActivity__nicknames_amp_notes">Nicknames &amp; notes are stored with Signal and end-to-end encrypted. They are only visible to you.</string>
+    <string name="NicknameActivity__nicknames_amp_notes">별칭과 메모는 Signal에 엔드투엔드 암호화되어 저장됩니다. 해당 항목은 사용자에게만 표시됩니다.</string>
     <!-- Field label for given name -->
     <string name="NicknameActivity__first_name">이름</string>
     <!-- Content description for first name clear button -->
@@ -6548,9 +6639,9 @@
     <!-- Button label to save -->
     <string name="NicknameActivity__save">저장</string>
     <!-- Dialog title for note and name deletion -->
-    <string name="NicknameActivity__delete_nickname">Delete?</string>
+    <string name="NicknameActivity__delete_nickname">삭제하시겠어요?</string>
     <!-- Dialog message for note and name deletion -->
-    <string name="NicknameActivity__this_will_permanently_delete_this_nickname_and_note">This will permanently delete any nickname and note you’ve set.</string>
+    <string name="NicknameActivity__this_will_permanently_delete_this_nickname_and_note">설정한 별칭과 메모를 영구 삭제합니다.</string>
 
     <!-- ViewNoteBottomSheetDialogFragment -->
     <!-- Sheet title -->
@@ -6558,5 +6649,26 @@
     <!-- Content description for opening the note editor -->
     <string name="ViewNoteSheet__edit_note">메모 수정</string>
 
+    <!-- BackupProgressService -->
+    <!-- Notification title shown while backup restore job is running -->
+    <string name="BackupProgressService_title">백업을 복원하는 중…</string>
+    <!-- Notification title shown while downloading backup restore data -->
+    <string name="BackupProgressService_title_downloading">백업 데이터를 다운로드하는 중…</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>
+    <!-- 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 -->
+    <string name="BackupsTypeSettingsFragment__google_pay">Google Pay</string>
+    <!-- Displayed as the user\'s payment method as a label in a preference row -->
+    <string name="BackupsTypeSettingsFragment__bank_transfer">Bank transfer</string>
+    <!-- Displayed as the user\'s payment method as a label in a preference row -->
+    <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>
+
+
     <!-- 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 614d15052c..313c994364 100644
--- a/app/src/main/res/values-ky/strings.xml
+++ b/app/src/main/res/values-ky/strings.xml
@@ -1,6 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- smartling.instruction_comments_enabled = on -->
-<resources>
+<?xml version="1.0" encoding="UTF-8"?><!-- 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> -->
@@ -89,6 +87,16 @@
     <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">Allow access to your location</string>
+    <!-- Dialog description that will explain the steps needed to give location permission -->
+    <string name="AttachmentManager_signal_to_send_location">To send your location:</string>
+    <!-- Alert dialog description asking for location permission -->
+    <string name="AttachmentManager_signal_allow_signal_access_location">Allow Molly access to send your location.</string>
+    <!-- Toast text explaining Signal\'s need for location access -->
+    <string name="AttachmentManager_signal_needs_location_access">Molly needs location access to send your location.</string>
+
     <!-- Alert dialog title to show the recipient has not activated payments -->
     <string name="AttachmentManager__not_activated_payments">%1$s төлөмдөр кызматын иштете элек </string>
     <!-- Alert dialog description to send the recipient a request to activate payments -->
@@ -240,7 +248,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>
@@ -383,8 +391,16 @@
     <string name="ConversationActivity_your_request_to_join_has_been_sent_to_the_group_admin">Кошулуу өтүнүчүңүз топтун администраторуна жөнөтүлдү. Анын чечими тууралуу билдирме аласыз.</string>
     <string name="ConversationActivity_cancel_request">Өтүнүчтү жокко чыгаруу</string>
 
-    <string name="ConversationActivity_to_send_audio_messages_allow_signal_access_to_your_microphone">Аудио билдирүүлөрдү жөнөтүү үчүн Molly колдонмосуна микрофонуңузду жеткиликтүү кылышыңыз керек.</string>
+    <!-- Dialog title asking users for microphone permission -->
+    <string name="ConversationActivity_allow_access_microphone">Allow access to your microphone</string>
+    <!-- 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>
+    <!-- Toast text explaining Signal\'s need for microphone access -->
+    <string name="ConversationActivity_signal_needs_microphone_access_voice_message">Molly needs microphone access to record a voice message.</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">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>
@@ -408,10 +424,17 @@
     <string name="ConversationActivity_you_will_leave_this_group_and_it_will_be_deleted_from_all_of_your_devices">Бул топтон чыгасыз жана ал бардык түзмөктөрүңүздөн өчүрүлөт.</string>
     <string name="ConversationActivity_delete">Өчүрүү</string>
     <string name="ConversationActivity_delete_and_leave">Өчүрүп, топтон чыгам</string>
-    <string name="ConversationActivity__to_call_s_signal_needs_access_to_your_microphone">%1$s чалуу үчүн Molly колдонмосуна микрофонуңуз керек</string>
+
+    <!-- Dialog description that will explain the steps needed to give microphone permissions for a voice call -->
+    <string name="ConversationActivity__to_start_call">To start a 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">To start a call, allow Molly access to your microphone.</string>
+    <!-- Toast text explaining Signal\'s need for microphone access for a voice call -->
+    <string name="ConversationActivity_signal_needs_microphone_access_voice_call">Molly needs microphone access to start a call.</string>
 
 
     <string name="ConversationActivity_join">Кошулуу</string>
+    <!-- Button text for an active group call but the call is currently full and unjoinable -->
     <string name="ConversationActivity_full">Толуп калган</string>
 
     <string name="ConversationActivity_error_sending_media">Медиафайлды жөнөтүүдө ката кетти</string>
@@ -597,6 +620,7 @@
     <string name="ConversationListFragment_unarchive">Архивден чыгар</string>
     <string name="ConversationListFragment_delete">Өчүрүү</string>
     <string name="ConversationListFragment_select_all">Баарын тандоо</string>
+    <!-- Screen title shown when selecting multiple items from a list like conversation threads or call logs. -->
     <plurals name="ConversationListFragment_s_selected">
         <item quantity="other">%1$d тандалды</item>
     </plurals>
@@ -845,6 +869,7 @@
     <plurals name="GroupManagement_invitation_sent">
         <item quantity="other">%1$d чакыруу жөнөтүлдү</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">“%1$s” автоматтык түрдө бул топко кошула албайт.\n\nАны топко кошулууга чакыргансыз жана чакырууну кабыл алмайынча топтогу билдирүүлөрдү көрө албайт.</string>
     <string name="GroupManagement_invite_multiple_users">Бул колдонуучулар автоматтык түрдө бул топко кошула алышпайт.\n\nАларды топко кошулууга чакыргансыз жана чакырууну кабыл алмайынча топтогу билдирүүлөрдү көрө алышпайт.</string>
 
@@ -1009,7 +1034,9 @@
 
     <string name="ManageGroupActivity_edit_name_and_picture">Ысым менен сүрөттү өзгөртүү</string>
     <string name="ManageGroupActivity_legacy_group">Эски топ</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">Бул эски топ. Топтун администраторлору сыяктуу функциялар жаңы топтордо гана иштейт.</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">Бул эски топ. @айтыпөтүүлөр жана администраторлор сыяктуу жаңы функцияларды пайдалануу үчүн</string>
     <string name="ManageGroupActivity_legacy_group_too_large">Бул эски топ өтө чоң болгондуктан, жаңы топко жаңырбайт. Топтун көлөмү %1$d ашпаш керек.</string>
     <string name="ManageGroupActivity_upgrade_this_group">бул топту жаңыртыңыз.</string>
@@ -1227,6 +1254,7 @@
         <item quantity="other">Өчүрүү</item>
     </plurals>
 
+    <!-- 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="other">%1$d тандалды (%2$s)</item>
     </plurals>
@@ -1290,17 +1318,13 @@
     <string name="MessageRecord_left_group">Топтон чыктыңыз.</string>
     <string name="MessageRecord_you_updated_group">Топту жаңырттыңыз.</string>
     <string name="MessageRecord_the_group_was_updated">Топ жаңыртылды.</string>
-    <!-- Update message shown when placing an outgoing 1:1 voice/audio call and it\'s answered by the other party -->
+    <!-- Update message shown when placing an outgoing 1:1 voice/audio call -->
     <string name="MessageRecord_outgoing_voice_call">Чыгуучу аудио чалуу</string>
-    <!-- Update message shown when placing an outgoing 1:1 video call and it\'s answered by the other party -->
+    <!-- Update message shown when placing an outgoing 1:1 video call -->
     <string name="MessageRecord_outgoing_video_call">Чыгуучу аудио чалуу</string>
-    <!-- Update message shown when placing an outgoing 1:1 voice/audio call and it\'s not answered by the other party -->
-    <string name="MessageRecord_unanswered_voice_call">Жооп берилбеген аудио чалуу</string>
-    <!-- Update message shown when placing an outgoing 1:1 video call and it\'s not answered by the other party -->
-    <string name="MessageRecord_unanswered_video_call">Жооп берилбеген аудио чалуу</string>
-    <!-- Update message shown when receiving an incoming 1:1 voice/audio call and it\'s answered -->
+    <!-- Update message shown when receiving an incoming 1:1 voice/audio call and it\'s answered or ringing -->
     <string name="MessageRecord_incoming_voice_call">Келүүчү аудио чалуу</string>
-    <!-- Update message shown when receiving an incoming 1:1 video call and answered -->
+    <!-- Update message shown when receiving an incoming 1:1 video call and answered or ringing -->
     <string name="MessageRecord_incoming_video_call">Келүүчү аудио чалуу</string>
     <!-- Update message shown when receiving an incoming 1:1 voice/audio call and not answered -->
     <string name="MessageRecord_missed_voice_call">Кабыл алынбаган аудио чалуу</string>
@@ -1310,10 +1334,6 @@
     <string name="MessageRecord_missed_voice_call_notification_profile">Билдирмелер профили иштеп турганда кабыл алынбай калган аудио чалуу</string>
     <!-- Update message shown when receiving an incoming video call and declined due to notification profile -->
     <string name="MessageRecord_missed_video_call_notification_profile">Билдирмелер профили иштеп турганда кабыл алынбай калган видео чалуу</string>
-    <!-- Update message shown when receiving an incoming 1:1 voice/audio call and explicitly declined -->
-    <string name="MessageRecord_you_declined_a_voice_call">Аудио чалуудан баш тарттыңыз</string>
-    <!-- Update message shown when receiving an incoming 1:1 video call and explicitly declined -->
-    <string name="MessageRecord_you_declined_a_video_call">Видео чалуудан баш тарттыңыз</string>
     <!-- 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>
@@ -1514,27 +1534,52 @@
     <string name="MessageRecord_can_accept_payments">%1$s эми төлөмдөрдү ала алат</string>
 
     <!-- Group Calling update messages -->
-    <string name="MessageRecord_s_started_a_group_call_s">%1$s топтун ичинде чалып баштады · %2$s</string>
-    <string name="MessageRecord_you_started_a_group_call_s">Топтук чалууну баштадыңыз · %1$s</string>
-    <string name="MessageRecord_s_is_in_the_group_call_s">%1$s топтун ичиндеги чалууда · %2$s</string>
-    <string name="MessageRecord_you_are_in_the_group_call_s1">Топтук чалуудасыз · %1$s</string>
-    <string name="MessageRecord_s_and_s_are_in_the_group_call_s1">%1$s менен %2$s топтук чалууда · %3$s</string>
-    <string name="MessageRecord_group_call_s">Топтук чалуу · %1$s</string>
-
-    <string name="MessageRecord_s_started_a_group_call">%1$s топтун ичинде чалып баштады</string>
-    <string name="MessageRecord_you_started_a_group_call">Топтук чалууну баштадыңыз</string>
-    <string name="MessageRecord_s_is_in_the_group_call">%1$s топтук чалууда</string>
-    <string name="MessageRecord_you_are_in_the_group_call">Топтук чалуудасыз</string>
-    <string name="MessageRecord_s_and_s_are_in_the_group_call">%1$s менен %2$s топтук чалууда</string>
-    <string name="MessageRecord_group_call">Топтук чалуу</string>
+    <!-- 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 сүйлөшүп жатат · %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">Сүйлөшүп жатасыз · %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 менен %2$s сүйлөшүп жатышат · %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 сүйлөшүп жатат</string>
+    <!-- Chat log text for an ongoing group call only the local user has joined -->
+    <string name="MessageRecord_you_are_in_the_call">Сүйлөшүп жатасыз</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 менен %2$s сүйлөшүп жатат</string>
+    <!-- Chat log text for a group call that ended within the last 5 minutes -->
+    <string name="MessageRecord__the_video_call_has_ended">Видео чалуу бүттү</string>
+    <!-- Chat log text for a group call that ended within the last 5 minutes with a placeholder for formatted time -->
+    <string name="MessageRecord__the_video_call_has_ended_s">Видео чалуу бүттү · %1$s</string>
+    <!-- Chat log text for a group call that ended more than 5 minutes ago and was missed -->
+    <string name="MessageRecord__missed_video_call">Кабыл алынбаган аудио чалуу</string>
+    <!-- Chat log text for a group call that ended more than 5 minutes ago and was missed with a placeholder for formatted time -->
+    <string name="MessageRecord__missed_video_call_s">Жооп берилбеген видео чалуу · %1$s</string>
+    <!-- Chat log text for a group call that ended that the local user did not start -->
+    <string name="MessageRecord__incoming_video_call">Келүүчү аудио чалуу</string>
+    <!-- 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">Бирөө видео режиминде чалды · %1$s</string>
+    <!-- Chat log text for a group call that ended that the local user started -->
+    <string name="MessageRecord__outgoing_video_call">Чыгуучу аудио чалуу</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">Бирөөгө видео режиминде чалдыңыз · %1$s</string>
+    <!-- Chat log text for an ongoing group call that the local user started -->
+    <string name="MessageRecord__you_started_a_video_call">Видео режиминде чалып баштадыңыз</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">Видео режиминде чалып баштадыңыз · %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 видео режиминде чалып баштады</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 видео режиминде чалып баштады · %2$s</string>
 
     <string name="MessageRecord_you">Сиз</string>
 
-    <plurals name="MessageRecord_s_s_and_d_others_are_in_the_group_call_s">
+    <!-- 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="other">%1$s, %2$s жана дагы %3$d топтук чалууда · %4$s</item>
     </plurals>
 
-    <plurals name="MessageRecord_s_s_and_d_others_are_in_the_group_call">
+    <!-- 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="other">%1$s, %2$s жана дагы %3$d топтук чалууда</item>
     </plurals>
 
@@ -1984,6 +2029,7 @@
     <!-- Generic error when the app is unable to request an SMS code for an unknown reason. -->
     <string name="RegistrationActivity_unable_to_request_verification_code">Ырастоо коду суралган жок. Байланышыңызды текшерип, кайталап көрүңүз.</string>
     <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">Molly Android - Телефон номеринин форматы</string>
     <!--    Small "toast" notification to the user confirming that they have requested a new code via voice call.-->
@@ -2127,7 +2173,7 @@
     <string name="SubmitDebugLogActivity_this_log_will_be_posted_publicly_online_for_contributors">Бул журнал иштеп чыгуучулар көрө алышы үчүн Интернетке жайгаштырылат. Жөнөтүүдөн мурун баштан аяк көз жүгүртүп чыгыңыз.</string>
 
     <!-- SupportEmailUtil -->
-  <!-- Removed by excludeNonTranslatables <string name="SupportEmailUtil_support_email" translatable="false">support@molly.im</string> -->
+  <!-- Removed by excludeNonTranslatables <string name="SupportEmailUtil_support_email" translatable="false">support@signal.org</string> -->
     <string name="SupportEmailUtil_filter">Иргөө:</string>
     <string name="SupportEmailUtil_device_info">Түзмөк тууралуу маалымат:</string>
     <string name="SupportEmailUtil_android_version">Android версиясы:</string>
@@ -2622,6 +2668,8 @@
     <string name="ConversationUpdateItem_loading">Жүктөлүүдө</string>
     <string name="ConversationUpdateItem_learn_more">Кененирээк маалымат</string>
     <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_call_is_full">Орун жок</string>
     <string name="ConversationUpdateItem_invite_friends">Досторду чакыруу</string>
@@ -2686,6 +2734,7 @@
     <string name="safety_number_change_dialog__leave_call">Чалуудан чыгуу</string>
     <string name="safety_number_change_dialog__the_following_people_may_have_reinstalled_or_changed_devices">Төмөнкү адамдар Signal\'ды кайрадан орнотуп же түзмөктөрүн алмаштырышкан. Купуялыкты камсыз кылуу үчүн алар менен болгон коопсуздук кодуңузду ырастаңыз.</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>
 
     <!-- EnableCallNotificationSettingsDialog__call_notifications_checklist -->
@@ -2992,6 +3041,7 @@
 
     <string name="arrays__default">Демейки</string>
     <string name="arrays__high">Шашылыш</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">Өтө</string>
 
     <!-- plurals.xml -->
@@ -3260,7 +3310,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>
@@ -3309,6 +3359,14 @@
     <!-- Storage permission row description -->
     <string name="GrantPermissionsFragment__send_photos_videos_and_files">Түзмөгүңүздөн сүрөттөрдү, видеолорду жана файлдарды жөнөтөсүз.</string>
 
+    <!-- PermissionDeniedBottomSheet -->
+    <!-- Sheet describing step 1 on how to give permissions by opening settings -->
+    <string name="PermissionDeniedBottomSheet__1_tap_settings_below">1. Tap “Settings” below</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 Allow the permission</string>
+    <!-- Label for button at the bottom of the sheet which opens the system permission settings -->
+    <string name="PermissionDeniedBottomSheet__settings">Settings</string>
+
     <!-- PaymentsSecuritySetupFragment -->
     <!-- Toolbar title -->
     <string name="PaymentsSecuritySetupFragment__security_setup">Коопсуздук параметрлери</string>
@@ -3349,6 +3407,7 @@
     <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">%2$s күнү, саат %3$s\'та %1$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__information">Транзакциянын чоо-жайы, ошондой эле төлөмдүн суммасы жана транзакция убактысы MobileCoin Ledger\'дин бир бөлүгү болуп саналат.</string>
@@ -3411,6 +3470,7 @@
     <string name="ConfirmPayment__confirm_payment">Төлөмдү ырастоо</string>
     <string name="ConfirmPayment__network_fee">Тармак комиссиясы</string>
     <string name="ConfirmPayment__estimated_s">Болжолдуу %1$s</string>
+    <!-- Prefix to a name to indicate who a payment will be sent to -->
     <string name="ConfirmPayment__to">Алуучу</string>
     <string name="ConfirmPayment__total_amount">Жалпы суммасы</string>
     <string name="ConfirmPayment__balance_s">Баланс: %1$s</string>
@@ -3559,6 +3619,14 @@
     <string name="conversation_group_options__conversation">Маек</string>
     <string name="conversation_group_options__broadcast">Берүү</string>
 
+    <!-- DoubleTapEditEducationSheet -->
+    <!-- Displayed as the title of the education bottom sheet -->
+    <string name="DoubleTapEditEducationSheet__double_tap_edit_title">Double tap to edit</string>
+    <!-- Text on the sheet explaining how double tapping on a message will let them edit it -->
+    <string name="DoubleTapEditEducationSheet__quickly_tap_twice">Quickly tap twice on your messages to edit them. You can edit your messages up to 24hrs after they’ve been sent.</string>
+    <!-- Button label to dismiss sheet -->
+    <string name="DoubleTapEditEducationSheet__got_it">Got it</string>
+
     <!-- text_secure_normal -->
     <string name="text_secure_normal__menu_new_group">Жаңы топ</string>
     <string name="text_secure_normal__menu_settings">Тууралоо</string>
@@ -4006,6 +4074,7 @@
     <string name="RecipientBottomSheet_copied_to_clipboard">Буферге көчүрүлдү</string>
 
     <string name="GroupRecipientListItem_admin">Админ</string>
+    <!-- Button text to approve a user that has requested to join a group -->
     <string name="GroupRecipientListItem_approve_description">Ырастоо</string>
     <string name="GroupRecipientListItem_deny_description">Четке кагам</string>
 
@@ -4033,6 +4102,7 @@
 
     <!-- VoiceNoteMediaDescriptionCompatFactory -->
     <string name="VoiceNoteMediaItemFactory__voice_message">Үн билдирүү · %1$s</string>
+    <!-- This is a title in a banner describing the conversation sender to receiver placeholders of the currently playing voice memo. -->
     <string name="VoiceNoteMediaItemFactory__s_to_s">Кимден: %1$s Кимге: %2$s</string>
 
     <!-- StorageUtil -->
@@ -4046,8 +4116,14 @@
     <string name="ReviewCardDialogFragment__review_members">Мүчөлөрдү карап чыгуу</string>
     <!-- Title of a screen where the user will be prompted to review a message request matching the name of someone they already know -->
     <string name="ReviewCardDialogFragment__review_request">Өтүнүчтү карап чыгуу</string>
-    <string name="ReviewCardDialogFragment__d_group_members_have_the_same_name">%1$d топ мүчөсүнүн аты бирдей, төмөндөгү мүчөлөрдү карап чыгып, чара көрүүнү тандаңыз.</string>
-    <string name="ReviewCardDialogFragment__if_youre_not_sure">Эгер бул өтүнүч кимден экенин билбесеңиз, төмөнкү мүчөлөрдү карап чыгып, чара көрүңүз.</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="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 -->
+    <plurals name="ReviewCardDialogFragment__if_youre_not_sure">
+        <item quantity="other">If you\'re not sure who the request is from, review the contacts below and take action.</item>
+    </plurals>
     <string name="ReviewCardDialogFragment__no_other_groups_in_common">Башка орток топтор жок.</string>
     <string name="ReviewCardDialogFragment__no_groups_in_common">Орток топтор жок.</string>
     <plurals name="ReviewCardDialogFragment__d_other_groups_in_common">
@@ -4076,11 +4152,18 @@
     <string name="CallParticipantsListUpdatePopupWindow__s_joined">%1$s кошулду</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_and_s_joined">%1$s жана %2$s кошулушту</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_s_and_s_joined">%1$s, %2$s жана %3$s кошулушту</string>
-    <string name="CallParticipantsListUpdatePopupWindow__s_s_and_d_others_joined">%1$s, %2$s жана %3$d башкалар кошулушту</string>
+    <!-- Toast message shown in group call when 3 or more people join -->
+    <plurals name="CallParticipantsListUpdatePopupWindow__s_s_and_d_others_joined">
+        <item quantity="other">%1$s, %2$s and %3$d others joined</item>
+    </plurals>
+    <!-- Toast/popup text shown when someone leaves a group call -->
     <string name="CallParticipantsListUpdatePopupWindow__s_left">%1$s чыкты</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_and_s_left">%1$s жана %2$s чыгышты</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_s_and_s_left">%1$s, %2$s жана %3$s чыгышты</string>
-    <string name="CallParticipantsListUpdatePopupWindow__s_s_and_d_others_left">%1$s, %2$s жана %3$d башкалар чыгышты</string>
+    <!-- Toast message shown in group call when 3 or more people leave -->
+    <plurals name="CallParticipantsListUpdatePopupWindow__s_s_and_d_others_left">
+        <item quantity="other">%1$s, %2$s and %3$d others left</item>
+    </plurals>
 
     <string name="CallParticipant__you">Сиз</string>
     <string name="CallParticipant__you_on_another_device">Сиз (башка түзмөктө)</string>
@@ -4448,10 +4531,14 @@
 
     <!-- PrivacySettingsFragment -->
     <string name="PrivacySettingsFragment__blocked">Бөгөттөлдү</string>
-    <string name="PrivacySettingsFragment__d_contacts">%1$d байланыш</string>
+    <!-- Settings label that shows the number blocked contacts -->
+    <plurals name="PrivacySettingsFragment__d_contacts">
+        <item quantity="other">%1$d contacts</item>
+    </plurals>
     <string name="PrivacySettingsFragment__messaging">Билдирүү алмашуу</string>
     <string name="PrivacySettingsFragment__disappearing_messages">Жоголуп кетүүчү билдирүүлөр</string>
     <string name="PrivacySettingsFragment__app_security">Колдонмонун коопсуздугу</string>
+    <!-- This refers to the multi-tasking overview (recent apps) from the Android operating system.-->
     <string name="PrivacySettingsFragment__block_screenshots_in_the_recents_list_and_inside_the_app">Соңку колдонмолор тизмесинде жана колдонмолордун ичинде скриншотторду кулпулайсыз</string>
     <string name="PrivacySettingsFragment__signal_message_and_calls">Signal билдирүүлөрү жана чалуулар, чалууларды багыттоо жана жашыруун жөнөтүүчү</string>
     <string name="PrivacySettingsFragment__default_timer_for_new_changes">Жаңы маектер үчүн демейки таймер</string>
@@ -4508,11 +4595,14 @@
     <string name="DataAndStorageSettingsFragment__media_quality">Медиа сапаты</string>
     <string name="DataAndStorageSettingsFragment__sent_media_quality">Жөнөтүлгөн медиа сапаты</string>
     <string name="DataAndStorageSettingsFragment__sending_high_quality_media_will_use_more_data">Жогорку сапаттагы медианы жөнөтүү көбүрөөк берилмелерди колдонот.</string>
+    <!-- Setting option that can be selected to default media to be sent as high quality by default -->
     <string name="DataAndStorageSettingsFragment__high">Шашылыш</string>
+    <!-- Setting option that can be selected to default media to be sent as standard quality by default -->
     <string name="DataAndStorageSettingsFragment__standard">Стандарт</string>
     <string name="DataAndStorageSettingsFragment__calls">Чалуулар</string>
 
     <!-- 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__use_custom_colors">Ыңгайлаштырылган түстөрдү колдонуу</string>
     <string name="ChatColorSelectionFragment__chat_color">Маектин түсү</string>
@@ -4721,6 +4811,7 @@
     <string name="AvatarPickerFragment__take_a_picture">Сүрөткө тартуу</string>
     <string name="AvatarPickerFragment__choose_a_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>
     <string name="AvatarPickerFragment__clear_avatar">Аватарды тазалоо</string>
@@ -4777,7 +4868,7 @@
     <string name="MediaReviewFragment__add_a_message">Билдирүү кошуу</string>
     <string name="MediaReviewFragment__add_a_reply">Жооп кошуу</string>
     <string name="MediaReviewFragment__send_to">Кимге</string>
-    <string name="MediaReviewFragment__view_once_message">Бир жолу көрүлүүчү билдирүү</string>
+    <string name="MediaReviewFragment__view_once_message">Бир жолу көрүлүүчү MMS</string>
     <string name="MediaReviewFragment__one_or_more_items_were_too_large">Бир же бир нече нерсе өтө чоң болуп чыкты</string>
     <string name="MediaReviewFragment__one_or_more_items_were_invalid">Бир же бир нече нерсе жараксыз</string>
     <string name="MediaReviewFragment__too_many_items_selected">Өтө көп нерсе тандалды</string>
@@ -5365,7 +5456,7 @@
     <string name="StoryViewerFragment__s_s">%1$s %2$s</string>
     <!-- Displayed when viewing a post you sent -->
     <string name="StoryViewerPageFragment__you">Сиз</string>
-    <!-- Displayed when viewing a post displayed to a group -->
+    <!-- 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 -->
     <string name="StoryViewerPageFragment__reply">Жооп берүү</string>
@@ -6558,5 +6649,26 @@
     <!-- Content description for opening the note editor -->
     <string name="ViewNoteSheet__edit_note">Кыска жазууну оңдоо</string>
 
+    <!-- BackupProgressService -->
+    <!-- Notification title shown while backup restore job is running -->
+    <string name="BackupProgressService_title">Камдык көчүрмөлөр калыбына келтирилүүдө…</string>
+    <!-- Notification title shown while downloading backup restore data -->
+    <string name="BackupProgressService_title_downloading">Камдык көчүрмөлөр жүктөлүп алынууда…</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>
+    <!-- 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 -->
+    <string name="BackupsTypeSettingsFragment__google_pay">Google Pay</string>
+    <!-- Displayed as the user\'s payment method as a label in a preference row -->
+    <string name="BackupsTypeSettingsFragment__bank_transfer">Bank transfer</string>
+    <!-- Displayed as the user\'s payment method as a label in a preference row -->
+    <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>
+
+
     <!-- 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 4e3856d437..fbea2338b8 100644
--- a/app/src/main/res/values-lt/strings.xml
+++ b/app/src/main/res/values-lt/strings.xml
@@ -1,6 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- smartling.instruction_comments_enabled = on -->
-<resources>
+<?xml version="1.0" encoding="UTF-8"?><!-- 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> -->
@@ -89,6 +87,16 @@
     <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">Allow access to your location</string>
+    <!-- Dialog description that will explain the steps needed to give location permission -->
+    <string name="AttachmentManager_signal_to_send_location">To send your location:</string>
+    <!-- Alert dialog description asking for location permission -->
+    <string name="AttachmentManager_signal_allow_signal_access_location">Allow Molly access to send your location.</string>
+    <!-- Toast text explaining Signal\'s need for location access -->
+    <string name="AttachmentManager_signal_needs_location_access">Molly needs location access to send your location.</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>
     <!-- Alert dialog description to send the recipient a request to activate payments -->
@@ -243,7 +251,7 @@
     <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>
@@ -392,8 +400,16 @@
     <string name="ConversationActivity_your_request_to_join_has_been_sent_to_the_group_admin">Jūsų prašymas prisijungti prie grupės buvo išsiųstas grupės administratoriui. Jums bus pranešta, kai jis atliks tam tikrus veiksmus.</string>
     <string name="ConversationActivity_cancel_request">Panaikinti prašymą</string>
 
-    <string name="ConversationActivity_to_send_audio_messages_allow_signal_access_to_your_microphone">Norėdami siųsti garso žinutes, leiskite Molly prieigą prie mikrofono.</string>
+    <!-- Dialog title asking users for microphone permission -->
+    <string name="ConversationActivity_allow_access_microphone">Allow access to your microphone</string>
+    <!-- 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>
+    <!-- Toast text explaining Signal\'s need for microphone access -->
+    <string name="ConversationActivity_signal_needs_microphone_access_voice_message">Molly needs microphone access to record a voice message.</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 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>
@@ -417,10 +433,17 @@
     <string name="ConversationActivity_you_will_leave_this_group_and_it_will_be_deleted_from_all_of_your_devices">Tu išeisi iš šios grupės ir ji bus ištrinta iš visų tavo įrenginių.</string>
     <string name="ConversationActivity_delete">Ištrinti</string>
     <string name="ConversationActivity_delete_and_leave">Ištrinti ir išeiti</string>
-    <string name="ConversationActivity__to_call_s_signal_needs_access_to_your_microphone">Norint skambinti %1$s, Molly reikia prieigos prie jūsų mikrofono</string>
+
+    <!-- Dialog description that will explain the steps needed to give microphone permissions for a voice call -->
+    <string name="ConversationActivity__to_start_call">To start a 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">To start a call, allow Molly access to your microphone.</string>
+    <!-- Toast text explaining Signal\'s need for microphone access for a voice call -->
+    <string name="ConversationActivity_signal_needs_microphone_access_voice_call">Molly needs microphone access to start a call.</string>
 
 
     <string name="ConversationActivity_join">Prisijungti</string>
+    <!-- Button text for an active group call but the call is currently full and unjoinable -->
     <string name="ConversationActivity_full">Pilnas</string>
 
     <string name="ConversationActivity_error_sending_media">Klaida siunčiant mediją</string>
@@ -645,6 +668,7 @@
     <string name="ConversationListFragment_unarchive">Nebearchyvuoti</string>
     <string name="ConversationListFragment_delete">Ištrinti</string>
     <string name="ConversationListFragment_select_all">Žymėti viską</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">Pažymėta: %1$d</item>
         <item quantity="few">Pažymėta: %1$d</item>
@@ -902,6 +926,7 @@
         <item quantity="many">Išsiųsta %1$d pakvietimo</item>
         <item quantity="other">Išsiųsta %1$d pakvietimų</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">Jūs negalite automatiškai pridėti naudotojo „%1$s“ į šią grupę.\n\nJis yra pakviestas prisijungti prie grupės ir nematys jokių grupėje esančių žinučių tol, kol nepriims kvietimo.</string>
     <string name="GroupManagement_invite_multiple_users">Jūs negalite automatiškai pridėti šių naudotojų į šią grupę.\n\nJie yra pakviesti prisijungti prie grupės ir nematys jokių grupėje esančių žinučių tol, kol nepriims kvietimo.</string>
 
@@ -1114,7 +1139,9 @@
 
     <string name="ManageGroupActivity_edit_name_and_picture">Taisyti pavadinimą ir paveikslą</string>
     <string name="ManageGroupActivity_legacy_group">Pasenusi grupė</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">Tai yra pasenusi grupė. Tokios ypatybės, kaip grupės administratoriai, yra prieinamos tik naujosiose grupėse.</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">Tai yra pasenusi grupė. Norėdami naudoti tokias ypatybes kaip @paminėjimai ir administratoriai,</string>
     <string name="ManageGroupActivity_legacy_group_too_large">Ši pasenusi grupė negali būti naujinta į naująją grupę, nes yra per didelė. Didžiausias grupės dydis yra %1$d.</string>
     <string name="ManageGroupActivity_upgrade_this_group">naujinkite šią grupę.</string>
@@ -1359,6 +1386,7 @@
         <item quantity="other">Ištrinti</item>
     </plurals>
 
+    <!-- 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">Pažymėta %1$d (%2$s)</item>
         <item quantity="few">Pažymėtos %1$d (%2$s)</item>
@@ -1425,17 +1453,13 @@
     <string name="MessageRecord_left_group">Jūs išėjote iš grupės.</string>
     <string name="MessageRecord_you_updated_group">Jūs atnaujinote grupę.</string>
     <string name="MessageRecord_the_group_was_updated">Grupė buvo atnaujinta.</string>
-    <!-- Update message shown when placing an outgoing 1:1 voice/audio call and it\'s answered by the other party -->
+    <!-- Update message shown when placing an outgoing 1:1 voice/audio call -->
     <string name="MessageRecord_outgoing_voice_call">Išsiunčiamasis balso skambutis</string>
-    <!-- Update message shown when placing an outgoing 1:1 video call and it\'s answered by the other party -->
+    <!-- Update message shown when placing an outgoing 1:1 video call -->
     <string name="MessageRecord_outgoing_video_call">Išsiunčiamasis vaizdo skambutis</string>
-    <!-- Update message shown when placing an outgoing 1:1 voice/audio call and it\'s not answered by the other party -->
-    <string name="MessageRecord_unanswered_voice_call">Neatsakytas balso skambutis</string>
-    <!-- Update message shown when placing an outgoing 1:1 video call and it\'s not answered by the other party -->
-    <string name="MessageRecord_unanswered_video_call">Neatsakytas vaizdo skambutis</string>
-    <!-- Update message shown when receiving an incoming 1:1 voice/audio call and it\'s answered -->
+    <!-- Update message shown when receiving an incoming 1:1 voice/audio call and it\'s answered or ringing -->
     <string name="MessageRecord_incoming_voice_call">Gaunamasis balso skambutis</string>
-    <!-- Update message shown when receiving an incoming 1:1 video call and answered -->
+    <!-- Update message shown when receiving an incoming 1:1 video call and answered or ringing -->
     <string name="MessageRecord_incoming_video_call">Gaunamasis vaizdo skambutis</string>
     <!-- Update message shown when receiving an incoming 1:1 voice/audio call and not answered -->
     <string name="MessageRecord_missed_voice_call">Praleistas balso skambutis</string>
@@ -1445,10 +1469,6 @@
     <string name="MessageRecord_missed_voice_call_notification_profile">Praleistas balso skambutis įjungus pranešimų profilį</string>
     <!-- Update message shown when receiving an incoming video call and declined due to notification profile -->
     <string name="MessageRecord_missed_video_call_notification_profile">Praleistas vaizdo skambutis įjungus pranešimų profilį</string>
-    <!-- Update message shown when receiving an incoming 1:1 voice/audio call and explicitly declined -->
-    <string name="MessageRecord_you_declined_a_voice_call">Tu atmetei balso skambutį</string>
-    <!-- Update message shown when receiving an incoming 1:1 video call and explicitly declined -->
-    <string name="MessageRecord_you_declined_a_video_call">Tu atmetei vaizdo skambutį</string>
     <!-- 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 atnaujino grupę.</string>
@@ -1673,30 +1693,55 @@
     <string name="MessageRecord_can_accept_payments">%1$s dabar gali priimti Mokėjimus</string>
 
     <!-- Group Calling update messages -->
-    <string name="MessageRecord_s_started_a_group_call_s">%1$s pradėjo grupės skambutį · %2$s</string>
-    <string name="MessageRecord_you_started_a_group_call_s">Tu pradėjai grupės skambutį · %1$s</string>
-    <string name="MessageRecord_s_is_in_the_group_call_s">%1$s yra grupės skambutyje · %2$s</string>
-    <string name="MessageRecord_you_are_in_the_group_call_s1">Jūs esate grupės skambutyje · %1$s</string>
-    <string name="MessageRecord_s_and_s_are_in_the_group_call_s1">%1$s ir %2$s yra grupės skambutyje · %3$s</string>
-    <string name="MessageRecord_group_call_s">Grupės skambutis · %1$s</string>
-
-    <string name="MessageRecord_s_started_a_group_call">%1$s pradėjo grupės skambutį</string>
-    <string name="MessageRecord_you_started_a_group_call">Jūs pradėjote grupės skambutį</string>
-    <string name="MessageRecord_s_is_in_the_group_call">%1$s yra grupės skambutyje</string>
-    <string name="MessageRecord_you_are_in_the_group_call">Jūs esate grupės skambutyje</string>
-    <string name="MessageRecord_s_and_s_are_in_the_group_call">%1$s ir %2$s yra grupės skambutyje</string>
-    <string name="MessageRecord_group_call">Grupės skambutis</string>
+    <!-- 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 yra skambutyje · %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">Dalyvaujate skambutyje · %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 ir %2$s yra skambutyje · %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 yra skambutyje</string>
+    <!-- Chat log text for an ongoing group call only the local user has joined -->
+    <string name="MessageRecord_you_are_in_the_call">Dalyvaujate skambutyje</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 ir %2$s yra skambutyje</string>
+    <!-- Chat log text for a group call that ended within the last 5 minutes -->
+    <string name="MessageRecord__the_video_call_has_ended">Vaizdo skambutis baigtas</string>
+    <!-- Chat log text for a group call that ended within the last 5 minutes with a placeholder for formatted time -->
+    <string name="MessageRecord__the_video_call_has_ended_s">Vaizdo skambutis baigtas · %1$s</string>
+    <!-- Chat log text for a group call that ended more than 5 minutes ago and was missed -->
+    <string name="MessageRecord__missed_video_call">Praleistas vaizdo skambutis</string>
+    <!-- Chat log text for a group call that ended more than 5 minutes ago and was missed with a placeholder for formatted time -->
+    <string name="MessageRecord__missed_video_call_s">Praleistas vaizdo skambutis · %1$s</string>
+    <!-- Chat log text for a group call that ended that the local user did not start -->
+    <string name="MessageRecord__incoming_video_call">Gaunamasis vaizdo skambutis</string>
+    <!-- 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">Gaunamasis vaizdo skambutis · %1$s</string>
+    <!-- Chat log text for a group call that ended that the local user started -->
+    <string name="MessageRecord__outgoing_video_call">Išsiunčiamasis vaizdo skambutis</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">Išsiunčiamasis vaizdo skambutis · %1$s</string>
+    <!-- Chat log text for an ongoing group call that the local user started -->
+    <string name="MessageRecord__you_started_a_video_call">Pradėjote vaizdo skambutį</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">Pradėjote vaizdo skambutį · %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 pradėjo vaizdo skambutį</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 pradėjo vaizdo skambutį · %2$s</string>
 
     <string name="MessageRecord_you">Jūs</string>
 
-    <plurals name="MessageRecord_s_s_and_d_others_are_in_the_group_call_s">
+    <!-- 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 ir dar %3$d žmogus yra grupės skambutyje · %4$s</item>
         <item quantity="few">%1$s, %2$s ir dar %3$d žmonės yra grupės skambutyje · %4$s</item>
         <item quantity="many">%1$s, %2$s ir dar %3$d žmonių yra grupės skambutyje · %4$s</item>
         <item quantity="other">%1$s, %2$s ir dar %3$d žmogus yra grupės skambutyje · %4$s</item>
     </plurals>
 
-    <plurals name="MessageRecord_s_s_and_d_others_are_in_the_group_call">
+    <!-- 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 ir dar %3$d žmogus yra grupės skambutyje</item>
         <item quantity="few">%1$s, %2$s ir dar %3$d žmonės yra grupės skambutyje</item>
         <item quantity="many">%1$s, %2$s ir dar %3$d žmonių yra grupės skambutyje</item>
@@ -2221,6 +2266,7 @@
     <!-- Generic error when the app is unable to request an SMS code for an unknown reason. -->
     <string name="RegistrationActivity_unable_to_request_verification_code">Nepavyko paprašyti patvirtinimo kodo. Patikrink tinklo ryšį ir bandyk dar kartą.</string>
     <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">Molly „Android“ - Telefono numerio formatas</string>
     <!--    Small "toast" notification to the user confirming that they have requested a new code via voice call.-->
@@ -2367,7 +2413,7 @@
     <string name="SubmitDebugLogActivity_this_log_will_be_posted_publicly_online_for_contributors">Šis žurnalas bus viešai paskelbtas internete talkininkams peržiūrėti. Prieš išsiųsdami, galite jį panagrinėti.</string>
 
     <!-- SupportEmailUtil -->
-  <!-- Removed by excludeNonTranslatables <string name="SupportEmailUtil_support_email" translatable="false">support@molly.im</string> -->
+  <!-- Removed by excludeNonTranslatables <string name="SupportEmailUtil_support_email" translatable="false">support@signal.org</string> -->
     <string name="SupportEmailUtil_filter">Filtras:</string>
     <string name="SupportEmailUtil_device_info">Įrenginio informacija:</string>
     <string name="SupportEmailUtil_android_version">„Android“ versija:</string>
@@ -2883,6 +2929,8 @@
     <string name="ConversationUpdateItem_loading">Įkeliama</string>
     <string name="ConversationUpdateItem_learn_more">Sužinoti daugiau</string>
     <string name="ConversationUpdateItem_join_call">Prisijungti prie skambučio</string>
+    <!-- Action button label for starting a new call in the current conversation -->
+    <string name="ConversationUpdateItem_call_back">Atskambinti</string>
     <string name="ConversationUpdateItem_return_to_call">Grįžti į skambutį</string>
     <string name="ConversationUpdateItem_call_is_full">Skambutis yra pilnas</string>
     <string name="ConversationUpdateItem_invite_friends">Pakviesti draugus</string>
@@ -2947,6 +2995,7 @@
     <string name="safety_number_change_dialog__leave_call">Išeiti iš skambučio</string>
     <string name="safety_number_change_dialog__the_following_people_may_have_reinstalled_or_changed_devices">Gali būti, kad šie žmonės iš naujo įdiegė programėlę ar pakeitė įrenginį. Patvirtinkite savo saugumo numerį su kiekvienu iš jų, kad užtikrintumėte privatumą.</string>
     <string name="safety_number_change_dialog__view">Rodyti</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">Anksčiau patvirtinta(s)</string>
 
     <!-- EnableCallNotificationSettingsDialog__call_notifications_checklist -->
@@ -3274,6 +3323,7 @@
 
     <string name="arrays__default">Numatytoji</string>
     <string name="arrays__high">Aukšta</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">Maksimali</string>
 
     <!-- plurals.xml -->
@@ -3551,7 +3601,7 @@
     <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 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>
@@ -3600,6 +3650,14 @@
     <!-- Storage permission row description -->
     <string name="GrantPermissionsFragment__send_photos_videos_and_files">Siųsk nuotraukas, vaizdo įrašus ir failus iš savo įrenginio.</string>
 
+    <!-- PermissionDeniedBottomSheet -->
+    <!-- Sheet describing step 1 on how to give permissions by opening settings -->
+    <string name="PermissionDeniedBottomSheet__1_tap_settings_below">1. Tap “Settings” below</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 Allow the permission</string>
+    <!-- Label for button at the bottom of the sheet which opens the system permission settings -->
+    <string name="PermissionDeniedBottomSheet__settings">Settings</string>
+
     <!-- PaymentsSecuritySetupFragment -->
     <!-- Toolbar title -->
     <string name="PaymentsSecuritySetupFragment__security_setup">Saugumo konfigūracija</string>
@@ -3640,6 +3698,7 @@
     <string name="PaymentsDetailsFragment__sent_to_s">Kam išsiųsta: %1$s</string>
     <string name="PaymentsDetailsFragment__you_on_s_at_s">Jūs ties %1$s, %2$s</string>
     <string name="PaymentsDetailsFragment__s_on_s_at_s">%1$s ties %2$s, %3$s</string>
+    <!-- Prefix to a name to indicate who a payment was sent to -->
     <string name="PaymentsDetailsFragment__to">Skirta</string>
     <string name="PaymentsDetailsFragment__from">Nuo</string>
     <string name="PaymentsDetailsFragment__information">Išsami operacijos informacija, įskaitant mokėjimo sumą ir operacijos laiką, yra „MobileCoin Ledger“ dalis.</string>
@@ -3702,6 +3761,7 @@
     <string name="ConfirmPayment__confirm_payment">Patvirtinti mokėjimą</string>
     <string name="ConfirmPayment__network_fee">Tinklo mokestis</string>
     <string name="ConfirmPayment__estimated_s">Apskaičiuota %1$s suma</string>
+    <!-- Prefix to a name to indicate who a payment will be sent to -->
     <string name="ConfirmPayment__to">Kam</string>
     <string name="ConfirmPayment__total_amount">Iš viso</string>
     <string name="ConfirmPayment__balance_s">Likutis: %1$s</string>
@@ -3856,6 +3916,14 @@
     <string name="conversation_group_options__conversation">Pokalbis</string>
     <string name="conversation_group_options__broadcast">Transliavimas</string>
 
+    <!-- DoubleTapEditEducationSheet -->
+    <!-- Displayed as the title of the education bottom sheet -->
+    <string name="DoubleTapEditEducationSheet__double_tap_edit_title">Double tap to edit</string>
+    <!-- Text on the sheet explaining how double tapping on a message will let them edit it -->
+    <string name="DoubleTapEditEducationSheet__quickly_tap_twice">Quickly tap twice on your messages to edit them. You can edit your messages up to 24hrs after they’ve been sent.</string>
+    <!-- Button label to dismiss sheet -->
+    <string name="DoubleTapEditEducationSheet__got_it">Got it</string>
+
     <!-- text_secure_normal -->
     <string name="text_secure_normal__menu_new_group">Nauja grupė</string>
     <string name="text_secure_normal__menu_settings">Nustatymai</string>
@@ -4324,6 +4392,7 @@
     <string name="RecipientBottomSheet_copied_to_clipboard">Nukopijuota į iškarpinę</string>
 
     <string name="GroupRecipientListItem_admin">Administratorius</string>
+    <!-- Button text to approve a user that has requested to join a group -->
     <string name="GroupRecipientListItem_approve_description">Patvirtinti</string>
     <string name="GroupRecipientListItem_deny_description">Atmesti</string>
 
@@ -4351,6 +4420,7 @@
 
     <!-- VoiceNoteMediaDescriptionCompatFactory -->
     <string name="VoiceNoteMediaItemFactory__voice_message">Balso žinutė · %1$s</string>
+    <!-- This is a title in a banner describing the conversation sender to receiver placeholders of the currently playing voice memo. -->
     <string name="VoiceNoteMediaItemFactory__s_to_s">%1$s naudotojui %2$s</string>
 
     <!-- StorageUtil -->
@@ -4364,8 +4434,20 @@
     <string name="ReviewCardDialogFragment__review_members">Peržiūrėti narius</string>
     <!-- Title of a screen where the user will be prompted to review a message request matching the name of someone they already know -->
     <string name="ReviewCardDialogFragment__review_request">Peržiūrėti užklausą</string>
-    <string name="ReviewCardDialogFragment__d_group_members_have_the_same_name">%1$d grupės nariai(-ių) turi tokį patį vardą, peržiūrėkite žemiau esančius narius ir pasirinkite norėdami imtis veiksmų.</string>
-    <string name="ReviewCardDialogFragment__if_youre_not_sure">Jei nesate tikri, nuo ko yra gautas prašymas, peržiūrėkite žemiau esančius adresatus ir imkitės veiksmų.</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="few">%1$d group members have the same name, review the members below and choose to take action.</item>
+        <item quantity="many">%1$d group members have the same name, review the members 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 -->
+    <plurals name="ReviewCardDialogFragment__if_youre_not_sure">
+        <item quantity="one">If you\'re not sure who the request is from, review the contact below and take action.</item>
+        <item quantity="few">If you\'re not sure who the request is from, review the contacts below and take action.</item>
+        <item quantity="many">If you\'re not sure who the request is from, review the contacts below and take action.</item>
+        <item quantity="other">If you\'re not sure who the request is from, review the contacts below and take action.</item>
+    </plurals>
     <string name="ReviewCardDialogFragment__no_other_groups_in_common">Nėra kitų bendrų grupių.</string>
     <string name="ReviewCardDialogFragment__no_groups_in_common">Nėra bendrų grupių.</string>
     <plurals name="ReviewCardDialogFragment__d_other_groups_in_common">
@@ -4400,11 +4482,24 @@
     <string name="CallParticipantsListUpdatePopupWindow__s_joined">Prisijungė %1$s</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_and_s_joined">Prisijungė %1$s ir %2$s</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_s_and_s_joined">Prisijungė %1$s, %2$s ir %3$s</string>
-    <string name="CallParticipantsListUpdatePopupWindow__s_s_and_d_others_joined">Prisijungė %1$s, %2$s dar %3$d žmonės(-ių)</string>
+    <!-- Toast message shown in group call when 3 or more people join -->
+    <plurals name="CallParticipantsListUpdatePopupWindow__s_s_and_d_others_joined">
+        <item quantity="one">%1$s, %2$s and %3$d other joined</item>
+        <item quantity="few">%1$s, %2$s and %3$d others joined</item>
+        <item quantity="many">%1$s, %2$s and %3$d others joined</item>
+        <item quantity="other">%1$s, %2$s and %3$d others joined</item>
+    </plurals>
+    <!-- Toast/popup text shown when someone leaves a group call -->
     <string name="CallParticipantsListUpdatePopupWindow__s_left">%1$s išėjo</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_and_s_left">%1$s ir %2$s išėjo</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_s_and_s_left">%1$s, %2$s ir %3$s išėjo</string>
-    <string name="CallParticipantsListUpdatePopupWindow__s_s_and_d_others_left">%1$s, %2$s ir dar %3$d žmonės(-ių) išėjo</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 and %3$d other left</item>
+        <item quantity="few">%1$s, %2$s and %3$d others left</item>
+        <item quantity="many">%1$s, %2$s and %3$d others left</item>
+        <item quantity="other">%1$s, %2$s and %3$d others left</item>
+    </plurals>
 
     <string name="CallParticipant__you">Jūs</string>
     <string name="CallParticipant__you_on_another_device">Jūs (kitame įrenginyje)</string>
@@ -4778,10 +4873,17 @@
 
     <!-- PrivacySettingsFragment -->
     <string name="PrivacySettingsFragment__blocked">Užblokuotas</string>
-    <string name="PrivacySettingsFragment__d_contacts">%1$d adresatų</string>
+    <!-- Settings label that shows the number blocked contacts -->
+    <plurals name="PrivacySettingsFragment__d_contacts">
+        <item quantity="one">%1$d contact</item>
+        <item quantity="few">%1$d contacts</item>
+        <item quantity="many">%1$d contacts</item>
+        <item quantity="other">%1$d contacts</item>
+    </plurals>
     <string name="PrivacySettingsFragment__messaging">Susirašinėjimas</string>
     <string name="PrivacySettingsFragment__disappearing_messages">Išnykstančios žinutės</string>
     <string name="PrivacySettingsFragment__app_security">Programėlės saugumas</string>
+    <!-- This refers to the multi-tasking overview (recent apps) from the Android operating system.-->
     <string name="PrivacySettingsFragment__block_screenshots_in_the_recents_list_and_inside_the_app">Blokuoti ekrano kopijas paskiausiųjų sąraše ir programėlėje</string>
     <string name="PrivacySettingsFragment__signal_message_and_calls">Signal žinutės ir skambučiai, visada retransliuoti skambučius ir užantspauduotas siuntėjas</string>
     <string name="PrivacySettingsFragment__default_timer_for_new_changes">Numatytasis laikmatis naujuose pokalbiuose</string>
@@ -4838,11 +4940,14 @@
     <string name="DataAndStorageSettingsFragment__media_quality">Medijos kokybė</string>
     <string name="DataAndStorageSettingsFragment__sent_media_quality">Siunčiamos medijos kokybė</string>
     <string name="DataAndStorageSettingsFragment__sending_high_quality_media_will_use_more_data">Aukštos kokybės medijos siuntimas naudos daugiau tinklo duomenų.</string>
+    <!-- Setting option that can be selected to default media to be sent as high quality by default -->
     <string name="DataAndStorageSettingsFragment__high">Aukšta</string>
+    <!-- Setting option that can be selected to default media to be sent as standard quality by default -->
     <string name="DataAndStorageSettingsFragment__standard">Standartinė</string>
     <string name="DataAndStorageSettingsFragment__calls">Skambučiai</string>
 
     <!-- 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__use_custom_colors">Naudoti tinkintas spalvas</string>
     <string name="ChatColorSelectionFragment__chat_color">Pokalbio spalva</string>
@@ -5060,6 +5165,7 @@
     <string name="AvatarPickerFragment__take_a_picture">Padaryti nuotrauką</string>
     <string name="AvatarPickerFragment__choose_a_photo">Pasirinkti nuotrauką</string>
     <string name="AvatarPickerFragment__photo">Nuotrauka</string>
+    <!-- Button label during avatar selection/creation that when tapped lets you generate an avatar from typed in text. -->
     <string name="AvatarPickerFragment__text">Tekstas</string>
     <string name="AvatarPickerFragment__save">Įrašyti</string>
     <string name="AvatarPickerFragment__clear_avatar">Išvalyti avatarą</string>
@@ -5128,7 +5234,7 @@
     <string name="MediaReviewFragment__add_a_message">Pridėti žinutę</string>
     <string name="MediaReviewFragment__add_a_reply">Pridėti atsakymą</string>
     <string name="MediaReviewFragment__send_to">Kam siųsti</string>
-    <string name="MediaReviewFragment__view_once_message">Vienkartinės peržiūros žinutė</string>
+    <string name="MediaReviewFragment__view_once_message">Medija, kurią galima peržiūrėti vieną kartą</string>
     <string name="MediaReviewFragment__one_or_more_items_were_too_large">Vienas ar daugiau elementų buvo per dideli</string>
     <string name="MediaReviewFragment__one_or_more_items_were_invalid">Vienas ar daugiau elementų buvo neteisingi</string>
     <string name="MediaReviewFragment__too_many_items_selected">Pažymėta per daug elementų</string>
@@ -5731,7 +5837,7 @@
     <string name="StoryViewerFragment__s_s">%1$s %2$s</string>
     <!-- Displayed when viewing a post you sent -->
     <string name="StoryViewerPageFragment__you">Jūs</string>
-    <!-- Displayed when viewing a post displayed to a group -->
+    <!-- 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">Nuo %1$s iki %2$s</string>
     <!-- Displayed when viewing a post from another user with no replies -->
     <string name="StoryViewerPageFragment__reply">Atsakyti</string>
@@ -6996,5 +7102,26 @@
     <!-- Content description for opening the note editor -->
     <string name="ViewNoteSheet__edit_note">Redaguoti pastabą</string>
 
+    <!-- BackupProgressService -->
+    <!-- Notification title shown while backup restore job is running -->
+    <string name="BackupProgressService_title">Atkuriama atsarginė kopija…</string>
+    <!-- Notification title shown while downloading backup restore data -->
+    <string name="BackupProgressService_title_downloading">Atsiunčiami atsarginės kopijos duomenys…</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>
+    <!-- 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 -->
+    <string name="BackupsTypeSettingsFragment__google_pay">Google Pay</string>
+    <!-- Displayed as the user\'s payment method as a label in a preference row -->
+    <string name="BackupsTypeSettingsFragment__bank_transfer">Bank transfer</string>
+    <!-- Displayed as the user\'s payment method as a label in a preference row -->
+    <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>
+
+
     <!-- 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 5feaa679b9..e54ec86dd8 100644
--- a/app/src/main/res/values-lv/strings.xml
+++ b/app/src/main/res/values-lv/strings.xml
@@ -1,6 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- smartling.instruction_comments_enabled = on -->
-<resources>
+<?xml version="1.0" encoding="UTF-8"?><!-- 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> -->
@@ -89,6 +87,16 @@
     <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">Allow access to your location</string>
+    <!-- Dialog description that will explain the steps needed to give location permission -->
+    <string name="AttachmentManager_signal_to_send_location">To send your location:</string>
+    <!-- Alert dialog description asking for location permission -->
+    <string name="AttachmentManager_signal_allow_signal_access_location">Allow Molly access to send your location.</string>
+    <!-- Toast text explaining Signal\'s need for location access -->
+    <string name="AttachmentManager_signal_needs_location_access">Molly needs location access to send your location.</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>
     <!-- Alert dialog description to send the recipient a request to activate payments -->
@@ -242,7 +250,7 @@
     <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>
@@ -389,8 +397,16 @@
     <string name="ConversationActivity_your_request_to_join_has_been_sent_to_the_group_admin">Jūsu pieprasījums pievienoties ir nosūtīts grupas administratoriem. Jums tiks paziņots, kad viņi veiks kādu darbību.</string>
     <string name="ConversationActivity_cancel_request">Atcelt pieprasījumu</string>
 
-    <string name="ConversationActivity_to_send_audio_messages_allow_signal_access_to_your_microphone">Lai nosūtītu audio ziņu, ļaujiet Molly piekļūt ierīces mikrofonam.</string>
+    <!-- Dialog title asking users for microphone permission -->
+    <string name="ConversationActivity_allow_access_microphone">Allow access to your microphone</string>
+    <!-- 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>
+    <!-- Toast text explaining Signal\'s need for microphone access -->
+    <string name="ConversationActivity_signal_needs_microphone_access_voice_message">Molly needs microphone access to record a voice message.</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, 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>
@@ -414,10 +430,17 @@
     <string name="ConversationActivity_you_will_leave_this_group_and_it_will_be_deleted_from_all_of_your_devices">Jūs pametīsiet šo grupu, un tā tiks izdzēsta no visām jūsu ierīcēm.</string>
     <string name="ConversationActivity_delete">Dzēst</string>
     <string name="ConversationActivity_delete_and_leave">Dzēst un pamest</string>
-    <string name="ConversationActivity__to_call_s_signal_needs_access_to_your_microphone">Lai veiktu zvanu %1$s, Molly ir nepieciešama piekļuve jūsu mikrofonam.</string>
+
+    <!-- Dialog description that will explain the steps needed to give microphone permissions for a voice call -->
+    <string name="ConversationActivity__to_start_call">To start a 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">To start a call, allow Molly access to your microphone.</string>
+    <!-- Toast text explaining Signal\'s need for microphone access for a voice call -->
+    <string name="ConversationActivity_signal_needs_microphone_access_voice_call">Molly needs microphone access to start a call.</string>
 
 
     <string name="ConversationActivity_join">Pievienoties</string>
+    <!-- Button text for an active group call but the call is currently full and unjoinable -->
     <string name="ConversationActivity_full">Pilns</string>
 
     <string name="ConversationActivity_error_sending_media">Neizdevās nosūtīt multivides failu</string>
@@ -629,6 +652,7 @@
     <string name="ConversationListFragment_unarchive">Atarhivēt</string>
     <string name="ConversationListFragment_delete">Dzēst</string>
     <string name="ConversationListFragment_select_all">Atzīmēt visas</string>
+    <!-- Screen title shown when selecting multiple items from a list like conversation threads or call logs. -->
     <plurals name="ConversationListFragment_s_selected">
         <item quantity="zero">%1$d atlasītas</item>
         <item quantity="one">%1$d atlasīta</item>
@@ -883,6 +907,7 @@
         <item quantity="one">Uzaicinājums nosūtīts</item>
         <item quantity="other">Nosūtīti %1$d uzaicinājumi</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">Jūs nevarat automātiski pievienot %1$s šai grupai. \n\nLietotāji ir uzaicināti pievienoties, un viņi neredzēs nevienu grupas ziņu, kamēr neapstiprinās savu dalību.</string>
     <string name="GroupManagement_invite_multiple_users">Jūs nevarat automātiski pievienot šos lietotājus šai grupai. \n\nLietotāji ir uzaicināti pievienoties, un viņi neredzēs nevienu grupas ziņu, kamēr neapstiprinās savu dalību.</string>
 
@@ -1079,7 +1104,9 @@
 
     <string name="ManageGroupActivity_edit_name_and_picture">Labot vārdu un attēlu</string>
     <string name="ManageGroupActivity_legacy_group">Vecā tipa grupa</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">Šī ir vecā tipa grupa. Tādas funkcijas kā grupu administratori ir pieejamas tikai jaunā tipa grupām.</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">Šī ir vecā tipa grupa. Lai izmantotu jaunās funkcijāas, piemēram, @pieminējumi un administratori,</string>
     <string name="ManageGroupActivity_legacy_group_too_large">Šo vecā tipa grupu nevar aktualizēt (pārveidot) uz jaunā tipa grupu, jo tā ir pārāk liela. Maksimālais grupas lielums ir %1$d.</string>
     <string name="ManageGroupActivity_upgrade_this_group">aktualizēt šo grupu.</string>
@@ -1315,6 +1342,7 @@
         <item quantity="other">Dzēst</item>
     </plurals>
 
+    <!-- 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="zero">%1$d atlasīti (%2$s)</item>
         <item quantity="one">%1$d atlasīts (%2$s)</item>
@@ -1380,17 +1408,13 @@
     <string name="MessageRecord_left_group">Jūs esat pametis grupu.</string>
     <string name="MessageRecord_you_updated_group">Jūs aktualizējāt grupu.</string>
     <string name="MessageRecord_the_group_was_updated">Šī grupa tika aktualizēta.</string>
-    <!-- Update message shown when placing an outgoing 1:1 voice/audio call and it\'s answered by the other party -->
+    <!-- Update message shown when placing an outgoing 1:1 voice/audio call -->
     <string name="MessageRecord_outgoing_voice_call">Izejošs balss zvans</string>
-    <!-- Update message shown when placing an outgoing 1:1 video call and it\'s answered by the other party -->
+    <!-- Update message shown when placing an outgoing 1:1 video call -->
     <string name="MessageRecord_outgoing_video_call">Izejošs videozvans</string>
-    <!-- Update message shown when placing an outgoing 1:1 voice/audio call and it\'s not answered by the other party -->
-    <string name="MessageRecord_unanswered_voice_call">Neatbildēts balss zvans</string>
-    <!-- Update message shown when placing an outgoing 1:1 video call and it\'s not answered by the other party -->
-    <string name="MessageRecord_unanswered_video_call">Neatbildēts videozvans</string>
-    <!-- Update message shown when receiving an incoming 1:1 voice/audio call and it\'s answered -->
+    <!-- Update message shown when receiving an incoming 1:1 voice/audio call and it\'s answered or ringing -->
     <string name="MessageRecord_incoming_voice_call">Ienākošs balss zvans</string>
-    <!-- Update message shown when receiving an incoming 1:1 video call and answered -->
+    <!-- Update message shown when receiving an incoming 1:1 video call and answered or ringing -->
     <string name="MessageRecord_incoming_video_call">Ienākošs videozvans</string>
     <!-- Update message shown when receiving an incoming 1:1 voice/audio call and not answered -->
     <string name="MessageRecord_missed_voice_call">Neatbildēts balss zvans</string>
@@ -1400,10 +1424,6 @@
     <string name="MessageRecord_missed_voice_call_notification_profile">Neatbildēts balss zvans, kamēr bija aktivizēts paziņojumu profils</string>
     <!-- Update message shown when receiving an incoming video call and declined due to notification profile -->
     <string name="MessageRecord_missed_video_call_notification_profile">Neatbildēts video zvans, kamēr bija aktivizēts paziņojumu profils</string>
-    <!-- Update message shown when receiving an incoming 1:1 voice/audio call and explicitly declined -->
-    <string name="MessageRecord_you_declined_a_voice_call">Jūs noraidījāt balss zvanu</string>
-    <!-- Update message shown when receiving an incoming 1:1 video call and explicitly declined -->
-    <string name="MessageRecord_you_declined_a_video_call">Jūs noraidījāt videozvanu</string>
     <!-- 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 aktualizēja grupu.</string>
@@ -1620,29 +1640,54 @@
     <string name="MessageRecord_can_accept_payments">%1$s tagad var pieņemt maksājumus</string>
 
     <!-- Group Calling update messages -->
-    <string name="MessageRecord_s_started_a_group_call_s">%1$s sāka grupas zvanu · %2$s</string>
-    <string name="MessageRecord_you_started_a_group_call_s">Jūs sākāt grupas zvanu · %1$s</string>
-    <string name="MessageRecord_s_is_in_the_group_call_s">%1$s ir grupas zvanā · %2$s</string>
-    <string name="MessageRecord_you_are_in_the_group_call_s1">Jūs esat grupas zvanā · %1$s</string>
-    <string name="MessageRecord_s_and_s_are_in_the_group_call_s1">%1$s un %2$s ir grupas zvanā · %3$s</string>
-    <string name="MessageRecord_group_call_s">Grupas zvans · %1$s</string>
-
-    <string name="MessageRecord_s_started_a_group_call">%1$s sāka grupas zvanu</string>
-    <string name="MessageRecord_you_started_a_group_call">Jūs sākāt grupas zvanu</string>
-    <string name="MessageRecord_s_is_in_the_group_call">%1$s ir grupas zvanā</string>
-    <string name="MessageRecord_you_are_in_the_group_call">Jūs esat grupas zvanā</string>
-    <string name="MessageRecord_s_and_s_are_in_the_group_call">%1$s un %2$s ir grupas zvanā</string>
-    <string name="MessageRecord_group_call">Grupas zvans</string>
+    <!-- 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 piedalās zvanā · %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">Jūs piedalāties zvanā · %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 un %2$s piedalās zvanā · %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 piedalās zvanā</string>
+    <!-- Chat log text for an ongoing group call only the local user has joined -->
+    <string name="MessageRecord_you_are_in_the_call">Jūs piedalāties zvanā</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 un %2$s piedalās zvanā</string>
+    <!-- Chat log text for a group call that ended within the last 5 minutes -->
+    <string name="MessageRecord__the_video_call_has_ended">Video zvans ir beidzies</string>
+    <!-- Chat log text for a group call that ended within the last 5 minutes with a placeholder for formatted time -->
+    <string name="MessageRecord__the_video_call_has_ended_s">Video zvans ir beidzies · %1$s</string>
+    <!-- Chat log text for a group call that ended more than 5 minutes ago and was missed -->
+    <string name="MessageRecord__missed_video_call">Neatbildēts videozvans</string>
+    <!-- Chat log text for a group call that ended more than 5 minutes ago and was missed with a placeholder for formatted time -->
+    <string name="MessageRecord__missed_video_call_s">Neatbildēts videozvans · %1$s</string>
+    <!-- Chat log text for a group call that ended that the local user did not start -->
+    <string name="MessageRecord__incoming_video_call">Ienākošs videozvans</string>
+    <!-- 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">Ienākošais video zvans · %1$s</string>
+    <!-- Chat log text for a group call that ended that the local user started -->
+    <string name="MessageRecord__outgoing_video_call">Izejošs videozvans</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">Izejošais video zvans · %1$s</string>
+    <!-- Chat log text for an ongoing group call that the local user started -->
+    <string name="MessageRecord__you_started_a_video_call">Jūs uzsākāt video zvanu</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">Jūs uzsākāt video zvanu · %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 uzsāka video zvanu</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 uzsāka video zvanu · %2$s</string>
 
     <string name="MessageRecord_you">Jūs</string>
 
-    <plurals name="MessageRecord_s_s_and_d_others_are_in_the_group_call_s">
+    <!-- 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="zero">%1$s, %2$s un %3$d cits ir grupas zvanā · %4$s</item>
         <item quantity="one">%1$s, %2$s un %3$d cits ir grupas zvanā · %4$s</item>
         <item quantity="other">%1$s, %2$s un %3$d citi ir grupas zvanā · %4$s</item>
     </plurals>
 
-    <plurals name="MessageRecord_s_s_and_d_others_are_in_the_group_call">
+    <!-- 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="zero">%1$s, %2$s un %3$d cits ir grupas zvanā</item>
         <item quantity="one">%1$s, %2$s un %3$d cits ir grupas zvanā</item>
         <item quantity="other">%1$s, %2$s un %3$d citi ir grupas zvanā</item>
@@ -2142,6 +2187,7 @@
     <!-- Generic error when the app is unable to request an SMS code for an unknown reason. -->
     <string name="RegistrationActivity_unable_to_request_verification_code">Nevar pieprasīt verifikācijas kodu. Lūdzu, pārbaudiet tīkla savienojumu un mēģiniet vēlreiz.</string>
     <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">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.-->
@@ -2287,7 +2333,7 @@
     <string name="SubmitDebugLogActivity_this_log_will_be_posted_publicly_online_for_contributors">Šis žurnāls tiks publiski izlikts tiešsaistē apskatei līdzstrādniekiem. Pirms augšupielādes varat to pārbaudīt.</string>
 
     <!-- SupportEmailUtil -->
-  <!-- Removed by excludeNonTranslatables <string name="SupportEmailUtil_support_email" translatable="false">support@molly.im</string> -->
+  <!-- Removed by excludeNonTranslatables <string name="SupportEmailUtil_support_email" translatable="false">support@signal.org</string> -->
     <string name="SupportEmailUtil_filter">Filtrs:</string>
     <string name="SupportEmailUtil_device_info">Iekārtas informācija:</string>
     <string name="SupportEmailUtil_android_version">Androīda versija:</string>
@@ -2796,6 +2842,8 @@
     <string name="ConversationUpdateItem_loading">Ielādē</string>
     <string name="ConversationUpdateItem_learn_more">Lasīt vairāk</string>
     <string name="ConversationUpdateItem_join_call">Pievienoties zvanam</string>
+    <!-- Action button label for starting a new call in the current conversation -->
+    <string name="ConversationUpdateItem_call_back">Atzvanīt</string>
     <string name="ConversationUpdateItem_return_to_call">Atgriezties pie zvana</string>
     <string name="ConversationUpdateItem_call_is_full">Zvana dalībnieku limits izsmelts</string>
     <string name="ConversationUpdateItem_invite_friends">Uzaicināt draugus</string>
@@ -2860,6 +2908,7 @@
     <string name="safety_number_change_dialog__leave_call">Pamest zvanu</string>
     <string name="safety_number_change_dialog__the_following_people_may_have_reinstalled_or_changed_devices">Iespējams, ka šie cilvēki ir pārinstalējuši vai mainījuši ierīces. Pārbaudiet savu drošības numuru kopā ar šiem cilvēkiem, lai nodrošinātu privātumu.</string>
     <string name="safety_number_change_dialog__view">Skatīt</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">Iepriekšējā vereficētā</string>
 
     <!-- EnableCallNotificationSettingsDialog__call_notifications_checklist -->
@@ -3180,6 +3229,7 @@
 
     <string name="arrays__default">Noklusējuma</string>
     <string name="arrays__high">Augsta</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">Maksimāla</string>
 
     <!-- plurals.xml -->
@@ -3454,7 +3504,7 @@
     <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ē 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>
@@ -3503,6 +3553,14 @@
     <!-- Storage permission row description -->
     <string name="GrantPermissionsFragment__send_photos_videos_and_files">Sūtiet fotoattēlus, videoklipus un failus no savas ierīces.</string>
 
+    <!-- PermissionDeniedBottomSheet -->
+    <!-- Sheet describing step 1 on how to give permissions by opening settings -->
+    <string name="PermissionDeniedBottomSheet__1_tap_settings_below">1. Tap “Settings” below</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 Allow the permission</string>
+    <!-- Label for button at the bottom of the sheet which opens the system permission settings -->
+    <string name="PermissionDeniedBottomSheet__settings">Settings</string>
+
     <!-- PaymentsSecuritySetupFragment -->
     <!-- Toolbar title -->
     <string name="PaymentsSecuritySetupFragment__security_setup">Drošības iestatījumi</string>
@@ -3543,6 +3601,7 @@
     <string name="PaymentsDetailsFragment__sent_to_s">Nosūtīts %1$s</string>
     <string name="PaymentsDetailsFragment__you_on_s_at_s">Jūs %1$s plkst. %2$s</string>
     <string name="PaymentsDetailsFragment__s_on_s_at_s">%1$s %2$s plkst. %3$s</string>
+    <!-- Prefix to a name to indicate who a payment was sent to -->
     <string name="PaymentsDetailsFragment__to">Kam</string>
     <string name="PaymentsDetailsFragment__from">No</string>
     <string name="PaymentsDetailsFragment__information">Transakcijas informācija, tostarp maksājuma summa un transakcijas laiks, ir norādīta MobileCoin virsgrāmatā.</string>
@@ -3605,6 +3664,7 @@
     <string name="ConfirmPayment__confirm_payment">Apstiprināt maksājumu</string>
     <string name="ConfirmPayment__network_fee">Tīkla maksājuma likme</string>
     <string name="ConfirmPayment__estimated_s">Aprēķināts %1$s</string>
+    <!-- Prefix to a name to indicate who a payment will be sent to -->
     <string name="ConfirmPayment__to">Kam</string>
     <string name="ConfirmPayment__total_amount">Kopējā summa</string>
     <string name="ConfirmPayment__balance_s">Atlikums: %1$s</string>
@@ -3757,6 +3817,14 @@
     <string name="conversation_group_options__conversation">Saruna</string>
     <string name="conversation_group_options__broadcast">Pārraide</string>
 
+    <!-- DoubleTapEditEducationSheet -->
+    <!-- Displayed as the title of the education bottom sheet -->
+    <string name="DoubleTapEditEducationSheet__double_tap_edit_title">Double tap to edit</string>
+    <!-- Text on the sheet explaining how double tapping on a message will let them edit it -->
+    <string name="DoubleTapEditEducationSheet__quickly_tap_twice">Quickly tap twice on your messages to edit them. You can edit your messages up to 24hrs after they’ve been sent.</string>
+    <!-- Button label to dismiss sheet -->
+    <string name="DoubleTapEditEducationSheet__got_it">Got it</string>
+
     <!-- text_secure_normal -->
     <string name="text_secure_normal__menu_new_group">Jauna grupa</string>
     <string name="text_secure_normal__menu_settings">Iestatījumi</string>
@@ -4218,6 +4286,7 @@
     <string name="RecipientBottomSheet_copied_to_clipboard">Iekopēts starpliktuvē</string>
 
     <string name="GroupRecipientListItem_admin">Administrators</string>
+    <!-- Button text to approve a user that has requested to join a group -->
     <string name="GroupRecipientListItem_approve_description">Apstiprināt</string>
     <string name="GroupRecipientListItem_deny_description">Atteikt pievienot</string>
 
@@ -4245,6 +4314,7 @@
 
     <!-- VoiceNoteMediaDescriptionCompatFactory -->
     <string name="VoiceNoteMediaItemFactory__voice_message">Balss ziņa · %1$s</string>
+    <!-- This is a title in a banner describing the conversation sender to receiver placeholders of the currently playing voice memo. -->
     <string name="VoiceNoteMediaItemFactory__s_to_s">%1$s %2$s</string>
 
     <!-- StorageUtil -->
@@ -4258,8 +4328,18 @@
     <string name="ReviewCardDialogFragment__review_members">Pārskatīt dalībniekus</string>
     <!-- Title of a screen where the user will be prompted to review a message request matching the name of someone they already know -->
     <string name="ReviewCardDialogFragment__review_request">Pārskatīt pieprasījumu</string>
-    <string name="ReviewCardDialogFragment__d_group_members_have_the_same_name">%1$d grupas dalībniekiem ir vienāds vārds; pārskatiet tālāk norādītos dalībniekus un izvēlieties rīkoties.</string>
-    <string name="ReviewCardDialogFragment__if_youre_not_sure">Ja nezināt, no kā ir pieprasījums, pārskatiet tālāk norādītās kontaktpersonas un rīkojieties.</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="zero">%1$d group members have the same name, review the members below and choose to take action.</item>
+        <item quantity="one">%1$d group member have 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 -->
+    <plurals name="ReviewCardDialogFragment__if_youre_not_sure">
+        <item quantity="zero">If you\'re not sure who the request is from, review the contacts below and take action.</item>
+        <item quantity="one">If you\'re not sure who the request is from, review the contact below and take action.</item>
+        <item quantity="other">If you\'re not sure who the request is from, review the contacts below and take action.</item>
+    </plurals>
     <string name="ReviewCardDialogFragment__no_other_groups_in_common">Nav citu kopīgu grupu.</string>
     <string name="ReviewCardDialogFragment__no_groups_in_common">Nav kopīgu grupu.</string>
     <plurals name="ReviewCardDialogFragment__d_other_groups_in_common">
@@ -4292,11 +4372,22 @@
     <string name="CallParticipantsListUpdatePopupWindow__s_joined">%1$s pievienojās</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_and_s_joined">%1$s un %2$s pievienojās</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_s_and_s_joined">%1$s, %2$s un %3$s pievienojās</string>
-    <string name="CallParticipantsListUpdatePopupWindow__s_s_and_d_others_joined">%1$s, %2$s un %3$d citi pievienojās</string>
+    <!-- Toast message shown in group call when 3 or more people join -->
+    <plurals name="CallParticipantsListUpdatePopupWindow__s_s_and_d_others_joined">
+        <item quantity="zero">%1$s, %2$s and %3$d others joined</item>
+        <item quantity="one">%1$s, %2$s and %3$d other joined</item>
+        <item quantity="other">%1$s, %2$s and %3$d others joined</item>
+    </plurals>
+    <!-- Toast/popup text shown when someone leaves a group call -->
     <string name="CallParticipantsListUpdatePopupWindow__s_left">%1$s izstājās</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_and_s_left">%1$s un %2$s izstājās</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_s_and_s_left">%1$s, %2$s un %3$s izstājās</string>
-    <string name="CallParticipantsListUpdatePopupWindow__s_s_and_d_others_left">%1$s, %2$s un %3$d citi izstājās</string>
+    <!-- Toast message shown in group call when 3 or more people leave -->
+    <plurals name="CallParticipantsListUpdatePopupWindow__s_s_and_d_others_left">
+        <item quantity="zero">%1$s, %2$s and %3$d others left</item>
+        <item quantity="one">%1$s, %2$s and %3$d other left</item>
+        <item quantity="other">%1$s, %2$s and %3$d others left</item>
+    </plurals>
 
     <string name="CallParticipant__you">Jūs</string>
     <string name="CallParticipant__you_on_another_device">Jūs (citā ierīcē)</string>
@@ -4668,10 +4759,16 @@
 
     <!-- PrivacySettingsFragment -->
     <string name="PrivacySettingsFragment__blocked">Bloķēti</string>
-    <string name="PrivacySettingsFragment__d_contacts">%1$d kontaktpersonas</string>
+    <!-- Settings label that shows the number blocked contacts -->
+    <plurals name="PrivacySettingsFragment__d_contacts">
+        <item quantity="zero">%1$d contacts</item>
+        <item quantity="one">%1$d contact</item>
+        <item quantity="other">%1$d contacts</item>
+    </plurals>
     <string name="PrivacySettingsFragment__messaging">Ziņapmaiņa</string>
     <string name="PrivacySettingsFragment__disappearing_messages">Gaistošās ziņas</string>
     <string name="PrivacySettingsFragment__app_security">Lietotnes aizsardzība</string>
+    <!-- This refers to the multi-tasking overview (recent apps) from the Android operating system.-->
     <string name="PrivacySettingsFragment__block_screenshots_in_the_recents_list_and_inside_the_app">Bloķēt ekrānuzņēmumus pēdējo sarunu sarakstā un pašā lietotnē</string>
     <string name="PrivacySettingsFragment__signal_message_and_calls">Signal ziņas un zvani, pastāvīga zvanu pārsūtīšana un šifrēts sūtītājs</string>
     <string name="PrivacySettingsFragment__default_timer_for_new_changes">Noklusējuma taimeris jaunām sarunām</string>
@@ -4728,11 +4825,14 @@
     <string name="DataAndStorageSettingsFragment__media_quality">Multivides kvalitāte</string>
     <string name="DataAndStorageSettingsFragment__sent_media_quality">Nosūtītās multivides kvalitāte</string>
     <string name="DataAndStorageSettingsFragment__sending_high_quality_media_will_use_more_data">Sūtot augstas kvalitātes multivides saturu, tiks izmantots vairāk datu.</string>
+    <!-- Setting option that can be selected to default media to be sent as high quality by default -->
     <string name="DataAndStorageSettingsFragment__high">Augsta</string>
+    <!-- Setting option that can be selected to default media to be sent as standard quality by default -->
     <string name="DataAndStorageSettingsFragment__standard">Standarta</string>
     <string name="DataAndStorageSettingsFragment__calls">Zvani</string>
 
     <!-- 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__use_custom_colors">Lietot pielāgotas krāsas</string>
     <string name="ChatColorSelectionFragment__chat_color">Sarunas krāsa</string>
@@ -4947,6 +5047,7 @@
     <string name="AvatarPickerFragment__take_a_picture">Uzņemt attēlu</string>
     <string name="AvatarPickerFragment__choose_a_photo">Izvēlēties fotoattēlu</string>
     <string name="AvatarPickerFragment__photo">Attēls</string>
+    <!-- Button label during avatar selection/creation that when tapped lets you generate an avatar from typed in text. -->
     <string name="AvatarPickerFragment__text">Teksts</string>
     <string name="AvatarPickerFragment__save">Saglabāt</string>
     <string name="AvatarPickerFragment__clear_avatar">Dzēst avatāru</string>
@@ -5011,7 +5112,7 @@
     <string name="MediaReviewFragment__add_a_message">Pievienojiet ziņu</string>
     <string name="MediaReviewFragment__add_a_reply">Pievienot atbildi</string>
     <string name="MediaReviewFragment__send_to">Sūtīt</string>
-    <string name="MediaReviewFragment__view_once_message">Vienreiz skatāma ziņa</string>
+    <string name="MediaReviewFragment__view_once_message">Vienreiz skatāma multivide</string>
     <string name="MediaReviewFragment__one_or_more_items_were_too_large">Viens vai vairāki vienumi bija pārāk lieli</string>
     <string name="MediaReviewFragment__one_or_more_items_were_invalid">Viens vai vairāki vienumi bija nederīgi</string>
     <string name="MediaReviewFragment__too_many_items_selected">Pārāk daudz izvēlētu vienumu</string>
@@ -5609,7 +5710,7 @@
     <string name="StoryViewerFragment__s_s">%1$s %2$s</string>
     <!-- Displayed when viewing a post you sent -->
     <string name="StoryViewerPageFragment__you">Jūs</string>
-    <!-- Displayed when viewing a post displayed to a group -->
+    <!-- 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 -->
     <string name="StoryViewerPageFragment__reply">Atbildēt</string>
@@ -6850,5 +6951,26 @@
     <!-- Content description for opening the note editor -->
     <string name="ViewNoteSheet__edit_note">Rediģēt piezīmi</string>
 
+    <!-- BackupProgressService -->
+    <!-- Notification title shown while backup restore job is running -->
+    <string name="BackupProgressService_title">Atjauno rezerves kopijas datus…</string>
+    <!-- Notification title shown while downloading backup restore data -->
+    <string name="BackupProgressService_title_downloading">Lejupielādē rezerves kopijas datus…</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>
+    <!-- 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 -->
+    <string name="BackupsTypeSettingsFragment__google_pay">Google Pay</string>
+    <!-- Displayed as the user\'s payment method as a label in a preference row -->
+    <string name="BackupsTypeSettingsFragment__bank_transfer">Bank transfer</string>
+    <!-- Displayed as the user\'s payment method as a label in a preference row -->
+    <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>
+
+
     <!-- 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 fad165d05b..e1a90f889e 100644
--- a/app/src/main/res/values-mk/strings.xml
+++ b/app/src/main/res/values-mk/strings.xml
@@ -1,6 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- smartling.instruction_comments_enabled = on -->
-<resources>
+<?xml version="1.0" encoding="UTF-8"?><!-- 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> -->
@@ -89,6 +87,16 @@
     <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">Allow access to your location</string>
+    <!-- Dialog description that will explain the steps needed to give location permission -->
+    <string name="AttachmentManager_signal_to_send_location">To send your location:</string>
+    <!-- Alert dialog description asking for location permission -->
+    <string name="AttachmentManager_signal_allow_signal_access_location">Allow Molly access to send your location.</string>
+    <!-- Toast text explaining Signal\'s need for location access -->
+    <string name="AttachmentManager_signal_needs_location_access">Molly needs location access to send your location.</string>
+
     <!-- Alert dialog title to show the recipient has not activated payments -->
     <string name="AttachmentManager__not_activated_payments">%1$s нема активирано плаќања </string>
     <!-- Alert dialog description to send the recipient a request to activate payments -->
@@ -241,7 +249,7 @@
     <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>
@@ -386,8 +394,16 @@
     <string name="ConversationActivity_your_request_to_join_has_been_sent_to_the_group_admin">Вашето барање за да се приклучите е испратено до администраторот на групата. Ќе бидете известени штом преземат нешто околу тоа.</string>
     <string name="ConversationActivity_cancel_request">Откажи барање</string>
 
-    <string name="ConversationActivity_to_send_audio_messages_allow_signal_access_to_your_microphone">За да испраќате аудио пораки, дозволете му на Molly пристап до Вашиот микрофон.</string>
+    <!-- Dialog title asking users for microphone permission -->
+    <string name="ConversationActivity_allow_access_microphone">Allow access to your microphone</string>
+    <!-- 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>
+    <!-- Toast text explaining Signal\'s need for microphone access -->
+    <string name="ConversationActivity_signal_needs_microphone_access_voice_message">Molly needs microphone access to record a voice message.</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">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>
@@ -411,10 +427,17 @@
     <string name="ConversationActivity_you_will_leave_this_group_and_it_will_be_deleted_from_all_of_your_devices">Ќе ја напуштите оваа група и таа ќе биде избришана од сите ваши уреди.</string>
     <string name="ConversationActivity_delete">Избриши</string>
     <string name="ConversationActivity_delete_and_leave">Избриши и напушти</string>
-    <string name="ConversationActivity__to_call_s_signal_needs_access_to_your_microphone">За да го/ја повикате %1$s, на Molly му треба пристап до микрофонот</string>
+
+    <!-- Dialog description that will explain the steps needed to give microphone permissions for a voice call -->
+    <string name="ConversationActivity__to_start_call">To start a 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">To start a call, allow Molly access to your microphone.</string>
+    <!-- Toast text explaining Signal\'s need for microphone access for a voice call -->
+    <string name="ConversationActivity_signal_needs_microphone_access_voice_call">Molly needs microphone access to start a call.</string>
 
 
     <string name="ConversationActivity_join">Приклучи сѐ</string>
+    <!-- Button text for an active group call but the call is currently full and unjoinable -->
     <string name="ConversationActivity_full">Полно е</string>
 
     <string name="ConversationActivity_error_sending_media">Грешка при испраќање на медиумска датотека</string>
@@ -613,6 +636,7 @@
     <string name="ConversationListFragment_unarchive">Деархивирај</string>
     <string name="ConversationListFragment_delete">Избриши</string>
     <string name="ConversationListFragment_select_all">Избери сѐ</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 избрана</item>
         <item quantity="other">%1$d избрани</item>
@@ -864,6 +888,7 @@
         <item quantity="one">Поканата е испратена</item>
         <item quantity="other">Испратени се %1$d покани</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">„%1$s“ не може автоматски да се додаде во оваа група од Вас.\n\nПоканет/а е да се приклучи и нема да гледа групни пораки додека не прифати.</string>
     <string name="GroupManagement_invite_multiple_users">Овие корисници не можат да бидат автоматски додадени во оваа група од Вас.\n\nТие се поканети да се приклучат и нема да гледаат групни пораки додека не прифатат.</string>
 
@@ -1044,7 +1069,9 @@
 
     <string name="ManageGroupActivity_edit_name_and_picture">Уреди име и слика</string>
     <string name="ManageGroupActivity_legacy_group">Застарена група</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">Ова е застарена група. Опции како администратори на групи се достапни само со нови групи.</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">Ова е застарена група. За пристап до нови опции како @спомнувања и администратори,</string>
     <string name="ManageGroupActivity_legacy_group_too_large">Ова е застарена група и не може да биде надградена во нова група бидејќи е преголема. Максималната големина на група е %1$d.</string>
     <string name="ManageGroupActivity_upgrade_this_group">надградете ја оваа група.</string>
@@ -1271,6 +1298,7 @@
         <item quantity="other">Избриши</item>
     </plurals>
 
+    <!-- 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 избрано (%2$s)</item>
         <item quantity="other">%1$d избрани (%2$s)</item>
@@ -1335,17 +1363,13 @@
     <string name="MessageRecord_left_group">Ја напуштивте групата.</string>
     <string name="MessageRecord_you_updated_group">Ја ажуриравте групата.</string>
     <string name="MessageRecord_the_group_was_updated">Групата беше ажурирана.</string>
-    <!-- Update message shown when placing an outgoing 1:1 voice/audio call and it\'s answered by the other party -->
+    <!-- Update message shown when placing an outgoing 1:1 voice/audio call -->
     <string name="MessageRecord_outgoing_voice_call">Појдовен гласовен повик</string>
-    <!-- Update message shown when placing an outgoing 1:1 video call and it\'s answered by the other party -->
+    <!-- Update message shown when placing an outgoing 1:1 video call -->
     <string name="MessageRecord_outgoing_video_call">Појдовен видео повик</string>
-    <!-- Update message shown when placing an outgoing 1:1 voice/audio call and it\'s not answered by the other party -->
-    <string name="MessageRecord_unanswered_voice_call">Неодговорен гласовен повик</string>
-    <!-- Update message shown when placing an outgoing 1:1 video call and it\'s not answered by the other party -->
-    <string name="MessageRecord_unanswered_video_call">Неодоговорен видео повик</string>
-    <!-- Update message shown when receiving an incoming 1:1 voice/audio call and it\'s answered -->
+    <!-- Update message shown when receiving an incoming 1:1 voice/audio call and it\'s answered or ringing -->
     <string name="MessageRecord_incoming_voice_call">Дојдовен гласовен повик</string>
-    <!-- Update message shown when receiving an incoming 1:1 video call and answered -->
+    <!-- Update message shown when receiving an incoming 1:1 video call and answered or ringing -->
     <string name="MessageRecord_incoming_video_call">Дојдовен видео повик</string>
     <!-- Update message shown when receiving an incoming 1:1 voice/audio call and not answered -->
     <string name="MessageRecord_missed_voice_call">Пропуштен гласовен повик</string>
@@ -1355,10 +1379,6 @@
     <string name="MessageRecord_missed_voice_call_notification_profile">Пропуштен гласовен повик додека беше овозможен режимот за известувања</string>
     <!-- Update message shown when receiving an incoming video call and declined due to notification profile -->
     <string name="MessageRecord_missed_video_call_notification_profile">Пропуштен видео повик додека беше овозможен режимот за известувања</string>
-    <!-- Update message shown when receiving an incoming 1:1 voice/audio call and explicitly declined -->
-    <string name="MessageRecord_you_declined_a_voice_call">Одбивте гласовен повик</string>
-    <!-- Update message shown when receiving an incoming 1:1 video call and explicitly declined -->
-    <string name="MessageRecord_you_declined_a_video_call">Одбивте видео повик</string>
     <!-- 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>
@@ -1567,28 +1587,53 @@
     <string name="MessageRecord_can_accept_payments">%1$s сега може да прифаќа плаќања</string>
 
     <!-- Group Calling update messages -->
-    <string name="MessageRecord_s_started_a_group_call_s">%1$s започна групен повик · %2$s</string>
-    <string name="MessageRecord_you_started_a_group_call_s">Започнавте групен повик · %1$s</string>
-    <string name="MessageRecord_s_is_in_the_group_call_s">%1$s е во групниот повик · %2$s</string>
-    <string name="MessageRecord_you_are_in_the_group_call_s1">Вие сте во групниот повик · %1$s</string>
-    <string name="MessageRecord_s_and_s_are_in_the_group_call_s1">%1$s и %2$s се во групниот повик · %3$s</string>
-    <string name="MessageRecord_group_call_s">Групен повик · %1$s</string>
-
-    <string name="MessageRecord_s_started_a_group_call">%1$s започна групен повик</string>
-    <string name="MessageRecord_you_started_a_group_call">Вие започнавте групен повик</string>
-    <string name="MessageRecord_s_is_in_the_group_call">%1$s е во групниот повик</string>
-    <string name="MessageRecord_you_are_in_the_group_call">Вие сте во групниот повик</string>
-    <string name="MessageRecord_s_and_s_are_in_the_group_call">%1$s и %2$s се во групниот повик</string>
-    <string name="MessageRecord_group_call">Групен повик</string>
+    <!-- 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 е на повикот · %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">Вие сте на повикот · %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 и %2$s се на повикот · %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 е на повикот</string>
+    <!-- Chat log text for an ongoing group call only the local user has joined -->
+    <string name="MessageRecord_you_are_in_the_call">Вие сте на повикот</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 и %2$s се на овој повик</string>
+    <!-- Chat log text for a group call that ended within the last 5 minutes -->
+    <string name="MessageRecord__the_video_call_has_ended">Видео повикот заврши</string>
+    <!-- Chat log text for a group call that ended within the last 5 minutes with a placeholder for formatted time -->
+    <string name="MessageRecord__the_video_call_has_ended_s">Видео повикот заврши · %1$s</string>
+    <!-- Chat log text for a group call that ended more than 5 minutes ago and was missed -->
+    <string name="MessageRecord__missed_video_call">Пропуштен видео повик</string>
+    <!-- Chat log text for a group call that ended more than 5 minutes ago and was missed with a placeholder for formatted time -->
+    <string name="MessageRecord__missed_video_call_s">Испуштен видео повик · %1$s</string>
+    <!-- Chat log text for a group call that ended that the local user did not start -->
+    <string name="MessageRecord__incoming_video_call">Дојдовен видео повик</string>
+    <!-- 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">Дојдовен видео повик · %1$s</string>
+    <!-- Chat log text for a group call that ended that the local user started -->
+    <string name="MessageRecord__outgoing_video_call">Појдовен видео повик</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">Појдовен видео повик · %1$s</string>
+    <!-- Chat log text for an ongoing group call that the local user started -->
+    <string name="MessageRecord__you_started_a_video_call">Започнавте видео повик</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">Започнавте видео повик · %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 започна видео повик</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 започна видео повик · %2$s</string>
 
     <string name="MessageRecord_you">Вие</string>
 
-    <plurals name="MessageRecord_s_s_and_d_others_are_in_the_group_call_s">
+    <!-- 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, и %3$d друг е во групниот повик · %4$s</item>
         <item quantity="other">%1$s, %2$s, и %3$d други се во групниот повик · %4$s</item>
     </plurals>
 
-    <plurals name="MessageRecord_s_s_and_d_others_are_in_the_group_call">
+    <!-- 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, и %3$d друг е во групниот повик</item>
         <item quantity="other">%1$s, %2$s, и %3$d други се во групниот повик</item>
     </plurals>
@@ -2063,6 +2108,7 @@
     <!-- Generic error when the app is unable to request an SMS code for an unknown reason. -->
     <string name="RegistrationActivity_unable_to_request_verification_code">Не може да се побара код за верификација. Ве молиме проверете ја вашата мрежна поврзаност и обидете се повторно.</string>
     <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">Molly Android - Формат на телефонски број</string>
     <!--    Small "toast" notification to the user confirming that they have requested a new code via voice call.-->
@@ -2207,7 +2253,7 @@
     <string name="SubmitDebugLogActivity_this_log_will_be_posted_publicly_online_for_contributors">Овој запис ќе биде објавен јавно на интернет за да можат да го видат придонесувачите. Можете да го прегледате пред да го испратите.</string>
 
     <!-- SupportEmailUtil -->
-  <!-- Removed by excludeNonTranslatables <string name="SupportEmailUtil_support_email" translatable="false">support@molly.im</string> -->
+  <!-- Removed by excludeNonTranslatables <string name="SupportEmailUtil_support_email" translatable="false">support@signal.org</string> -->
     <string name="SupportEmailUtil_filter">Филтер:</string>
     <string name="SupportEmailUtil_device_info">Информации за уред:</string>
     <string name="SupportEmailUtil_android_version">Верзија на Android:</string>
@@ -2709,6 +2755,8 @@
     <string name="ConversationUpdateItem_loading">Се вчитува</string>
     <string name="ConversationUpdateItem_learn_more">Дознајте повеќе</string>
     <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_call_is_full">Повикот е полн</string>
     <string name="ConversationUpdateItem_invite_friends">Покани пријатели</string>
@@ -2773,6 +2821,7 @@
     <string name="safety_number_change_dialog__leave_call">Напушти повик</string>
     <string name="safety_number_change_dialog__the_following_people_may_have_reinstalled_or_changed_devices">Следниве луѓе можеби го реинсталирале Signal или ги промениле уредите. Проверете го вашиот безбедносен број со нив за да ја осигурате приватноста.</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>
 
     <!-- EnableCallNotificationSettingsDialog__call_notifications_checklist -->
@@ -3086,6 +3135,7 @@
 
     <string name="arrays__default">Стандардно</string>
     <string name="arrays__high">Високо</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">Максимално</string>
 
     <!-- plurals.xml -->
@@ -3357,7 +3407,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">Можете да го користите 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">Плаќањата во Molly не се повеќе достапни. Сѐ уште можете да префрлате средства за менување но не можете да испраќате и примате или пак додавате средства.</string>
@@ -3406,6 +3456,14 @@
     <!-- Storage permission row description -->
     <string name="GrantPermissionsFragment__send_photos_videos_and_files">Испраќајте слики, видеа или датотеки од вашиот уред.</string>
 
+    <!-- PermissionDeniedBottomSheet -->
+    <!-- Sheet describing step 1 on how to give permissions by opening settings -->
+    <string name="PermissionDeniedBottomSheet__1_tap_settings_below">1. Tap “Settings” below</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 Allow the permission</string>
+    <!-- Label for button at the bottom of the sheet which opens the system permission settings -->
+    <string name="PermissionDeniedBottomSheet__settings">Settings</string>
+
     <!-- PaymentsSecuritySetupFragment -->
     <!-- Toolbar title -->
     <string name="PaymentsSecuritySetupFragment__security_setup">Поставувања за безбедност</string>
@@ -3446,6 +3504,7 @@
     <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__information">Деталите за трансакцијата, вклучувајќи го износот на плаќање и времето на трансакцијата, се дел од MobileCoin регистарот.</string>
@@ -3508,6 +3567,7 @@
     <string name="ConfirmPayment__confirm_payment">Потврдете го плаќањето</string>
     <string name="ConfirmPayment__network_fee">Мрежна такса</string>
     <string name="ConfirmPayment__estimated_s">Проценето %1$s</string>
+    <!-- Prefix to a name to indicate who a payment will be sent to -->
     <string name="ConfirmPayment__to">До</string>
     <string name="ConfirmPayment__total_amount">Вкупен износ</string>
     <string name="ConfirmPayment__balance_s">Салдо: %1$s</string>
@@ -3658,6 +3718,14 @@
     <string name="conversation_group_options__conversation">Разговор</string>
     <string name="conversation_group_options__broadcast">Емитување</string>
 
+    <!-- DoubleTapEditEducationSheet -->
+    <!-- Displayed as the title of the education bottom sheet -->
+    <string name="DoubleTapEditEducationSheet__double_tap_edit_title">Double tap to edit</string>
+    <!-- Text on the sheet explaining how double tapping on a message will let them edit it -->
+    <string name="DoubleTapEditEducationSheet__quickly_tap_twice">Quickly tap twice on your messages to edit them. You can edit your messages up to 24hrs after they’ve been sent.</string>
+    <!-- Button label to dismiss sheet -->
+    <string name="DoubleTapEditEducationSheet__got_it">Got it</string>
+
     <!-- text_secure_normal -->
     <string name="text_secure_normal__menu_new_group">Нова група</string>
     <string name="text_secure_normal__menu_settings">Поставувања</string>
@@ -4112,6 +4180,7 @@
     <string name="RecipientBottomSheet_copied_to_clipboard">Копирано на таблата со исечоци</string>
 
     <string name="GroupRecipientListItem_admin">Администратор</string>
+    <!-- Button text to approve a user that has requested to join a group -->
     <string name="GroupRecipientListItem_approve_description">Дозволи</string>
     <string name="GroupRecipientListItem_deny_description">Одбиј</string>
 
@@ -4139,6 +4208,7 @@
 
     <!-- VoiceNoteMediaDescriptionCompatFactory -->
     <string name="VoiceNoteMediaItemFactory__voice_message">Гласовна порака · %1$s</string>
+    <!-- This is a title in a banner describing the conversation sender to receiver placeholders of the currently playing voice memo. -->
     <string name="VoiceNoteMediaItemFactory__s_to_s">%1$s до %2$s</string>
 
     <!-- StorageUtil -->
@@ -4152,8 +4222,16 @@
     <string name="ReviewCardDialogFragment__review_members">Прегледајте ги членовите</string>
     <!-- Title of a screen where the user will be prompted to review a message request matching the name of someone they already know -->
     <string name="ReviewCardDialogFragment__review_request">Прегледајте го барањето</string>
-    <string name="ReviewCardDialogFragment__d_group_members_have_the_same_name">%1$d членови на групата го имаат истото име, прегледајте ги членовите подолу и решете што сакате да направите.</string>
-    <string name="ReviewCardDialogFragment__if_youre_not_sure">Ако не сте сигурни од кого е барањето, прегледајте ги контактите подолу и решете што сакате да направите.</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="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 -->
+    <plurals name="ReviewCardDialogFragment__if_youre_not_sure">
+        <item quantity="one">If you\'re not sure who the request is from, review the contact below and take action.</item>
+        <item quantity="other">If you\'re not sure who the request is from, review the contacts below and take action.</item>
+    </plurals>
     <string name="ReviewCardDialogFragment__no_other_groups_in_common">Немате други заеднички групи.</string>
     <string name="ReviewCardDialogFragment__no_groups_in_common">Немате заеднички групи.</string>
     <plurals name="ReviewCardDialogFragment__d_other_groups_in_common">
@@ -4184,11 +4262,20 @@
     <string name="CallParticipantsListUpdatePopupWindow__s_joined">%1$s се приклучи</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_and_s_joined">%1$s и %2$s се приклучија</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_s_and_s_joined">%1$s, %2$s и %3$s се приклучија</string>
-    <string name="CallParticipantsListUpdatePopupWindow__s_s_and_d_others_joined">%1$s, %2$s и %3$d други се приклучија</string>
+    <!-- Toast message shown in group call when 3 or more people join -->
+    <plurals name="CallParticipantsListUpdatePopupWindow__s_s_and_d_others_joined">
+        <item quantity="one">%1$s, %2$s and %3$d other joined</item>
+        <item quantity="other">%1$s, %2$s and %3$d others joined</item>
+    </plurals>
+    <!-- Toast/popup text shown when someone leaves a group call -->
     <string name="CallParticipantsListUpdatePopupWindow__s_left">%1$s напушти</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_and_s_left">%1$s и %2$s напуштија</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_s_and_s_left">%1$s, %2$s и %3$s напуштија</string>
-    <string name="CallParticipantsListUpdatePopupWindow__s_s_and_d_others_left">%1$s, %2$s и %3$d други напуштија</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 and %3$d other left</item>
+        <item quantity="other">%1$s, %2$s and %3$d others left</item>
+    </plurals>
 
     <string name="CallParticipant__you">Вие</string>
     <string name="CallParticipant__you_on_another_device">Вие (од друг уред)</string>
@@ -4558,10 +4645,15 @@
 
     <!-- PrivacySettingsFragment -->
     <string name="PrivacySettingsFragment__blocked">Барањето е блокирано</string>
-    <string name="PrivacySettingsFragment__d_contacts">%1$d контакти</string>
+    <!-- Settings label that shows the number blocked contacts -->
+    <plurals name="PrivacySettingsFragment__d_contacts">
+        <item quantity="one">%1$d contact</item>
+        <item quantity="other">%1$d contacts</item>
+    </plurals>
     <string name="PrivacySettingsFragment__messaging">Пораки</string>
     <string name="PrivacySettingsFragment__disappearing_messages">Исчезнувачки пораки</string>
     <string name="PrivacySettingsFragment__app_security">Безбедност на апликацијата</string>
+    <!-- This refers to the multi-tasking overview (recent apps) from the Android operating system.-->
     <string name="PrivacySettingsFragment__block_screenshots_in_the_recents_list_and_inside_the_app">Блокирај слики од екранот во листата на неодамнешни разговори и во самата апликација</string>
     <string name="PrivacySettingsFragment__signal_message_and_calls">Signal пораки и повици. Секогаш префрлај повици и запечатен испраќач.</string>
     <string name="PrivacySettingsFragment__default_timer_for_new_changes">Стандарден тајмер за нови разговори</string>
@@ -4618,11 +4710,14 @@
     <string name="DataAndStorageSettingsFragment__media_quality">Квалитет на медиумски датотеки</string>
     <string name="DataAndStorageSettingsFragment__sent_media_quality">Квалитет на испратена медиумска датотека</string>
     <string name="DataAndStorageSettingsFragment__sending_high_quality_media_will_use_more_data">Испраќањето на висококвалитетна медиумска датотека ќе користи повеќе податоци.</string>
+    <!-- Setting option that can be selected to default media to be sent as high quality by default -->
     <string name="DataAndStorageSettingsFragment__high">Висок</string>
+    <!-- Setting option that can be selected to default media to be sent as standard quality by default -->
     <string name="DataAndStorageSettingsFragment__standard">Стандарден</string>
     <string name="DataAndStorageSettingsFragment__calls">Повици</string>
 
     <!-- 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__use_custom_colors">Користи сопствени бои</string>
     <string name="ChatColorSelectionFragment__chat_color">Боја на разговор</string>
@@ -4834,6 +4929,7 @@
     <string name="AvatarPickerFragment__take_a_picture">Сликај</string>
     <string name="AvatarPickerFragment__choose_a_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>
     <string name="AvatarPickerFragment__clear_avatar">Отстрани аватар</string>
@@ -4894,7 +4990,7 @@
     <string name="MediaReviewFragment__add_a_message">Додај порака</string>
     <string name="MediaReviewFragment__add_a_reply">Додај одговор</string>
     <string name="MediaReviewFragment__send_to">Испрати на</string>
-    <string name="MediaReviewFragment__view_once_message">Еднократно видлива порака</string>
+    <string name="MediaReviewFragment__view_once_message">Еднократно видлива медиумска датотека</string>
     <string name="MediaReviewFragment__one_or_more_items_were_too_large">Еден или повеќе предмети беа премногу големи</string>
     <string name="MediaReviewFragment__one_or_more_items_were_invalid">Еден или повеќе предмети беа невалидни</string>
     <string name="MediaReviewFragment__too_many_items_selected">Премногу избрани предмети</string>
@@ -5487,7 +5583,7 @@
     <string name="StoryViewerFragment__s_s">%1$s %2$s</string>
     <!-- Displayed when viewing a post you sent -->
     <string name="StoryViewerPageFragment__you">Вие</string>
-    <!-- Displayed when viewing a post displayed to a group -->
+    <!-- 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 -->
     <string name="StoryViewerPageFragment__reply">Одговори</string>
@@ -6704,5 +6800,26 @@
     <!-- Content description for opening the note editor -->
     <string name="ViewNoteSheet__edit_note">Изменете белешка</string>
 
+    <!-- BackupProgressService -->
+    <!-- Notification title shown while backup restore job is running -->
+    <string name="BackupProgressService_title">Се враќа резервната копија…</string>
+    <!-- Notification title shown while downloading backup restore data -->
+    <string name="BackupProgressService_title_downloading">Се преземаат податоците од резервната копија…</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>
+    <!-- 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 -->
+    <string name="BackupsTypeSettingsFragment__google_pay">Google Pay</string>
+    <!-- Displayed as the user\'s payment method as a label in a preference row -->
+    <string name="BackupsTypeSettingsFragment__bank_transfer">Bank transfer</string>
+    <!-- Displayed as the user\'s payment method as a label in a preference row -->
+    <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>
+
+
     <!-- 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 5bdd4fd70f..113b75d45c 100644
--- a/app/src/main/res/values-ml/strings.xml
+++ b/app/src/main/res/values-ml/strings.xml
@@ -1,6 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- smartling.instruction_comments_enabled = on -->
-<resources>
+<?xml version="1.0" encoding="UTF-8"?><!-- 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> -->
@@ -89,6 +87,16 @@
     <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">Allow access to your location</string>
+    <!-- Dialog description that will explain the steps needed to give location permission -->
+    <string name="AttachmentManager_signal_to_send_location">To send your location:</string>
+    <!-- Alert dialog description asking for location permission -->
+    <string name="AttachmentManager_signal_allow_signal_access_location">Allow Molly access to send your location.</string>
+    <!-- Toast text explaining Signal\'s need for location access -->
+    <string name="AttachmentManager_signal_needs_location_access">Molly needs location access to send your location.</string>
+
     <!-- Alert dialog title to show the recipient has not activated payments -->
     <string name="AttachmentManager__not_activated_payments">%1$s എന്നത് പേയ്മെന്റുകൾ ആക്‌ടിവേറ്റ് ചെയ്‌തിട്ടില്ല </string>
     <!-- Alert dialog description to send the recipient a request to activate payments -->
@@ -241,7 +249,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>
@@ -386,8 +394,16 @@
     <string name="ConversationActivity_your_request_to_join_has_been_sent_to_the_group_admin">ഗ്രൂപ്പില്‍ ചേരുന്നതിനുള്ള നിങ്ങളുടെ അഭ്യർത്ഥന അഡ്മിന് അയച്ചു. അവർ നടപടിയെടുക്കുമ്പോൾ നിങ്ങളെ അറിയിക്കും.</string>
     <string name="ConversationActivity_cancel_request">അഭ്യർത്ഥന റദ്ദാക്കുക</string>
 
-    <string name="ConversationActivity_to_send_audio_messages_allow_signal_access_to_your_microphone">ഓഡിയോ സന്ദേശങ്ങള്‍ അയയ്‌ക്കാൻ, Molly-ന് നിങ്ങളുടെ മൈക്രോഫോണിലേക്ക് ആക്‌സസ്സ് അനുവദിക്കുക.</string>
+    <!-- Dialog title asking users for microphone permission -->
+    <string name="ConversationActivity_allow_access_microphone">Allow access to your microphone</string>
+    <!-- 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>
+    <!-- Toast text explaining Signal\'s need for microphone access -->
+    <string name="ConversationActivity_signal_needs_microphone_access_voice_message">Molly needs microphone access to record a voice message.</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 എന്നയാളെ വിളിക്കുന്നതിന് 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>
@@ -411,10 +427,17 @@
     <string name="ConversationActivity_you_will_leave_this_group_and_it_will_be_deleted_from_all_of_your_devices">നിങ്ങൾ ഈ ഗ്രൂപ്പിൽ നിന്ന് പുറത്തുകടക്കും, ഇത് നിങ്ങളുടെ എല്ലാ ഉപകരണങ്ങളിൽ നിന്നും ഇല്ലാതാക്കുകയും ചെയ്യും.</string>
     <string name="ConversationActivity_delete">ഇല്ലാതാക്കൂ</string>
     <string name="ConversationActivity_delete_and_leave">ഇല്ലാതാക്കിയ ശേഷം പുറത്തുകടക്കുക</string>
-    <string name="ConversationActivity__to_call_s_signal_needs_access_to_your_microphone">%1$s-നെ വിളിക്കാൻ, Molly-ന് നിങ്ങളുടെ മൈക്രോഫോണിലേക്ക് ആക്സസ് ആവശ്യമാണ്</string>
+
+    <!-- Dialog description that will explain the steps needed to give microphone permissions for a voice call -->
+    <string name="ConversationActivity__to_start_call">To start a 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">To start a call, allow Molly access to your microphone.</string>
+    <!-- Toast text explaining Signal\'s need for microphone access for a voice call -->
+    <string name="ConversationActivity_signal_needs_microphone_access_voice_call">Molly needs microphone access to start a call.</string>
 
 
     <string name="ConversationActivity_join">ചേരുക</string>
+    <!-- Button text for an active group call but the call is currently full and unjoinable -->
     <string name="ConversationActivity_full">പൂർണ്ണമായി</string>
 
     <string name="ConversationActivity_error_sending_media">മീഡിയ അയയ്‌ക്കുന്നതിൽ പിശക്</string>
@@ -613,6 +636,7 @@
     <string name="ConversationListFragment_unarchive">അൺആർക്കൈവ്</string>
     <string name="ConversationListFragment_delete">ഇല്ലാതാക്കൂ</string>
     <string name="ConversationListFragment_select_all">എല്ലാം തിരഞ്ഞെടുക്കുക</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 തിരഞ്ഞെടുത്തു</item>
         <item quantity="other">%1$d തിരഞ്ഞെടുത്തു</item>
@@ -864,6 +888,7 @@
         <item quantity="one">ക്ഷണം അയച്ചു</item>
         <item quantity="other">%1$d ക്ഷണങ്ങൾ അയച്ചു</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">\"%1$s\"നെ സ്വമേധയാ ഈ ഗ്രൂപ്പിലേക്ക് ചേർക്കാൻ നിങ്ങൾക്ക് കഴിയില്ല.\n\nഅവരെ അംഗത്വമെടുക്കാൻ ക്ഷണിച്ചിട്ടുണ്ട്, അവർ അത് സ്വീകരിക്കുന്നത് വരെ ഗ്രൂപ്പ് സന്ദേശങ്ങളൊന്നും കാണാൻ സാധിക്കുകയില്ല.</string>
     <string name="GroupManagement_invite_multiple_users">ഈ ഉപയോക്താക്കളെ നിങ്ങൾക്ക് ഈ ഗ്രൂപ്പിലേക്ക് സ്വയമേവ ചേർക്കാൻ കഴിയില്ല.\n\nഅവരെ അംഗത്വമെടുക്കാൻ ക്ഷണിച്ചിട്ടുണ്ട്, അവർ അത് സ്വീകരിക്കുന്നത് വരെ ഗ്രൂപ്പ് സന്ദേശങ്ങളൊന്നും കാണാൻ സാധിക്കുകയില്ല.</string>
 
@@ -1044,7 +1069,9 @@
 
     <string name="ManageGroupActivity_edit_name_and_picture">പേരും ചിത്രവും എഡിറ്റുചെയ്യുക</string>
     <string name="ManageGroupActivity_legacy_group">ലെഗസി ഗ്രൂപ്പ്</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">ഇതൊരു ലെഗസി ഗ്രൂപ്പാണ്. ഗ്രൂപ്പ് അഡ്മിൻ പോലുള്ള സവിശേഷതകൾ പുതിയ ഗ്രൂപ്പുകൾക്ക് മാത്രമേ ലഭ്യമാകൂ.</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">ഇതൊരു ലെഗസി ഗ്രൂപ്പാണ്. @സൂചനകള്‍ അഡ്‌മിനുകള്‍ പോലുള്ള പുതിയ സവിശേഷതകൾ ആക്‌സസ് ചെയ്യുന്നതിന്,</string>
     <string name="ManageGroupActivity_legacy_group_too_large">ഈ ലെഗസി ഗ്രൂപ്പിനെ ഒരു പുതിയ ഗ്രൂപ്പിലേക്ക് അപ്‌ഗ്രേഡുചെയ്യാൻ കഴിയില്ല കാരണം ഇത് വളരെ വലുതാണ്. പരമാവധി ഗ്രൂപ്പ് വലുപ്പം %1$d ആണ്.</string>
     <string name="ManageGroupActivity_upgrade_this_group">ഈ ഗ്രൂപ്പ് അപ്‌ഗ്രേഡുചെയ്യുക</string>
@@ -1271,6 +1298,7 @@
         <item quantity="other">ഇല്ലാതാക്കൂ</item>
     </plurals>
 
+    <!-- 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 തിരഞ്ഞെടുത്തു (%2$s)</item>
         <item quantity="other">%1$d തിരഞ്ഞെടുത്തു (%2$s)</item>
@@ -1335,17 +1363,13 @@
     <string name="MessageRecord_left_group">നിങ്ങൾ ഗ്രൂപ്പ് വിട്ടു.</string>
     <string name="MessageRecord_you_updated_group">നിങ്ങൾ ഗ്രൂപ്പ് അപ്‌ഡേറ്റുചെയ്‌തു.</string>
     <string name="MessageRecord_the_group_was_updated">ഗ്രൂപ്പ് അപ്‌ഡേറ്റുചെയ്‌തു.</string>
-    <!-- Update message shown when placing an outgoing 1:1 voice/audio call and it\'s answered by the other party -->
+    <!-- Update message shown when placing an outgoing 1:1 voice/audio call -->
     <string name="MessageRecord_outgoing_voice_call">ഔട്ട്ഗോയിംഗ് വോയ്‌സ് കോൾ</string>
-    <!-- Update message shown when placing an outgoing 1:1 video call and it\'s answered by the other party -->
+    <!-- Update message shown when placing an outgoing 1:1 video call -->
     <string name="MessageRecord_outgoing_video_call">ഔട്ട്ഗോയിംഗ് വീഡിയോ കോൾ</string>
-    <!-- Update message shown when placing an outgoing 1:1 voice/audio call and it\'s not answered by the other party -->
-    <string name="MessageRecord_unanswered_voice_call">ഉത്തരം ലഭിക്കാത്ത വോയ്‌സ് കോൾ</string>
-    <!-- Update message shown when placing an outgoing 1:1 video call and it\'s not answered by the other party -->
-    <string name="MessageRecord_unanswered_video_call">ഉത്തരം ലഭിക്കാത്ത വീഡിയോ കോൾ</string>
-    <!-- Update message shown when receiving an incoming 1:1 voice/audio call and it\'s answered -->
+    <!-- Update message shown when receiving an incoming 1:1 voice/audio call and it\'s answered or ringing -->
     <string name="MessageRecord_incoming_voice_call">ഇൻകമിംഗ് വോയ്‌സ് കോൾ</string>
-    <!-- Update message shown when receiving an incoming 1:1 video call and answered -->
+    <!-- Update message shown when receiving an incoming 1:1 video call and answered or ringing -->
     <string name="MessageRecord_incoming_video_call">ഇൻകമിംഗ് വീഡിയോ കോൾ</string>
     <!-- Update message shown when receiving an incoming 1:1 voice/audio call and not answered -->
     <string name="MessageRecord_missed_voice_call">മിസ്‌ഡ് വോയ്‌സ് കോൾ</string>
@@ -1355,10 +1379,6 @@
     <string name="MessageRecord_missed_voice_call_notification_profile">അറിയിപ്പ് പ്രൊഫൈൽ ഓണായിരിക്കുമ്പോൾ വോയ്സ് കോൾ മിസ്സ് ആയി</string>
     <!-- Update message shown when receiving an incoming video call and declined due to notification profile -->
     <string name="MessageRecord_missed_video_call_notification_profile">അറിയിപ്പ് പ്രൊഫൈൽ ഓണായിരിക്കുമ്പോൾ വീഡിയോ കോൾ മിസ്സ് ആയി</string>
-    <!-- Update message shown when receiving an incoming 1:1 voice/audio call and explicitly declined -->
-    <string name="MessageRecord_you_declined_a_voice_call">നിങ്ങൾ ഒരു വോയ്‌സ് കോൾ നിരസിച്ചു</string>
-    <!-- Update message shown when receiving an incoming 1:1 video call and explicitly declined -->
-    <string name="MessageRecord_you_declined_a_video_call">നിങ്ങൾ ഒരു വീഡിയോ കോൾ നിരസിച്ചു</string>
     <!-- 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>
@@ -1567,28 +1587,53 @@
     <string name="MessageRecord_can_accept_payments">%1$s എന്നയാൾക്ക് ഇപ്പോൾ പേയ്മെന്റുകൾ സ്വീകരിക്കാൻ കഴിയും</string>
 
     <!-- Group Calling update messages -->
-    <string name="MessageRecord_s_started_a_group_call_s">%1$s ഒരു ഗ്രൂപ്പ് കോൾ ആരംഭിച്ചു . %2$s</string>
-    <string name="MessageRecord_you_started_a_group_call_s">നിങ്ങളൊരു ഗ്രൂപ്പ് കോൾ തുടങ്ങി · %1$s</string>
-    <string name="MessageRecord_s_is_in_the_group_call_s">%1$s ഗ്രൂപ്പ് കോളിലാണ് · %2$s</string>
-    <string name="MessageRecord_you_are_in_the_group_call_s1">നിങ്ങൾ ഗ്രൂപ്പ് കോളിലാണ് · %1$s</string>
-    <string name="MessageRecord_s_and_s_are_in_the_group_call_s1">%1$s, %2$s എന്നിവർ %3$s എന്ന ഗ്രൂപ്പ് കോളിലാണ്</string>
-    <string name="MessageRecord_group_call_s">ഗ്രൂപ്പ് കോൾ · %1$s</string>
-
-    <string name="MessageRecord_s_started_a_group_call">%1$s ഒരു ഗ്രൂപ്പ് കോൾ ആരംഭിച്ചു</string>
-    <string name="MessageRecord_you_started_a_group_call">നിങ്ങൾ ഒരു ഗ്രൂപ്പ് കോൾ ആരംഭിച്ചു</string>
-    <string name="MessageRecord_s_is_in_the_group_call">%1$s ഗ്രൂപ്പ് കോളിലാണ്</string>
-    <string name="MessageRecord_you_are_in_the_group_call">നിങ്ങൾ ഗ്രൂപ്പ് കോളിലാണ്</string>
-    <string name="MessageRecord_s_and_s_are_in_the_group_call">%1$s - ഉം %2$s- ഉം ഗ്രൂപ്പ് കോളിലാണ്</string>
-    <string name="MessageRecord_group_call">ഗ്രൂപ്പ് കോൾ</string>
+    <!-- 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 കോളിലാണ് · %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">നിങ്ങൾ കോളിലാണ് · %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 , %2$s എന്നിവർ കോളിലാണ് · %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 കോളിലാണ്</string>
+    <!-- Chat log text for an ongoing group call only the local user has joined -->
+    <string name="MessageRecord_you_are_in_the_call">നിങ്ങൾ കോളിലാണ്</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, %2$s എന്നിവർ കോളിലാണ്</string>
+    <!-- Chat log text for a group call that ended within the last 5 minutes -->
+    <string name="MessageRecord__the_video_call_has_ended">വീഡിയോ കോൾ അവസാനിച്ചു</string>
+    <!-- Chat log text for a group call that ended within the last 5 minutes with a placeholder for formatted time -->
+    <string name="MessageRecord__the_video_call_has_ended_s">വീഡിയോ കോൾ അവസാനിച്ചു · %1$s</string>
+    <!-- Chat log text for a group call that ended more than 5 minutes ago and was missed -->
+    <string name="MessageRecord__missed_video_call">മിസ്‌ഡ് വീഡിയോ കോൾ</string>
+    <!-- Chat log text for a group call that ended more than 5 minutes ago and was missed with a placeholder for formatted time -->
+    <string name="MessageRecord__missed_video_call_s">നഷ്‌ടമായ വീഡിയോ കോൾ · %1$s</string>
+    <!-- Chat log text for a group call that ended that the local user did not start -->
+    <string name="MessageRecord__incoming_video_call">ഇൻകമിംഗ് വീഡിയോ കോൾ</string>
+    <!-- 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">ഇൻകമിംഗ് വീഡിയോ കോൾ · %1$s</string>
+    <!-- Chat log text for a group call that ended that the local user started -->
+    <string name="MessageRecord__outgoing_video_call">ഔട്ട്ഗോയിംഗ് വീഡിയോ കോൾ</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">ഔട്ട്ഗോയിംഗ് വീഡിയോ കോൾ · %1$s</string>
+    <!-- Chat log text for an ongoing group call that the local user started -->
+    <string name="MessageRecord__you_started_a_video_call">നിങ്ങൾ ഒരു വീഡിയോ കോൾ ആരംഭിച്ചു</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">നിങ്ങൾ ഒരു വീഡിയോ കോൾ ആരംഭിച്ചു · %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 ഒരു വീഡിയോ കോൾ ആരംഭിച്ചു</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 ഒരു വീഡിയോ കോൾ ആരംഭിച്ചു · %2$s</string>
 
     <string name="MessageRecord_you">നിങ്ങൾ</string>
 
-    <plurals name="MessageRecord_s_s_and_d_others_are_in_the_group_call_s">
+    <!-- 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, പിന്നെ %3$d ആളും ഗ്രൂപ്പ് കോളിലാണ് · %4$s</item>
         <item quantity="other">%1$s, %2$s, പിന്നെ %3$d ആളുകളും ഈ കോളിലുണ്ട് · %4$s</item>
     </plurals>
 
-    <plurals name="MessageRecord_s_s_and_d_others_are_in_the_group_call">
+    <!-- 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 - ഉം പിന്നെ %3$d ആളും ഈ കോളിലുണ്ട്</item>
         <item quantity="other">%1$s, %2$s, പിന്നെ %3$d ആളുകളും ഈ കോളിലുണ്ട്</item>
     </plurals>
@@ -2063,6 +2108,7 @@
     <!-- Generic error when the app is unable to request an SMS code for an unknown reason. -->
     <string name="RegistrationActivity_unable_to_request_verification_code">പരിശോധിച്ചുറപ്പിക്കൽ കോഡ് അഭ്യർത്ഥിക്കാനായില്ല. നിങ്ങളുടെ നെറ്റ്‌വർക്ക് കണക്ഷൻ പരിശോധിച്ചശേഷം വീണ്ടും ശ്രമിക്കുക.</string>
     <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">Molly ആൻഡ്രോയിഡ് - ഫോണ്‍ നമ്പര്‍ രുപം</string>
     <!--    Small "toast" notification to the user confirming that they have requested a new code via voice call.-->
@@ -2207,7 +2253,7 @@
     <string name="SubmitDebugLogActivity_this_log_will_be_posted_publicly_online_for_contributors">സംഭാവന നൽകുന്നവർക്ക് കാണുന്നതിന് ഈ ലോഗ് പരസ്യമായി ഓൺലൈനിൽ പോസ്റ്റുചെയ്യും. അപ്‌ലോഡ് ചെയ്യുന്നതിന് മുമ്പ് നിങ്ങൾക്ക് ഇത് പരിശോധിക്കാവുന്നതാണ്.</string>
 
     <!-- SupportEmailUtil -->
-  <!-- Removed by excludeNonTranslatables <string name="SupportEmailUtil_support_email" translatable="false">support@molly.im</string> -->
+  <!-- Removed by excludeNonTranslatables <string name="SupportEmailUtil_support_email" translatable="false">support@signal.org</string> -->
     <string name="SupportEmailUtil_filter">ഫിൽട്ടർ:</string>
     <string name="SupportEmailUtil_device_info">ഉപകരണ വിവരം:</string>
     <string name="SupportEmailUtil_android_version">Android പതിപ്പ്:</string>
@@ -2709,6 +2755,8 @@
     <string name="ConversationUpdateItem_loading">ലഭ്യമാക്കുന്നു</string>
     <string name="ConversationUpdateItem_learn_more">കൂടുതൽ അറിയുക</string>
     <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_call_is_full">കോൾ നിറഞ്ഞു</string>
     <string name="ConversationUpdateItem_invite_friends">സുഹൃത്തുക്കളെ ക്ഷണിക്കുക</string>
@@ -2773,6 +2821,7 @@
     <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>
 
     <!-- EnableCallNotificationSettingsDialog__call_notifications_checklist -->
@@ -3086,6 +3135,7 @@
 
     <string name="arrays__default">സ്ഥിരസ്ഥിതി</string>
     <string name="arrays__high">ഉയർന്നത്</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">പരമാവധി</string>
 
     <!-- plurals.xml -->
@@ -3357,7 +3407,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 വാലറ്റ് എന്നിവയുടെ ഉപയോഗ നയങ്ങൾക്ക് വിധേയമായിരിക്കും. നിങ്ങൾക്ക് ചില പ്രശ്‍നങ്ങൾ നേരിട്ടേക്കാം, നിങ്ങൾക്ക് നഷ്ടപ്പെട്ടേക്കാവുന്ന പേയ്മെന്റുകളോ ബാലൻസുകളോ വീണ്ടെടുക്കാനാകില്ല. </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">Molly-ലെ പേയ്‌മെന്റുകൾ ഇനി ലഭ്യമല്ല. നിങ്ങൾക്ക് ഇപ്പോഴും ഒരു എക്സ്ചേഞ്ചിലേക്ക് ഫണ്ടുകൾ ട്രാൻസ്ഫർ ചെയ്യാൻ കഴിയും, എന്നാൽ നിങ്ങൾക്ക് ഇനി പേയ്മെന്റുകൾ അയയ്ക്കാനും കൂടാതെ സ്വീകരിക്കാനും അല്ലെങ്കിൽ ഫണ്ടുകൾ ചേർക്കാനോ കഴിയില്ല.</string>
@@ -3406,6 +3456,14 @@
     <!-- Storage permission row description -->
     <string name="GrantPermissionsFragment__send_photos_videos_and_files">നിങ്ങളുടെ ഉപകരണത്തിൽ നിന്ന് ഫോട്ടോകളോ വീഡിയോകളോ ഫയലുകളോ അയയ്ക്കുക.</string>
 
+    <!-- PermissionDeniedBottomSheet -->
+    <!-- Sheet describing step 1 on how to give permissions by opening settings -->
+    <string name="PermissionDeniedBottomSheet__1_tap_settings_below">1. Tap “Settings” below</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 Allow the permission</string>
+    <!-- Label for button at the bottom of the sheet which opens the system permission settings -->
+    <string name="PermissionDeniedBottomSheet__settings">Settings</string>
+
     <!-- PaymentsSecuritySetupFragment -->
     <!-- Toolbar title -->
     <string name="PaymentsSecuritySetupFragment__security_setup">സുരക്ഷാ സജ്ജീകരണം</string>
@@ -3446,6 +3504,7 @@
     <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__information">പേയ്മെന്റ് തുകയും ഇടപാടിന്റെ സമയവും ഉൾപ്പെടെയുള്ള ട്രാൻസാക്ഷൻ വിശദാംശങ്ങൾ MobileCoin ലെഡ്‌ജറിന്റെ ഭാഗമാണ്.</string>
@@ -3508,6 +3567,7 @@
     <string name="ConfirmPayment__confirm_payment">പേയ്മെന്റ് സ്ഥിരീകരിക്കുക</string>
     <string name="ConfirmPayment__network_fee">നെറ്റ്‌വർക്ക് ഫീസ്</string>
     <string name="ConfirmPayment__estimated_s">കണക്കാക്കിയ %1$s</string>
+    <!-- Prefix to a name to indicate who a payment will be sent to -->
     <string name="ConfirmPayment__to">സ്വീകർത്താവ്:</string>
     <string name="ConfirmPayment__total_amount">ആകെ തുക</string>
     <string name="ConfirmPayment__balance_s">ബാലൻസ്: %1$s</string>
@@ -3658,6 +3718,14 @@
     <string name="conversation_group_options__conversation">ചാറ്റ്</string>
     <string name="conversation_group_options__broadcast">ബ്രോഡ്കാസ്റ്റ്</string>
 
+    <!-- DoubleTapEditEducationSheet -->
+    <!-- Displayed as the title of the education bottom sheet -->
+    <string name="DoubleTapEditEducationSheet__double_tap_edit_title">Double tap to edit</string>
+    <!-- Text on the sheet explaining how double tapping on a message will let them edit it -->
+    <string name="DoubleTapEditEducationSheet__quickly_tap_twice">Quickly tap twice on your messages to edit them. You can edit your messages up to 24hrs after they’ve been sent.</string>
+    <!-- Button label to dismiss sheet -->
+    <string name="DoubleTapEditEducationSheet__got_it">Got it</string>
+
     <!-- text_secure_normal -->
     <string name="text_secure_normal__menu_new_group">പുതിയ ഗ്രൂപ്പ്</string>
     <string name="text_secure_normal__menu_settings">ക്രമീകരണങ്ങൾ</string>
@@ -4112,6 +4180,7 @@
     <string name="RecipientBottomSheet_copied_to_clipboard">ക്ലിപ്പ്ബോർഡിലേക്ക് പകർത്തി</string>
 
     <string name="GroupRecipientListItem_admin">അഡ്‌മിൻ‌</string>
+    <!-- Button text to approve a user that has requested to join a group -->
     <string name="GroupRecipientListItem_approve_description">അംഗീകരിക്കുക</string>
     <string name="GroupRecipientListItem_deny_description">നിരസിക്കുക</string>
 
@@ -4139,6 +4208,7 @@
 
     <!-- VoiceNoteMediaDescriptionCompatFactory -->
     <string name="VoiceNoteMediaItemFactory__voice_message">വോയിസ് മെസേജ് - %1$s</string>
+    <!-- This is a title in a banner describing the conversation sender to receiver placeholders of the currently playing voice memo. -->
     <string name="VoiceNoteMediaItemFactory__s_to_s">%1$s %2$s-നോട്</string>
 
     <!-- StorageUtil -->
@@ -4152,8 +4222,16 @@
     <string name="ReviewCardDialogFragment__review_members">അംഗങ്ങളെ അവലോകനം ചെയ്യുക</string>
     <!-- Title of a screen where the user will be prompted to review a message request matching the name of someone they already know -->
     <string name="ReviewCardDialogFragment__review_request">അവലോകന അഭ്യർത്ഥന</string>
-    <string name="ReviewCardDialogFragment__d_group_members_have_the_same_name">%1$d ഗ്രൂപ്പ് അംഗങ്ങൾക്ക് സമാന പേരുണ്ട്, ചുവടെയുള്ള അംഗങ്ങളെ അവലോകനം ചെയ്ത് നടപടിയെടുക്കാൻ തിരഞ്ഞെടുക്കുക.</string>
-    <string name="ReviewCardDialogFragment__if_youre_not_sure">അഭ്യർത്ഥന ആരാണ് നിങ്ങൾക്ക് അയച്ചതെന്ന് ഉറപ്പില്ലെങ്കിൽ, ചുവടെയുള്ള കോൺടാക്റ്റുകൾ അവലോകനം ചെയ്ത് നടപടിയെടുക്കുക.</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="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 -->
+    <plurals name="ReviewCardDialogFragment__if_youre_not_sure">
+        <item quantity="one">If you\'re not sure who the request is from, review the contact below and take action.</item>
+        <item quantity="other">If you\'re not sure who the request is from, review the contacts below and take action.</item>
+    </plurals>
     <string name="ReviewCardDialogFragment__no_other_groups_in_common">സാമാന്യമായി മറ്റ് ഗ്രൂപ്പുകളൊന്നുമില്ല.</string>
     <string name="ReviewCardDialogFragment__no_groups_in_common">സാമാന്യമായി ഗ്രൂപ്പുകളൊന്നുമില്ല.</string>
     <plurals name="ReviewCardDialogFragment__d_other_groups_in_common">
@@ -4184,11 +4262,20 @@
     <string name="CallParticipantsListUpdatePopupWindow__s_joined">%1$s ചേർന്നു</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_and_s_joined">%1$s-ഉം %2$s-ഉം ചേർന്നു</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_s_and_s_joined">%1$s-ഉം, %2$s-ഉം %3$s-ഉം ചേർന്നിട്ടുണ്ട്</string>
-    <string name="CallParticipantsListUpdatePopupWindow__s_s_and_d_others_joined">%1$s-ഉം, %2$s-ഉം %3$d-ഉം മറ്റുള്ളവരും ചേർന്നിട്ടുണ്ട്</string>
+    <!-- Toast message shown in group call when 3 or more people join -->
+    <plurals name="CallParticipantsListUpdatePopupWindow__s_s_and_d_others_joined">
+        <item quantity="one">%1$s, %2$s and %3$d other joined</item>
+        <item quantity="other">%1$s, %2$s and %3$d others joined</item>
+    </plurals>
+    <!-- Toast/popup text shown when someone leaves a group call -->
     <string name="CallParticipantsListUpdatePopupWindow__s_left">%1$s ഇറങ്ങി പോയിട്ടുണ്ട്</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_and_s_left">%1$s-ഉം %2$s-ഉം ഇറങ്ങി പോയിട്ടുണ്ട്</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_s_and_s_left">%1$s-ഉം, %2$s-ഉം %3$s-ഉം ഇറങ്ങി പോയിട്ടുണ്ട്</string>
-    <string name="CallParticipantsListUpdatePopupWindow__s_s_and_d_others_left">%1$s-ഉം, %2$s-ഉം %3$d-ഉം മറ്റുള്ളവരും ഇറങ്ങി പോയിട്ടുണ്ട്</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 and %3$d other left</item>
+        <item quantity="other">%1$s, %2$s and %3$d others left</item>
+    </plurals>
 
     <string name="CallParticipant__you">നിങ്ങൾ</string>
     <string name="CallParticipant__you_on_another_device">നിങ്ങൾ (മറ്റൊരു ഉപകരണത്തിൽ)</string>
@@ -4558,10 +4645,15 @@
 
     <!-- PrivacySettingsFragment -->
     <string name="PrivacySettingsFragment__blocked">ബ്ലോക്ക് ചെയ്തു</string>
-    <string name="PrivacySettingsFragment__d_contacts">%1$d കോൺ‌ടാക്റ്റുകൾ</string>
+    <!-- Settings label that shows the number blocked contacts -->
+    <plurals name="PrivacySettingsFragment__d_contacts">
+        <item quantity="one">%1$d contact</item>
+        <item quantity="other">%1$d contacts</item>
+    </plurals>
     <string name="PrivacySettingsFragment__messaging">സന്ദേശ വിനിമയം</string>
     <string name="PrivacySettingsFragment__disappearing_messages">അപ്രത്യക്ഷമാകുന്ന സന്ദേശങ്ങൾ</string>
     <string name="PrivacySettingsFragment__app_security">ആപ്പ് സുരക്ഷ</string>
+    <!-- This refers to the multi-tasking overview (recent apps) from the Android operating system.-->
     <string name="PrivacySettingsFragment__block_screenshots_in_the_recents_list_and_inside_the_app">റീസന്റ് ലിസ്റ്റിലും ആപ്പിനുള്ളിലും സ്‌ക്രീൻഷോട്ടുകൾ ബ്ലോക്ക് ചെയ്യുക</string>
     <string name="PrivacySettingsFragment__signal_message_and_calls">Signal സന്ദേശങ്ങള്‍ കോളുകളും, എല്ലായ്പ്പോഴും കോളുകള് റിലേ ചെയ്യുക ഒപ്പം സീൽ ചെയ്ത അയച്ചയാൾ</string>
     <string name="PrivacySettingsFragment__default_timer_for_new_changes">പുതിയ ചാറ്റുകൾക്കായുള്ള ഡിഫോൾട്ട് ടൈമർ</string>
@@ -4618,11 +4710,14 @@
     <string name="DataAndStorageSettingsFragment__media_quality">മീഡിയ നിലവാരം</string>
     <string name="DataAndStorageSettingsFragment__sent_media_quality">അയയ്ക്കുന്ന മീഡിയയുടെ നിലവാരം</string>
     <string name="DataAndStorageSettingsFragment__sending_high_quality_media_will_use_more_data">ഉയർന്ന നിലവാരമുള്ള മീഡിയ അയയ്ക്കുന്നത് കൂടുതൽ ഡാറ്റ ഉപയോഗിക്കും.</string>
+    <!-- Setting option that can be selected to default media to be sent as high quality by default -->
     <string name="DataAndStorageSettingsFragment__high">ഉയർന്നത്</string>
+    <!-- Setting option that can be selected to default media to be sent as standard quality by default -->
     <string name="DataAndStorageSettingsFragment__standard">സ്റ്റാൻഡേർഡ്</string>
     <string name="DataAndStorageSettingsFragment__calls">കോളുകൾ</string>
 
     <!-- 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__use_custom_colors">ഇഷ്‌ടാനുസൃത നിറങ്ങൾ ഉപയോഗിക്കുക</string>
     <string name="ChatColorSelectionFragment__chat_color">ചാറ്റ് നിറം</string>
@@ -4834,6 +4929,7 @@
     <string name="AvatarPickerFragment__take_a_picture">ഒരു ഫോട്ടോ എടുക്ക്</string>
     <string name="AvatarPickerFragment__choose_a_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>
     <string name="AvatarPickerFragment__clear_avatar">അവതാർ മായ്‌ക്കുക</string>
@@ -4894,7 +4990,7 @@
     <string name="MediaReviewFragment__add_a_message">ഒരു സന്ദേശം ചേര്‍ക്കുക</string>
     <string name="MediaReviewFragment__add_a_reply">ഒരു മറുപടി ചേർക്കുക</string>
     <string name="MediaReviewFragment__send_to">ഇനിപ്പറയുന്നയാൾക്ക് അയയ്ക്കുക</string>
-    <string name="MediaReviewFragment__view_once_message">ഒരിയ്ക്കല്‍ മാത്രം കാണാവുന്ന സന്ദേശം</string>
+    <string name="MediaReviewFragment__view_once_message">ഒറ്റത്തവണ വീഡിയോ കാണുക</string>
     <string name="MediaReviewFragment__one_or_more_items_were_too_large">ഒന്നോ അതിലധികമോ ഇനങ്ങൾ വളരെ വലുതായിരുന്നു</string>
     <string name="MediaReviewFragment__one_or_more_items_were_invalid">ഒന്നോ അതിലധികമോ ഇനങ്ങൾ അസാധുവാണ്</string>
     <string name="MediaReviewFragment__too_many_items_selected">വളരെയധികം ഇനങ്ങൾ തിരഞ്ഞെടുത്തു</string>
@@ -5487,7 +5583,7 @@
     <string name="StoryViewerFragment__s_s">%1$s %2$s</string>
     <!-- Displayed when viewing a post you sent -->
     <string name="StoryViewerPageFragment__you">നിങ്ങൾ</string>
-    <!-- Displayed when viewing a post displayed to a group -->
+    <!-- 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 -->
     <string name="StoryViewerPageFragment__reply">മറുപടി</string>
@@ -6704,5 +6800,26 @@
     <!-- Content description for opening the note editor -->
     <string name="ViewNoteSheet__edit_note">കുറിപ്പ് എഡിറ്റ് ചെയ്യുക</string>
 
+    <!-- BackupProgressService -->
+    <!-- Notification title shown while backup restore job is running -->
+    <string name="BackupProgressService_title">ബാക്കപ്പ് പുനഃസ്ഥാപിക്കുന്നു…</string>
+    <!-- Notification title shown while downloading backup restore data -->
+    <string name="BackupProgressService_title_downloading">ബാക്കപ്പ് ഡാറ്റ ഡൗൺലോഡ് ചെയ്യുന്നു…</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>
+    <!-- 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 -->
+    <string name="BackupsTypeSettingsFragment__google_pay">Google Pay</string>
+    <!-- Displayed as the user\'s payment method as a label in a preference row -->
+    <string name="BackupsTypeSettingsFragment__bank_transfer">Bank transfer</string>
+    <!-- Displayed as the user\'s payment method as a label in a preference row -->
+    <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>
+
+
     <!-- 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 ec2b3af234..47a8757af9 100644
--- a/app/src/main/res/values-mr/strings.xml
+++ b/app/src/main/res/values-mr/strings.xml
@@ -1,6 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- smartling.instruction_comments_enabled = on -->
-<resources>
+<?xml version="1.0" encoding="UTF-8"?><!-- 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> -->
@@ -89,6 +87,16 @@
     <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">Allow access to your location</string>
+    <!-- Dialog description that will explain the steps needed to give location permission -->
+    <string name="AttachmentManager_signal_to_send_location">To send your location:</string>
+    <!-- Alert dialog description asking for location permission -->
+    <string name="AttachmentManager_signal_allow_signal_access_location">Allow Molly access to send your location.</string>
+    <!-- Toast text explaining Signal\'s need for location access -->
+    <string name="AttachmentManager_signal_needs_location_access">Molly needs location access to send your location.</string>
+
     <!-- Alert dialog title to show the recipient has not activated payments -->
     <string name="AttachmentManager__not_activated_payments">%1$s ने पेमेंट्स सक्रिय केलेले नाहीत </string>
     <!-- Alert dialog description to send the recipient a request to activate payments -->
@@ -241,7 +249,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>
@@ -386,8 +394,16 @@
     <string name="ConversationActivity_your_request_to_join_has_been_sent_to_the_group_admin">आपली सामील होण्याची विनंती गट प्रशासकाकडे पाठविली गेली आहे. जेव्हा ते कारवाई करतील तेव्हा आपल्याला सूचित केले जाईल.</string>
     <string name="ConversationActivity_cancel_request">विनंती रद्द करा</string>
 
-    <string name="ConversationActivity_to_send_audio_messages_allow_signal_access_to_your_microphone">ऑडिओ संदेश पाठविण्यासाठी, Molly ला आपले मायक्रोफोन अॅक्सेस करण्याची अनुमती द्या.</string>
+    <!-- Dialog title asking users for microphone permission -->
+    <string name="ConversationActivity_allow_access_microphone">Allow access to your microphone</string>
+    <!-- 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>
+    <!-- Toast text explaining Signal\'s need for microphone access -->
+    <string name="ConversationActivity_signal_needs_microphone_access_voice_message">Molly needs microphone access to record a voice message.</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 ला कॉल करण्यासाठी 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>
@@ -411,10 +427,17 @@
     <string name="ConversationActivity_you_will_leave_this_group_and_it_will_be_deleted_from_all_of_your_devices">आपण हा ग्रुप सोडाल , आणि तो आपल्या सर्व डिव्हाइसेस वरून हटविला जाईल.</string>
     <string name="ConversationActivity_delete">हटवा</string>
     <string name="ConversationActivity_delete_and_leave">ग्रुप हटवा आणि सोडून द्या</string>
-    <string name="ConversationActivity__to_call_s_signal_needs_access_to_your_microphone">%1$s ला कॉल करण्यासाठी, Molly ला आपल्या मायक्रोफोनचा अॅक्सेस हवा आहे</string>
+
+    <!-- Dialog description that will explain the steps needed to give microphone permissions for a voice call -->
+    <string name="ConversationActivity__to_start_call">To start a 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">To start a call, allow Molly access to your microphone.</string>
+    <!-- Toast text explaining Signal\'s need for microphone access for a voice call -->
+    <string name="ConversationActivity_signal_needs_microphone_access_voice_call">Molly needs microphone access to start a call.</string>
 
 
     <string name="ConversationActivity_join">सामील व्हा</string>
+    <!-- Button text for an active group call but the call is currently full and unjoinable -->
     <string name="ConversationActivity_full">पूर्ण</string>
 
     <string name="ConversationActivity_error_sending_media">मिडिया पाठवण्यात त्रुटी</string>
@@ -613,6 +636,7 @@
     <string name="ConversationListFragment_unarchive">अनआर्काईव्ह</string>
     <string name="ConversationListFragment_delete">हटवा</string>
     <string name="ConversationListFragment_select_all">सर्व निवडा</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 निवडला</item>
         <item quantity="other">%1$d निवडले</item>
@@ -864,6 +888,7 @@
         <item quantity="one">आमंत्रण पाठवले</item>
         <item quantity="other">%1$d आमंत्रणे पाठवली</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">\"%1$s\" आपल्याद्वारे स्वयंचलितपणे गटा मध्ये जोडले जाऊ शकत नाहीत.\n\nत्यांना गटात सामील होण्यासाठी आमंत्रित केले गेले आहे आणि ते स्वीकारेपर्यंत त्यांना कोणतेही गट संदेश दिसणार नाहीत.</string>
     <string name="GroupManagement_invite_multiple_users">हे वापरकर्ते आपल्याद्वारे स्वयंचलितपणे गटामध्ये जोडले जाऊ शकत नाहीत. \n\nत्यांना गटात सामील होण्यासाठी आमंत्रित केले गेले आहे आणि ते स्वीकारेपर्यंत त्यांना कोणतेही गट संदेश दिसणार नाहीत.</string>
 
@@ -1044,7 +1069,9 @@
 
     <string name="ManageGroupActivity_edit_name_and_picture">नाव आणि चित्र संपादित करा</string>
     <string name="ManageGroupActivity_legacy_group">लेगसी गट</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">हा एक लेगसी गट आहे. गट ऍडमिन सारखे वैशिष्ट्ये फक्त नवीन गटांसाठी उपलब्ध आहेत.</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">हा एक लेगसी गट आहे. @उल्लेख आणि ऍडमिन सारखे वैशिष्ट्ये प्रवेश करण्यासाठी, </string>
     <string name="ManageGroupActivity_legacy_group_too_large">या लेगसी गटाला नवीन गटामध्ये श्रेणीसुधारित केला जाऊ शकत नाही कारण तो खूप मोठा आहे. गटाचा कमाल आकार %1$d आहे.</string>
     <string name="ManageGroupActivity_upgrade_this_group">हा गट श्रेणीसुधारित करा.</string>
@@ -1271,6 +1298,7 @@
         <item quantity="other">हटवा</item>
     </plurals>
 
+    <!-- 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 निवडले (%2$s)</item>
         <item quantity="other">%1$d निवडले (%2$s)</item>
@@ -1335,17 +1363,13 @@
     <string name="MessageRecord_left_group">आपण गट सोडला आहे.</string>
     <string name="MessageRecord_you_updated_group">आपण गट अद्ययावत केले.</string>
     <string name="MessageRecord_the_group_was_updated">गट अद्यतनित केला गेला.</string>
-    <!-- Update message shown when placing an outgoing 1:1 voice/audio call and it\'s answered by the other party -->
+    <!-- Update message shown when placing an outgoing 1:1 voice/audio call -->
     <string name="MessageRecord_outgoing_voice_call">बाहेर जाणारा व्हाईस कॉल</string>
-    <!-- Update message shown when placing an outgoing 1:1 video call and it\'s answered by the other party -->
+    <!-- Update message shown when placing an outgoing 1:1 video call -->
     <string name="MessageRecord_outgoing_video_call">बाहेर जाणारा व्हिडिओ कॉल</string>
-    <!-- Update message shown when placing an outgoing 1:1 voice/audio call and it\'s not answered by the other party -->
-    <string name="MessageRecord_unanswered_voice_call">अनुत्तरित व्हॉईस कॉल</string>
-    <!-- Update message shown when placing an outgoing 1:1 video call and it\'s not answered by the other party -->
-    <string name="MessageRecord_unanswered_video_call">अनुत्तरित व्हिडिओ कॉल</string>
-    <!-- Update message shown when receiving an incoming 1:1 voice/audio call and it\'s answered -->
+    <!-- Update message shown when receiving an incoming 1:1 voice/audio call and it\'s answered or ringing -->
     <string name="MessageRecord_incoming_voice_call">येणारा व्हाईस कॉल</string>
-    <!-- Update message shown when receiving an incoming 1:1 video call and answered -->
+    <!-- Update message shown when receiving an incoming 1:1 video call and answered or ringing -->
     <string name="MessageRecord_incoming_video_call">येणारा व्हिडिओ कॉल</string>
     <!-- Update message shown when receiving an incoming 1:1 voice/audio call and not answered -->
     <string name="MessageRecord_missed_voice_call">चूकवलेला व्हाईस कॉल</string>
@@ -1355,10 +1379,6 @@
     <string name="MessageRecord_missed_voice_call_notification_profile">अधिसूचना प्रोफाइल सुरू असताना मिस्ड व्हॉईस कॉल</string>
     <!-- Update message shown when receiving an incoming video call and declined due to notification profile -->
     <string name="MessageRecord_missed_video_call_notification_profile">अधिसूचना प्रोफाइल सुरू असताना व्हिडिओ कॉल मिस केला</string>
-    <!-- Update message shown when receiving an incoming 1:1 voice/audio call and explicitly declined -->
-    <string name="MessageRecord_you_declined_a_voice_call">आपण व्हाईस कॉलला नकार दिला</string>
-    <!-- Update message shown when receiving an incoming 1:1 video call and explicitly declined -->
-    <string name="MessageRecord_you_declined_a_video_call">आपण व्हिडिओ कॉलला नकार दिला</string>
     <!-- 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>
@@ -1567,28 +1587,53 @@
     <string name="MessageRecord_can_accept_payments">%1$s आता पेमेंट्स स्विकारु शकतात</string>
 
     <!-- Group Calling update messages -->
-    <string name="MessageRecord_s_started_a_group_call_s">%1$s ने गट कॉल चालू केला · %2$s</string>
-    <string name="MessageRecord_you_started_a_group_call_s">आपण गट कॉल · %1$s सुरू केला</string>
-    <string name="MessageRecord_s_is_in_the_group_call_s">%1$s गट कॉलमध्ये आहे · %2$s</string>
-    <string name="MessageRecord_you_are_in_the_group_call_s1">आपण गट कॉलमध्ये आहात · %1$s</string>
-    <string name="MessageRecord_s_and_s_are_in_the_group_call_s1">%1$s आणि %2$s गट कॉलमध्ये आहेत · %3$s</string>
-    <string name="MessageRecord_group_call_s">गट कॉल · %1$s</string>
-
-    <string name="MessageRecord_s_started_a_group_call">%1$s ने गट कॉल चालू केला</string>
-    <string name="MessageRecord_you_started_a_group_call">आपण गट कॉल चालू केला</string>
-    <string name="MessageRecord_s_is_in_the_group_call">%1$s गट कॉलमध्ये आहे</string>
-    <string name="MessageRecord_you_are_in_the_group_call">आपण गट कॉलमध्ये आहात</string>
-    <string name="MessageRecord_s_and_s_are_in_the_group_call">%1$s आणि %2$s गट कॉलमध्ये आहेत</string>
-    <string name="MessageRecord_group_call">गट कॉल</string>
+    <!-- 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 कॉल मध्ये आहे · %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">आपण कॉलमध्ये आहात · %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 आणि %2$s कॉलमध्ये आहेत · %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 कॉल मध्ये आहेत</string>
+    <!-- Chat log text for an ongoing group call only the local user has joined -->
+    <string name="MessageRecord_you_are_in_the_call">आपण कॉलमध्ये आहात</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 आणि %2$s कॉलमध्ये आहेत</string>
+    <!-- Chat log text for a group call that ended within the last 5 minutes -->
+    <string name="MessageRecord__the_video_call_has_ended">व्हिडिओ कॉल समाप्त झाला आहे</string>
+    <!-- Chat log text for a group call that ended within the last 5 minutes with a placeholder for formatted time -->
+    <string name="MessageRecord__the_video_call_has_ended_s">व्हिडिओ कॉल समाप्त झाला आहे · %1$s</string>
+    <!-- Chat log text for a group call that ended more than 5 minutes ago and was missed -->
+    <string name="MessageRecord__missed_video_call">चूकवलेला व्हिडिओ कॉल</string>
+    <!-- Chat log text for a group call that ended more than 5 minutes ago and was missed with a placeholder for formatted time -->
+    <string name="MessageRecord__missed_video_call_s">सुटलेला व्हिडिओ कॉल · %1$s</string>
+    <!-- Chat log text for a group call that ended that the local user did not start -->
+    <string name="MessageRecord__incoming_video_call">येणारा व्हिडिओ कॉल</string>
+    <!-- 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">येणारा व्हिडिओ कॉल · %1$s</string>
+    <!-- Chat log text for a group call that ended that the local user started -->
+    <string name="MessageRecord__outgoing_video_call">बाहेर जाणारा व्हिडिओ कॉल</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">जाणारा व्हिडिओ कॉल · %1$s</string>
+    <!-- Chat log text for an ongoing group call that the local user started -->
+    <string name="MessageRecord__you_started_a_video_call">आपण व्हिडिओ कॉल सुरु केला</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">आपण व्हिडिओ कॉल सुरु केला · %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 ने व्हिडिओ कॉल सुरु केला</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 ने व्हिडिओ कॉल सुरु केला · %2$s</string>
 
     <string name="MessageRecord_you">आपण</string>
 
-    <plurals name="MessageRecord_s_s_and_d_others_are_in_the_group_call_s">
+    <!-- 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, आणि %3$d इतर व्यक्ती गट कॉलमध्ये आहे · %4$s</item>
         <item quantity="other">%1$s, %2$s, आणि %3$d इतर व्यक्ती गट कॉलमध्ये आहेत · %4$s</item>
     </plurals>
 
-    <plurals name="MessageRecord_s_s_and_d_others_are_in_the_group_call">
+    <!-- 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, आणि %3$d इतर व्यक्ती गट कॉलमध्ये आहेत</item>
         <item quantity="other">%1$s, %2$s, आणि %3$d इतर व्यक्ती गट कॉलमध्ये आहेत</item>
     </plurals>
@@ -2063,6 +2108,7 @@
     <!-- Generic error when the app is unable to request an SMS code for an unknown reason. -->
     <string name="RegistrationActivity_unable_to_request_verification_code">सत्यापन कोडची विनंती करण्यास अक्षम. कृपया आपले नेटवर्क कनेक्शन तपासा आणि पुन्हा प्रयत्न करा.</string>
     <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">Molly Android - फोन नंबर स्वरूप</string>
     <!--    Small "toast" notification to the user confirming that they have requested a new code via voice call.-->
@@ -2207,7 +2253,7 @@
     <string name="SubmitDebugLogActivity_this_log_will_be_posted_publicly_online_for_contributors">अंशदात्यांना बघण्यासाठी हा लॉग सार्वजनिकरीत्या ऑनलाईन पोस्ट केला जाईल. आपण अपलोड करण्यापूर्वी त्यास तपासू शकता.</string>
 
     <!-- SupportEmailUtil -->
-  <!-- Removed by excludeNonTranslatables <string name="SupportEmailUtil_support_email" translatable="false">support@molly.im</string> -->
+  <!-- Removed by excludeNonTranslatables <string name="SupportEmailUtil_support_email" translatable="false">support@signal.org</string> -->
     <string name="SupportEmailUtil_filter">फिल्टर:</string>
     <string name="SupportEmailUtil_device_info">डिव्हाईस माहिती:</string>
     <string name="SupportEmailUtil_android_version">Android आवृत्ती:</string>
@@ -2709,6 +2755,8 @@
     <string name="ConversationUpdateItem_loading">लोड करत आहे</string>
     <string name="ConversationUpdateItem_learn_more">अधिक जाणा</string>
     <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_call_is_full">कॉल पूर्ण आहे</string>
     <string name="ConversationUpdateItem_invite_friends">मित्रांना आमंत्रित करा</string>
@@ -2773,6 +2821,7 @@
     <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>
 
     <!-- EnableCallNotificationSettingsDialog__call_notifications_checklist -->
@@ -3086,6 +3135,7 @@
 
     <string name="arrays__default">पूर्वनिर्धारित</string>
     <string name="arrays__high">उच्च</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">कमाल</string>
 
     <!-- plurals.xml -->
@@ -3357,7 +3407,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 वॉलेट यांच्या वापराच्या अटींना अधीन आहेत. आपणाला काही समस्यांचा सामना करावा लागू शकतो आणि आपण गमावू शकता अशी पेमेंट्स किंवा शिल्लकी पुर्नप्राप्त केल्या जाऊ शकणार नाहीत. </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">Molly मध्ये पेमेंट यापुढे उपलब्ध नाही. तरीही आपण फंड एक्सचेंजवर स्थानांतरित करू शकता पण आपण यापुढे पेमेंट पाठवू किंवा प्राप्त करू शकत नाही किंवा फंड जोडू शकत नाही.</string>
@@ -3406,6 +3456,14 @@
     <!-- Storage permission row description -->
     <string name="GrantPermissionsFragment__send_photos_videos_and_files">फोटो, व्हिडीओ आणि फाईल आपल्या डिव्हाइसवरून पाठवा.</string>
 
+    <!-- PermissionDeniedBottomSheet -->
+    <!-- Sheet describing step 1 on how to give permissions by opening settings -->
+    <string name="PermissionDeniedBottomSheet__1_tap_settings_below">1. Tap “Settings” below</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 Allow the permission</string>
+    <!-- Label for button at the bottom of the sheet which opens the system permission settings -->
+    <string name="PermissionDeniedBottomSheet__settings">Settings</string>
+
     <!-- PaymentsSecuritySetupFragment -->
     <!-- Toolbar title -->
     <string name="PaymentsSecuritySetupFragment__security_setup">सुरक्षितता सेटअप</string>
@@ -3446,6 +3504,7 @@
     <string name="PaymentsDetailsFragment__sent_to_s">%1$s ला पाठवले</string>
     <string name="PaymentsDetailsFragment__you_on_s_at_s">आपण %2$s वर %1$s</string>
     <string name="PaymentsDetailsFragment__s_on_s_at_s">%2$s वर %1$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__information">पेमेंट रक्कम आणि व्यवहाराची वेळ समाविष्ट असलेला व्यवहाराचा तपशील, हे MobileCoin लेजरचा एक भाग आहेत.</string>
@@ -3508,6 +3567,7 @@
     <string name="ConfirmPayment__confirm_payment">पेमेंटची पुष्टी करा</string>
     <string name="ConfirmPayment__network_fee">नेटवर्क फी</string>
     <string name="ConfirmPayment__estimated_s">अंदाजे %1$s</string>
+    <!-- Prefix to a name to indicate who a payment will be sent to -->
     <string name="ConfirmPayment__to">यांना</string>
     <string name="ConfirmPayment__total_amount">एकूण रक्कम</string>
     <string name="ConfirmPayment__balance_s">बॅलंस: %1$s</string>
@@ -3658,6 +3718,14 @@
     <string name="conversation_group_options__conversation">चॅट</string>
     <string name="conversation_group_options__broadcast">प्रक्षेपण</string>
 
+    <!-- DoubleTapEditEducationSheet -->
+    <!-- Displayed as the title of the education bottom sheet -->
+    <string name="DoubleTapEditEducationSheet__double_tap_edit_title">Double tap to edit</string>
+    <!-- Text on the sheet explaining how double tapping on a message will let them edit it -->
+    <string name="DoubleTapEditEducationSheet__quickly_tap_twice">Quickly tap twice on your messages to edit them. You can edit your messages up to 24hrs after they’ve been sent.</string>
+    <!-- Button label to dismiss sheet -->
+    <string name="DoubleTapEditEducationSheet__got_it">Got it</string>
+
     <!-- text_secure_normal -->
     <string name="text_secure_normal__menu_new_group">नवीन गट</string>
     <string name="text_secure_normal__menu_settings">सेटिंग</string>
@@ -4112,6 +4180,7 @@
     <string name="RecipientBottomSheet_copied_to_clipboard">क्लिपबोर्ड वर कॉपी केले</string>
 
     <string name="GroupRecipientListItem_admin">प्रशासक</string>
+    <!-- Button text to approve a user that has requested to join a group -->
     <string name="GroupRecipientListItem_approve_description">स्वीकार करा</string>
     <string name="GroupRecipientListItem_deny_description">नकार द्या</string>
 
@@ -4139,6 +4208,7 @@
 
     <!-- VoiceNoteMediaDescriptionCompatFactory -->
     <string name="VoiceNoteMediaItemFactory__voice_message">व्हॉईस संदेश · %1$s</string>
+    <!-- This is a title in a banner describing the conversation sender to receiver placeholders of the currently playing voice memo. -->
     <string name="VoiceNoteMediaItemFactory__s_to_s">%1$s ते %2$s</string>
 
     <!-- StorageUtil -->
@@ -4152,8 +4222,16 @@
     <string name="ReviewCardDialogFragment__review_members">सदस्यांचे पुनरावलोकन करा</string>
     <!-- Title of a screen where the user will be prompted to review a message request matching the name of someone they already know -->
     <string name="ReviewCardDialogFragment__review_request">विनंतीचे पुनरावलोकन करा</string>
-    <string name="ReviewCardDialogFragment__d_group_members_have_the_same_name">%1$d गट सदस्यांचे नाव सारखे आहेत, खाली सदस्यांचे पुनरावलोकन करा आणि काय करायचे ते निवडा.</string>
-    <string name="ReviewCardDialogFragment__if_youre_not_sure">विनंती कोणाकडून आहे याची आपल्याला खात्री नसल्यास, खाली असलेल्या संपर्कांचे पुनरावलोकन करा आणि कारवाई करा.</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="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 -->
+    <plurals name="ReviewCardDialogFragment__if_youre_not_sure">
+        <item quantity="one">If you\'re not sure who the request is from, review the contact below and take action.</item>
+        <item quantity="other">If you\'re not sure who the request is from, review the contacts below and take action.</item>
+    </plurals>
     <string name="ReviewCardDialogFragment__no_other_groups_in_common">इतर कुठलेही गट समाईक नाहीत</string>
     <string name="ReviewCardDialogFragment__no_groups_in_common">कुठलेही गट समाईक नाहीत.</string>
     <plurals name="ReviewCardDialogFragment__d_other_groups_in_common">
@@ -4184,11 +4262,20 @@
     <string name="CallParticipantsListUpdatePopupWindow__s_joined">%1$s सामील झाले</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_and_s_joined">%1$s आणि %2$s सामील झाले</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_s_and_s_joined">%1$s, %2$s आणि %3$s सामील झाले</string>
-    <string name="CallParticipantsListUpdatePopupWindow__s_s_and_d_others_joined">%1$s, %2$s आणि %3$d इतर व्यक्ती सामील झाले</string>
+    <!-- Toast message shown in group call when 3 or more people join -->
+    <plurals name="CallParticipantsListUpdatePopupWindow__s_s_and_d_others_joined">
+        <item quantity="one">%1$s, %2$s and %3$d other joined</item>
+        <item quantity="other">%1$s, %2$s and %3$d others joined</item>
+    </plurals>
+    <!-- Toast/popup text shown when someone leaves a group call -->
     <string name="CallParticipantsListUpdatePopupWindow__s_left">%1$s सोडून गेले</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_and_s_left">%1$s आणि %2$s सोडून गेले</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_s_and_s_left">%1$s, %2$s आणि %3$s सोडून गेले</string>
-    <string name="CallParticipantsListUpdatePopupWindow__s_s_and_d_others_left">%1$s, %2$s आणि %3$d इतर व्यक्ती सोडून गेले</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 and %3$d other left</item>
+        <item quantity="other">%1$s, %2$s and %3$d others left</item>
+    </plurals>
 
     <string name="CallParticipant__you">आपण</string>
     <string name="CallParticipant__you_on_another_device">आपण (दुसऱ्या डिव्हाईसवर)</string>
@@ -4558,10 +4645,15 @@
 
     <!-- PrivacySettingsFragment -->
     <string name="PrivacySettingsFragment__blocked">अवरोधित केले</string>
-    <string name="PrivacySettingsFragment__d_contacts">%1$d संपर्क</string>
+    <!-- Settings label that shows the number blocked contacts -->
+    <plurals name="PrivacySettingsFragment__d_contacts">
+        <item quantity="one">%1$d contact</item>
+        <item quantity="other">%1$d contacts</item>
+    </plurals>
     <string name="PrivacySettingsFragment__messaging">संदेशन</string>
     <string name="PrivacySettingsFragment__disappearing_messages">हरवणारे संदेश</string>
     <string name="PrivacySettingsFragment__app_security">अॅप सुरक्षा</string>
+    <!-- This refers to the multi-tasking overview (recent apps) from the Android operating system.-->
     <string name="PrivacySettingsFragment__block_screenshots_in_the_recents_list_and_inside_the_app">अलीकडील यादीमध्ये आणि अ‍ॅपच्या आत स्क्रीनशॉट अवरोधित करा</string>
     <string name="PrivacySettingsFragment__signal_message_and_calls">Signal संदेश आणि कॉल, कॉल नेहमी रिले करा आणि सील केलेला प्रेषक</string>
     <string name="PrivacySettingsFragment__default_timer_for_new_changes">नवीन चॅट्ससाठी पूर्वनिर्धारित टायमर</string>
@@ -4618,11 +4710,14 @@
     <string name="DataAndStorageSettingsFragment__media_quality">मिडिया दर्जा</string>
     <string name="DataAndStorageSettingsFragment__sent_media_quality">मिडिया पाठवण्याचा दर्जा</string>
     <string name="DataAndStorageSettingsFragment__sending_high_quality_media_will_use_more_data">मिडिया पाठवताना उच्च दर्जा हा पर्याय निवडल्यास अधिक डेटा वापरला जाईल.</string>
+    <!-- Setting option that can be selected to default media to be sent as high quality by default -->
     <string name="DataAndStorageSettingsFragment__high">उच्च</string>
+    <!-- Setting option that can be selected to default media to be sent as standard quality by default -->
     <string name="DataAndStorageSettingsFragment__standard">मानक</string>
     <string name="DataAndStorageSettingsFragment__calls">कॉल</string>
 
     <!-- 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__use_custom_colors">कस्टम रंग वापरा</string>
     <string name="ChatColorSelectionFragment__chat_color">चॅट रंग</string>
@@ -4834,6 +4929,7 @@
     <string name="AvatarPickerFragment__take_a_picture">फोटो घ्या</string>
     <string name="AvatarPickerFragment__choose_a_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>
     <string name="AvatarPickerFragment__clear_avatar">अवतार साफ करा</string>
@@ -4894,7 +4990,7 @@
     <string name="MediaReviewFragment__add_a_message">संदेश जोडा</string>
     <string name="MediaReviewFragment__add_a_reply">प्रत्युत्तर जोडा</string>
     <string name="MediaReviewFragment__send_to">यांना पाठवा</string>
-    <string name="MediaReviewFragment__view_once_message">एकदा-बघा संदेश</string>
+    <string name="MediaReviewFragment__view_once_message">एकदा मिडिया पहा</string>
     <string name="MediaReviewFragment__one_or_more_items_were_too_large">एक किंवा अधिक आयटम खूप मोठे होते</string>
     <string name="MediaReviewFragment__one_or_more_items_were_invalid">एक किंवा अधिक आयटम अवैध होते</string>
     <string name="MediaReviewFragment__too_many_items_selected">जास्त आयटम निवडले</string>
@@ -5487,7 +5583,7 @@
     <string name="StoryViewerFragment__s_s">%1$s %2$s</string>
     <!-- Displayed when viewing a post you sent -->
     <string name="StoryViewerPageFragment__you">आपण</string>
-    <!-- Displayed when viewing a post displayed to a group -->
+    <!-- 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 -->
     <string name="StoryViewerPageFragment__reply">प्रत्युत्तर द्या</string>
@@ -6704,5 +6800,26 @@
     <!-- Content description for opening the note editor -->
     <string name="ViewNoteSheet__edit_note">टीप संपादित करा</string>
 
+    <!-- BackupProgressService -->
+    <!-- Notification title shown while backup restore job is running -->
+    <string name="BackupProgressService_title">बॅकअप पुनर्स्थापित करत आहे…</string>
+    <!-- Notification title shown while downloading backup restore data -->
+    <string name="BackupProgressService_title_downloading">बॅकअप डेटा डाऊनलोड करत आहे…</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>
+    <!-- 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 -->
+    <string name="BackupsTypeSettingsFragment__google_pay">Google Pay</string>
+    <!-- Displayed as the user\'s payment method as a label in a preference row -->
+    <string name="BackupsTypeSettingsFragment__bank_transfer">Bank transfer</string>
+    <!-- Displayed as the user\'s payment method as a label in a preference row -->
+    <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>
+
+
     <!-- 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 49b7f9a54d..d96b6ae9b4 100644
--- a/app/src/main/res/values-ms/strings.xml
+++ b/app/src/main/res/values-ms/strings.xml
@@ -1,6 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- smartling.instruction_comments_enabled = on -->
-<resources>
+<?xml version="1.0" encoding="UTF-8"?><!-- 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> -->
@@ -89,6 +87,16 @@
     <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">Allow access to your location</string>
+    <!-- Dialog description that will explain the steps needed to give location permission -->
+    <string name="AttachmentManager_signal_to_send_location">To send your location:</string>
+    <!-- Alert dialog description asking for location permission -->
+    <string name="AttachmentManager_signal_allow_signal_access_location">Allow Molly access to send your location.</string>
+    <!-- Toast text explaining Signal\'s need for location access -->
+    <string name="AttachmentManager_signal_needs_location_access">Molly needs location access to send your location.</string>
+
     <!-- Alert dialog title to show the recipient has not activated payments -->
     <string name="AttachmentManager__not_activated_payments">%1$s belum mengaktifkan Pembayaran </string>
     <!-- Alert dialog description to send the recipient a request to activate payments -->
@@ -240,7 +248,7 @@
     <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>
@@ -383,8 +391,16 @@
     <string name="ConversationActivity_your_request_to_join_has_been_sent_to_the_group_admin">Permintaan anda untuk join telah dihantar kepada admin group. Anda akan diberitahu sekiranya mereka telah mengambil tindakan.</string>
     <string name="ConversationActivity_cancel_request">Batalkan Permintaan</string>
 
-    <string name="ConversationActivity_to_send_audio_messages_allow_signal_access_to_your_microphone">Untuk menghantar mesej audio, benarkan Molly untuk mengakses mikrofon anda.</string>
+    <!-- Dialog title asking users for microphone permission -->
+    <string name="ConversationActivity_allow_access_microphone">Allow access to your microphone</string>
+    <!-- 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>
+    <!-- Toast text explaining Signal\'s need for microphone access -->
+    <string name="ConversationActivity_signal_needs_microphone_access_voice_message">Molly needs microphone access to record a voice message.</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">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>
@@ -408,10 +424,17 @@
     <string name="ConversationActivity_you_will_leave_this_group_and_it_will_be_deleted_from_all_of_your_devices">Anda akan meninggalkan kumpulan ini, dan ia akan dipadam daripada semua peranti anda.</string>
     <string name="ConversationActivity_delete">Padam</string>
     <string name="ConversationActivity_delete_and_leave">Padam dan tinggalkan</string>
-    <string name="ConversationActivity__to_call_s_signal_needs_access_to_your_microphone">Untuk memanggil %1$s, Molly memerlukan akses kepada mikrofon anda</string>
+
+    <!-- Dialog description that will explain the steps needed to give microphone permissions for a voice call -->
+    <string name="ConversationActivity__to_start_call">To start a 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">To start a call, allow Molly access to your microphone.</string>
+    <!-- Toast text explaining Signal\'s need for microphone access for a voice call -->
+    <string name="ConversationActivity_signal_needs_microphone_access_voice_call">Molly needs microphone access to start a call.</string>
 
 
     <string name="ConversationActivity_join">Sertai</string>
+    <!-- Button text for an active group call but the call is currently full and unjoinable -->
     <string name="ConversationActivity_full">Penuh</string>
 
     <string name="ConversationActivity_error_sending_media">Ralat menghantar media</string>
@@ -597,6 +620,7 @@
     <string name="ConversationListFragment_unarchive">Nyaharkib</string>
     <string name="ConversationListFragment_delete">Padam</string>
     <string name="ConversationListFragment_select_all">Pilih semua</string>
+    <!-- Screen title shown when selecting multiple items from a list like conversation threads or call logs. -->
     <plurals name="ConversationListFragment_s_selected">
         <item quantity="other">%1$d dipilih</item>
     </plurals>
@@ -845,6 +869,7 @@
     <plurals name="GroupManagement_invitation_sent">
         <item quantity="other">%1$d jemputan dihantar</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">\"%1$s\" tidak dapat ditambah secara automatik ke kumpulan ini oleh anda.\n\nMereka telah dijemput untuk menyertai kumpulan dan tidak akan nampak sebarang mesej kumpulan sehingga mereka menerimanya.</string>
     <string name="GroupManagement_invite_multiple_users">Pengguna ini tidak dapat ditambah secara automatik ke kumpulan ini oleh anda.\n\nMereka telah dijemput untuk menyertai kumpulan ini dan tidak akan nampak sebarang mesej kumpulan sehingga mereka menerimanya.</string>
 
@@ -1009,7 +1034,9 @@
 
     <string name="ManageGroupActivity_edit_name_and_picture">Edit nama dan gambar</string>
     <string name="ManageGroupActivity_legacy_group">Kumpulan Legasi</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">Ini Kumpulan Legasi. Ciri-ciri seperti pentadbir kumpulan hanya tersedia untuk Kumpulan Baru,</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">Ini Kumpulan Legasi. Untuk mengakses ciri-ciri baru seperti @sebutan dan pentadbir,</string>
     <string name="ManageGroupActivity_legacy_group_too_large">Kumpulan Legasi tidak boleh dinaik taraf kepada Kumpulan Baru kerana ia terlalu besar. Saiz maksimum kumpulan ialah %1$d.</string>
     <string name="ManageGroupActivity_upgrade_this_group">naik taraf kumpulan ini.</string>
@@ -1227,6 +1254,7 @@
         <item quantity="other">Padam</item>
     </plurals>
 
+    <!-- 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="other">%1$d dipilih (%2$s)</item>
     </plurals>
@@ -1290,17 +1318,13 @@
     <string name="MessageRecord_left_group">Anda telah meninggalkan kumpulan.</string>
     <string name="MessageRecord_you_updated_group">Anda telah mengemas kini kumpulan.</string>
     <string name="MessageRecord_the_group_was_updated">Kumpulan telah dikemas kini.</string>
-    <!-- Update message shown when placing an outgoing 1:1 voice/audio call and it\'s answered by the other party -->
+    <!-- Update message shown when placing an outgoing 1:1 voice/audio call -->
     <string name="MessageRecord_outgoing_voice_call">Panggilan suara keluar</string>
-    <!-- Update message shown when placing an outgoing 1:1 video call and it\'s answered by the other party -->
+    <!-- Update message shown when placing an outgoing 1:1 video call -->
     <string name="MessageRecord_outgoing_video_call">Panggilan video keluar</string>
-    <!-- Update message shown when placing an outgoing 1:1 voice/audio call and it\'s not answered by the other party -->
-    <string name="MessageRecord_unanswered_voice_call">Panggilan suara tidak dijawab</string>
-    <!-- Update message shown when placing an outgoing 1:1 video call and it\'s not answered by the other party -->
-    <string name="MessageRecord_unanswered_video_call">Panggilan video tidak dijawab</string>
-    <!-- Update message shown when receiving an incoming 1:1 voice/audio call and it\'s answered -->
+    <!-- Update message shown when receiving an incoming 1:1 voice/audio call and it\'s answered or ringing -->
     <string name="MessageRecord_incoming_voice_call">Panggilan suara masuk</string>
-    <!-- Update message shown when receiving an incoming 1:1 video call and answered -->
+    <!-- Update message shown when receiving an incoming 1:1 video call and answered or ringing -->
     <string name="MessageRecord_incoming_video_call">Panggilan video masuk</string>
     <!-- Update message shown when receiving an incoming 1:1 voice/audio call and not answered -->
     <string name="MessageRecord_missed_voice_call">Panggilan suara terlepas</string>
@@ -1310,10 +1334,6 @@
     <string name="MessageRecord_missed_voice_call_notification_profile">Panggilan suara terlepas semasa profil pemberitahuan dihidupkan</string>
     <!-- Update message shown when receiving an incoming video call and declined due to notification profile -->
     <string name="MessageRecord_missed_video_call_notification_profile">Panggilan video terlepas semasa profil pemberitahuan dihidupkan</string>
-    <!-- Update message shown when receiving an incoming 1:1 voice/audio call and explicitly declined -->
-    <string name="MessageRecord_you_declined_a_voice_call">Anda menolak panggilan suara</string>
-    <!-- Update message shown when receiving an incoming 1:1 video call and explicitly declined -->
-    <string name="MessageRecord_you_declined_a_video_call">Anda menolak panggilan video</string>
     <!-- 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 telah mengemas kini kumpulan.</string>
@@ -1514,27 +1534,52 @@
     <string name="MessageRecord_can_accept_payments">%1$s kini boleh menerima Pembayaran</string>
 
     <!-- Group Calling update messages -->
-    <string name="MessageRecord_s_started_a_group_call_s">%1$s telah memulakan panggilan kumpulan · %2$s</string>
-    <string name="MessageRecord_you_started_a_group_call_s">Anda telah memulakan panggilan kumpulan · %1$s</string>
-    <string name="MessageRecord_s_is_in_the_group_call_s">%1$s berada dalam panggilan kumpulan · %2$s</string>
-    <string name="MessageRecord_you_are_in_the_group_call_s1">Anda berada dalam panggilan kumpulan · %1$s</string>
-    <string name="MessageRecord_s_and_s_are_in_the_group_call_s1">%1$s dan %2$s berada dalam panggilan kumpulan · %3$s</string>
-    <string name="MessageRecord_group_call_s">Panggilan kumpulan · %1$s</string>
-
-    <string name="MessageRecord_s_started_a_group_call">%1$s telah memulakan panggilan kumpulan</string>
-    <string name="MessageRecord_you_started_a_group_call">Anda telah memulakan panggilan kumpulan</string>
-    <string name="MessageRecord_s_is_in_the_group_call">%1$s berada dalam panggilan kumpulan</string>
-    <string name="MessageRecord_you_are_in_the_group_call">Anda berada dalam panggilan kumpulan</string>
-    <string name="MessageRecord_s_and_s_are_in_the_group_call">%1$s dan %2$s berada dalam panggilan kumpulan</string>
-    <string name="MessageRecord_group_call">Panggilan kumpulan</string>
+    <!-- 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 dalam panggilan · %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">Anda dalam panggilan · %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 dan %2$s sedang dalam panggilan · %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 dalam panggilan</string>
+    <!-- Chat log text for an ongoing group call only the local user has joined -->
+    <string name="MessageRecord_you_are_in_the_call">Anda dalam panggilan</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 dan %2$s sedang dalam panggilan ini</string>
+    <!-- Chat log text for a group call that ended within the last 5 minutes -->
+    <string name="MessageRecord__the_video_call_has_ended">Panggilan video telah tamat</string>
+    <!-- Chat log text for a group call that ended within the last 5 minutes with a placeholder for formatted time -->
+    <string name="MessageRecord__the_video_call_has_ended_s">Panggilan video telah tamat · %1$s</string>
+    <!-- Chat log text for a group call that ended more than 5 minutes ago and was missed -->
+    <string name="MessageRecord__missed_video_call">Panggilan video terlepas</string>
+    <!-- Chat log text for a group call that ended more than 5 minutes ago and was missed with a placeholder for formatted time -->
+    <string name="MessageRecord__missed_video_call_s">Panggilan video tidak dijawab · %1$s</string>
+    <!-- Chat log text for a group call that ended that the local user did not start -->
+    <string name="MessageRecord__incoming_video_call">Panggilan video masuk</string>
+    <!-- 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">Panggilan video masuk · %1$s</string>
+    <!-- Chat log text for a group call that ended that the local user started -->
+    <string name="MessageRecord__outgoing_video_call">Panggilan video keluar</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">Panggilan video keluar · %1$s</string>
+    <!-- Chat log text for an ongoing group call that the local user started -->
+    <string name="MessageRecord__you_started_a_video_call">Anda memulakan panggilan video</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">Anda memulakan panggilan video · %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 memulakan panggilan video</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 memulakan panggilan video · %2$s</string>
 
     <string name="MessageRecord_you">Anda</string>
 
-    <plurals name="MessageRecord_s_s_and_d_others_are_in_the_group_call_s">
+    <!-- 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="other">%1$s, %2$s, dan %3$d orang yang lain berada dalam panggilan kumpulan · %4$s</item>
     </plurals>
 
-    <plurals name="MessageRecord_s_s_and_d_others_are_in_the_group_call">
+    <!-- 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="other">%1$s, %2$s, dan %3$d orang yang lain berada dalam panggilan kumpulan</item>
     </plurals>
 
@@ -1984,6 +2029,7 @@
     <!-- Generic error when the app is unable to request an SMS code for an unknown reason. -->
     <string name="RegistrationActivity_unable_to_request_verification_code">Tidak dapat meminta kod pengesahan. Sila periksa sambungan rangkaian anda dan cuba lagi.</string>
     <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">Molly Android - Format Nombor Telefon</string>
     <!--    Small "toast" notification to the user confirming that they have requested a new code via voice call.-->
@@ -2127,7 +2173,7 @@
     <string name="SubmitDebugLogActivity_this_log_will_be_posted_publicly_online_for_contributors">Log ini akan disiarkan secara terbuka dalam talian untuk dilihat oleh penyumbang. Anda boleh memeriksanya sebelum memuat naik.</string>
 
     <!-- SupportEmailUtil -->
-  <!-- Removed by excludeNonTranslatables <string name="SupportEmailUtil_support_email" translatable="false">support@molly.im</string> -->
+  <!-- Removed by excludeNonTranslatables <string name="SupportEmailUtil_support_email" translatable="false">support@signal.org</string> -->
     <string name="SupportEmailUtil_filter">Tapis:</string>
     <string name="SupportEmailUtil_device_info">Maklumat peranti:</string>
     <string name="SupportEmailUtil_android_version">Versi Android:</string>
@@ -2622,6 +2668,8 @@
     <string name="ConversationUpdateItem_loading">Memuatkan</string>
     <string name="ConversationUpdateItem_learn_more">Ketahui lebih lanjut</string>
     <string name="ConversationUpdateItem_join_call">Sertai panggilan</string>
+    <!-- Action button label for starting a new call in the current conversation -->
+    <string name="ConversationUpdateItem_call_back">Panggilan Balik</string>
     <string name="ConversationUpdateItem_return_to_call">Kembali ke panggilan</string>
     <string name="ConversationUpdateItem_call_is_full">Panggilan penuh</string>
     <string name="ConversationUpdateItem_invite_friends">Jemput rakan</string>
@@ -2686,6 +2734,7 @@
     <string name="safety_number_change_dialog__leave_call">Tinggalkan panggilan</string>
     <string name="safety_number_change_dialog__the_following_people_may_have_reinstalled_or_changed_devices">Orang yang berikut mungkin telah memasang semula atau telah menukar peranti. Sahkan nombor keselamatan anda dengan mereka untuk memastikan privasi.</string>
     <string name="safety_number_change_dialog__view">Lihat</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">Disahkan sebelum ini</string>
 
     <!-- EnableCallNotificationSettingsDialog__call_notifications_checklist -->
@@ -2992,6 +3041,7 @@
 
     <string name="arrays__default">Lalai</string>
     <string name="arrays__high">Tinggi</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">Maks</string>
 
     <!-- plurals.xml -->
@@ -3260,7 +3310,7 @@
     <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 Molly tidak lagi tersedia. Anda masih boleh memindah dana ke pertukaran tetapi anda tidak lagi dapat menghantar dan menerima pembayaran atau menambah dana.</string>
@@ -3309,6 +3359,14 @@
     <!-- Storage permission row description -->
     <string name="GrantPermissionsFragment__send_photos_videos_and_files">Hantar foto, video dan fail daripada peranti anda.</string>
 
+    <!-- PermissionDeniedBottomSheet -->
+    <!-- Sheet describing step 1 on how to give permissions by opening settings -->
+    <string name="PermissionDeniedBottomSheet__1_tap_settings_below">1. Tap “Settings” below</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 Allow the permission</string>
+    <!-- Label for button at the bottom of the sheet which opens the system permission settings -->
+    <string name="PermissionDeniedBottomSheet__settings">Settings</string>
+
     <!-- PaymentsSecuritySetupFragment -->
     <!-- Toolbar title -->
     <string name="PaymentsSecuritySetupFragment__security_setup">Persediaan keselamatan</string>
@@ -3349,6 +3407,7 @@
     <string name="PaymentsDetailsFragment__sent_to_s">Dihantar kepada %1$s</string>
     <string name="PaymentsDetailsFragment__you_on_s_at_s">Anda pada %1$s pada %2$s</string>
     <string name="PaymentsDetailsFragment__s_on_s_at_s">%1$s pada %2$s pada %3$s</string>
+    <!-- Prefix to a name to indicate who a payment was sent to -->
     <string name="PaymentsDetailsFragment__to">Kepada</string>
     <string name="PaymentsDetailsFragment__from">Daripada</string>
     <string name="PaymentsDetailsFragment__information">Butiran transaksi termasuk jumlah pembayaran dan masa transaksi merupakan sebahagian daripada MobileCoin Ledger.</string>
@@ -3411,6 +3470,7 @@
     <string name="ConfirmPayment__confirm_payment">Sahkan pembayaran</string>
     <string name="ConfirmPayment__network_fee">Bayaran rangkaian</string>
     <string name="ConfirmPayment__estimated_s">Anggaran %1$s</string>
+    <!-- Prefix to a name to indicate who a payment will be sent to -->
     <string name="ConfirmPayment__to">Kepada</string>
     <string name="ConfirmPayment__total_amount">Jumlah keseluruhan</string>
     <string name="ConfirmPayment__balance_s">Baki: %1$s</string>
@@ -3559,6 +3619,14 @@
     <string name="conversation_group_options__conversation">Sembang</string>
     <string name="conversation_group_options__broadcast">Siaran</string>
 
+    <!-- DoubleTapEditEducationSheet -->
+    <!-- Displayed as the title of the education bottom sheet -->
+    <string name="DoubleTapEditEducationSheet__double_tap_edit_title">Double tap to edit</string>
+    <!-- Text on the sheet explaining how double tapping on a message will let them edit it -->
+    <string name="DoubleTapEditEducationSheet__quickly_tap_twice">Quickly tap twice on your messages to edit them. You can edit your messages up to 24hrs after they’ve been sent.</string>
+    <!-- Button label to dismiss sheet -->
+    <string name="DoubleTapEditEducationSheet__got_it">Got it</string>
+
     <!-- text_secure_normal -->
     <string name="text_secure_normal__menu_new_group">Kumpulan baru</string>
     <string name="text_secure_normal__menu_settings">Tetapan</string>
@@ -4006,6 +4074,7 @@
     <string name="RecipientBottomSheet_copied_to_clipboard">Disalin ke papan klip</string>
 
     <string name="GroupRecipientListItem_admin">Pentadbir</string>
+    <!-- Button text to approve a user that has requested to join a group -->
     <string name="GroupRecipientListItem_approve_description">Luluskan</string>
     <string name="GroupRecipientListItem_deny_description">Tolak</string>
 
@@ -4033,6 +4102,7 @@
 
     <!-- VoiceNoteMediaDescriptionCompatFactory -->
     <string name="VoiceNoteMediaItemFactory__voice_message">Mesej suara · %1$s</string>
+    <!-- This is a title in a banner describing the conversation sender to receiver placeholders of the currently playing voice memo. -->
     <string name="VoiceNoteMediaItemFactory__s_to_s">%1$s kepada %2$s</string>
 
     <!-- StorageUtil -->
@@ -4046,8 +4116,14 @@
     <string name="ReviewCardDialogFragment__review_members">Semak ahli</string>
     <!-- Title of a screen where the user will be prompted to review a message request matching the name of someone they already know -->
     <string name="ReviewCardDialogFragment__review_request">Semak permintaan</string>
-    <string name="ReviewCardDialogFragment__d_group_members_have_the_same_name">%1$d ahli kumpulan mempunyai nama yang sama, semak ahli di bawah dan pilih untuk mengambil tindakan.</string>
-    <string name="ReviewCardDialogFragment__if_youre_not_sure">Jika anda tidak pasti tentang penghantar permintaan, semak kenalan di bawah dan ambil tindakan.</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="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 -->
+    <plurals name="ReviewCardDialogFragment__if_youre_not_sure">
+        <item quantity="other">If you\'re not sure who the request is from, review the contacts below and take action.</item>
+    </plurals>
     <string name="ReviewCardDialogFragment__no_other_groups_in_common">Tidak ada kumpulan lain yang sama.</string>
     <string name="ReviewCardDialogFragment__no_groups_in_common">Tidak ada kumpulan yang sama.</string>
     <plurals name="ReviewCardDialogFragment__d_other_groups_in_common">
@@ -4076,11 +4152,18 @@
     <string name="CallParticipantsListUpdatePopupWindow__s_joined">%1$s telah menyertai kumpulan</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_and_s_joined">%1$s dan %2$s telah menyertai kumpulan</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_s_and_s_joined">%1$s, %2$s dan %3$s telah menyertai kumpulan</string>
-    <string name="CallParticipantsListUpdatePopupWindow__s_s_and_d_others_joined">%1$s, %2$s dan %3$d orang yang lain telah menyertai kumpulan</string>
+    <!-- Toast message shown in group call when 3 or more people join -->
+    <plurals name="CallParticipantsListUpdatePopupWindow__s_s_and_d_others_joined">
+        <item quantity="other">%1$s, %2$s and %3$d others joined</item>
+    </plurals>
+    <!-- Toast/popup text shown when someone leaves a group call -->
     <string name="CallParticipantsListUpdatePopupWindow__s_left">%1$s telah meninggalkan kumpulan</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_and_s_left">%1$s dan %2$s telah meninggalkan kumpulan</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_s_and_s_left">%1$s, %2$s dan %3$s telah meninggalkan kumpulan</string>
-    <string name="CallParticipantsListUpdatePopupWindow__s_s_and_d_others_left">%1$s, %2$s dan %3$d orang yang lain telah meninggalkan kumpulan</string>
+    <!-- Toast message shown in group call when 3 or more people leave -->
+    <plurals name="CallParticipantsListUpdatePopupWindow__s_s_and_d_others_left">
+        <item quantity="other">%1$s, %2$s and %3$d others left</item>
+    </plurals>
 
     <string name="CallParticipant__you">Anda</string>
     <string name="CallParticipant__you_on_another_device">Anda (pada peranti lain)</string>
@@ -4448,10 +4531,14 @@
 
     <!-- PrivacySettingsFragment -->
     <string name="PrivacySettingsFragment__blocked">Disekat</string>
-    <string name="PrivacySettingsFragment__d_contacts">%1$d kenalan</string>
+    <!-- Settings label that shows the number blocked contacts -->
+    <plurals name="PrivacySettingsFragment__d_contacts">
+        <item quantity="other">%1$d contacts</item>
+    </plurals>
     <string name="PrivacySettingsFragment__messaging">Pemesejan</string>
     <string name="PrivacySettingsFragment__disappearing_messages">Mesej hilang</string>
     <string name="PrivacySettingsFragment__app_security">Keselamatan aplikasi</string>
+    <!-- This refers to the multi-tasking overview (recent apps) from the Android operating system.-->
     <string name="PrivacySettingsFragment__block_screenshots_in_the_recents_list_and_inside_the_app">Sekat tangkapan skrin pada senarai terbaru dan di dalam aplikasi</string>
     <string name="PrivacySettingsFragment__signal_message_and_calls">Mesej dan panggilan Signal, selalu menghantar panggilan, dan pengirim terlindung</string>
     <string name="PrivacySettingsFragment__default_timer_for_new_changes">Pemasa lalai untuk sembang baharu</string>
@@ -4508,11 +4595,14 @@
     <string name="DataAndStorageSettingsFragment__media_quality">Kualiti media</string>
     <string name="DataAndStorageSettingsFragment__sent_media_quality">Kualiti media yang dihantar</string>
     <string name="DataAndStorageSettingsFragment__sending_high_quality_media_will_use_more_data">Menghantar media berkualiti tinggi akan menggunakan lebih banyak data.</string>
+    <!-- Setting option that can be selected to default media to be sent as high quality by default -->
     <string name="DataAndStorageSettingsFragment__high">Tinggi</string>
+    <!-- Setting option that can be selected to default media to be sent as standard quality by default -->
     <string name="DataAndStorageSettingsFragment__standard">Standard</string>
     <string name="DataAndStorageSettingsFragment__calls">Panggilan</string>
 
     <!-- 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__use_custom_colors">Gunakan warna tersuai</string>
     <string name="ChatColorSelectionFragment__chat_color">Warna sembang</string>
@@ -4721,6 +4811,7 @@
     <string name="AvatarPickerFragment__take_a_picture">Ambil gambar</string>
     <string name="AvatarPickerFragment__choose_a_photo">Pilih gambar</string>
     <string name="AvatarPickerFragment__photo">Foto</string>
+    <!-- Button label during avatar selection/creation that when tapped lets you generate an avatar from typed in text. -->
     <string name="AvatarPickerFragment__text">Teks</string>
     <string name="AvatarPickerFragment__save">Simpan</string>
     <string name="AvatarPickerFragment__clear_avatar">Kosongkan avatar</string>
@@ -4777,7 +4868,7 @@
     <string name="MediaReviewFragment__add_a_message">Tambah mesej</string>
     <string name="MediaReviewFragment__add_a_reply">Tambah balasan</string>
     <string name="MediaReviewFragment__send_to">Hantar kepada</string>
-    <string name="MediaReviewFragment__view_once_message">Lihat mesej sekali buka</string>
+    <string name="MediaReviewFragment__view_once_message">Media lihat sekali</string>
     <string name="MediaReviewFragment__one_or_more_items_were_too_large">Saiz satu atau lebih item terlalu besar</string>
     <string name="MediaReviewFragment__one_or_more_items_were_invalid">Satu atau lebih item tidak sah</string>
     <string name="MediaReviewFragment__too_many_items_selected">Terlalu banyak item dipilih</string>
@@ -5365,7 +5456,7 @@
     <string name="StoryViewerFragment__s_s">%1$s%2$s</string>
     <!-- Displayed when viewing a post you sent -->
     <string name="StoryViewerPageFragment__you">Anda</string>
-    <!-- Displayed when viewing a post displayed to a group -->
+    <!-- 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 kepada %2$s</string>
     <!-- Displayed when viewing a post from another user with no replies -->
     <string name="StoryViewerPageFragment__reply">Balas</string>
@@ -6558,5 +6649,26 @@
     <!-- Content description for opening the note editor -->
     <string name="ViewNoteSheet__edit_note">Edit nota</string>
 
+    <!-- BackupProgressService -->
+    <!-- Notification title shown while backup restore job is running -->
+    <string name="BackupProgressService_title">Memulihkan sandaran…</string>
+    <!-- Notification title shown while downloading backup restore data -->
+    <string name="BackupProgressService_title_downloading">Memuat turun data sandaran…</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>
+    <!-- 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 -->
+    <string name="BackupsTypeSettingsFragment__google_pay">Google Pay</string>
+    <!-- Displayed as the user\'s payment method as a label in a preference row -->
+    <string name="BackupsTypeSettingsFragment__bank_transfer">Bank transfer</string>
+    <!-- Displayed as the user\'s payment method as a label in a preference row -->
+    <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>
+
+
     <!-- 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 4fc32d6a65..f2a69c5f72 100644
--- a/app/src/main/res/values-my/strings.xml
+++ b/app/src/main/res/values-my/strings.xml
@@ -1,6 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- smartling.instruction_comments_enabled = on -->
-<resources>
+<?xml version="1.0" encoding="UTF-8"?><!-- 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> -->
@@ -89,6 +87,16 @@
     <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">Allow access to your location</string>
+    <!-- Dialog description that will explain the steps needed to give location permission -->
+    <string name="AttachmentManager_signal_to_send_location">To send your location:</string>
+    <!-- Alert dialog description asking for location permission -->
+    <string name="AttachmentManager_signal_allow_signal_access_location">Allow Molly access to send your location.</string>
+    <!-- Toast text explaining Signal\'s need for location access -->
+    <string name="AttachmentManager_signal_needs_location_access">Molly needs location access to send your location.</string>
+
     <!-- Alert dialog title to show the recipient has not activated payments -->
     <string name="AttachmentManager__not_activated_payments">%1$s သည် ငွေပေးချေမှုများကို သက်ဝင်လုပ်ဆောင်ထားခြင်း မရှိသေးပါ </string>
     <!-- Alert dialog description to send the recipient a request to activate payments -->
@@ -240,7 +248,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">Web browser ကိုရှာမတွေ့ပါ</string>
@@ -308,7 +316,7 @@
     <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>
@@ -383,8 +391,16 @@
     <string name="ConversationActivity_your_request_to_join_has_been_sent_to_the_group_admin">သင်၏အဖွဲ့ဝင်ရန် တောင်းဆိုမှုကို အဖွဲ့အက်မင်ထံသို့ ပို့ပြီးပါပြီ။ သူတို့ဆောင်ရွက်ချက်ကို အကြောင်းပြန်ပေးပါမည်။</string>
     <string name="ConversationActivity_cancel_request">တောင်းဆိုမှုကိုပယ်ဖျက်သည်။</string>
 
-    <string name="ConversationActivity_to_send_audio_messages_allow_signal_access_to_your_microphone">အသံဖိုင်ပို့နိုင်ရန် မိမိမိုက်ခရိုဖုန်းကို Molly အား အသုံးပြုခွင့်ပေးပါ။</string>
+    <!-- Dialog title asking users for microphone permission -->
+    <string name="ConversationActivity_allow_access_microphone">Allow access to your microphone</string>
+    <!-- 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>
+    <!-- Toast text explaining Signal\'s need for microphone access -->
+    <string name="ConversationActivity_signal_needs_microphone_access_voice_message">Molly needs microphone access to record a voice message.</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ဖုန်းခေါ်ဆိုမှုပြုနိုင်ရန် 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>
@@ -408,10 +424,17 @@
     <string name="ConversationActivity_you_will_leave_this_group_and_it_will_be_deleted_from_all_of_your_devices">သင်သည် ဤအဖွဲ့မှ ထွက်မည်ဖြစ်ပြီး ယင်းအဖွဲ့ကို သင်၏ အခြားစက်များအားလုံးမှလည်း ဖျက်သွားပါမည်။</string>
     <string name="ConversationActivity_delete">ဖျက်ရန်</string>
     <string name="ConversationActivity_delete_and_leave">ဖျက်ပြီး ထွက်ရန်</string>
-    <string name="ConversationActivity__to_call_s_signal_needs_access_to_your_microphone">ခေါ်ရန်%1$s Molly သည်သင်၏မိုက်ခရိုဖုန်းကိုအသုံးပြုရန်လိုအပ်သည်</string>
+
+    <!-- Dialog description that will explain the steps needed to give microphone permissions for a voice call -->
+    <string name="ConversationActivity__to_start_call">To start a 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">To start a call, allow Molly access to your microphone.</string>
+    <!-- Toast text explaining Signal\'s need for microphone access for a voice call -->
+    <string name="ConversationActivity_signal_needs_microphone_access_voice_call">Molly needs microphone access to start a call.</string>
 
 
     <string name="ConversationActivity_join">ပူးပေါင်း</string>
+    <!-- Button text for an active group call but the call is currently full and unjoinable -->
     <string name="ConversationActivity_full">ပြည့်နေသည်</string>
 
     <string name="ConversationActivity_error_sending_media">မီဒီယာပို့ခြင်းအမှား</string>
@@ -597,6 +620,7 @@
     <string name="ConversationListFragment_unarchive">ပြန်ထုတ်ရန်</string>
     <string name="ConversationListFragment_delete">ဖျက်ရန်</string>
     <string name="ConversationListFragment_select_all">အားလုံးရွေးရန်</string>
+    <!-- Screen title shown when selecting multiple items from a list like conversation threads or call logs. -->
     <plurals name="ConversationListFragment_s_selected">
         <item quantity="other">%1$d ရွေးထားပြီး</item>
     </plurals>
@@ -845,6 +869,7 @@
     <plurals name="GroupManagement_invitation_sent">
         <item quantity="other">ဖိတ်ကြားချက်များ %1$d ခု ပို့ခဲ့သည်။</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">\"%1$s\" ကို ဤအုပ်စုထဲသို့ သင်အလိုအလျောက် ထည့်သွင်း၍ မရပါ။ \n\n သူတို့ကို အုပ်စုအတွင်းသို့ဝင်ရန် ဖိတ်ကြားထားသည်။ ထိုသူတို့ အုပ်စုထဲ ဝင်ရန် လက်ခံမှ အဖွဲ့အတွင်းရှိ မက်ဆေ့ခ်ျများကို တွေ့နိုင်မည်။</string>
     <string name="GroupManagement_invite_multiple_users">ဤအသုံးပြုသူများကို ဤအုပ်စုထဲသို့ သင်အလိုအလျောက် ထည့်သွင်း၍ မရပါ။ \n\n သူတို့ကို အုပ်စုအတွင်းသို့ဝင်ရန် ဖိတ်ကြားထားသည်။ ထိုသူတို့ အုပ်စုထဲ ဝင်ရန် လက်ခံမှ အဖွဲ့အတွင်းရှိ မက်ဆေ့ခ်ျများကို တွေ့နိုင်မည်။</string>
 
@@ -1009,7 +1034,9 @@
 
     <string name="ManageGroupActivity_edit_name_and_picture">နာမည်နှင့်ရုပ်ပုံကိုတည်းဖြတ်ပါ</string>
     <string name="ManageGroupActivity_legacy_group">အမွေအဖွဲ့</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">၎င်းသည် အမွေအဖွဲ့ဖြစ်ပါသည်။ အဖွဲ့ စီမံသူများ စသဖြင့် အင်္ဂါရပ်များသည် အဖွဲ့သစ်များ အတွက်သာ ရရှိနိုင်ပါသည်။</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">၎င်းသည် အမွေအဖွဲ့ တစ်ဖွဲ့ဖြစ်ပါတယ်။ @မန်းရှင်းများ နဲ့ စီမံသူများ စတဲ့ အင်္ဂါရပ်အသစ်များကို အသုံးပြုရန်အတွက်၊</string>
     <string name="ManageGroupActivity_legacy_group_too_large">ဤ အမွေအဖွဲ့သည် အလွန်ကြီးသောဖြင့် အဖွဲ့သစ်သို့အဆင့်မြှင့်၍မရပါ။ အကြီးဆုံး အဖွဲ့အရွယ်အစားသည် %1$d ဦးသာ ဖြစ်ပါသည်။</string>
     <string name="ManageGroupActivity_upgrade_this_group">၎င်းအဖွဲ့ကို အဆင့်မြှင့်ပါ။</string>
@@ -1227,6 +1254,7 @@
         <item quantity="other">ဖျက်ရန်</item>
     </plurals>
 
+    <!-- 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="other">%1$d ရွေးချယ်ခဲ့ပါသည် (%2$s)</item>
     </plurals>
@@ -1290,17 +1318,13 @@
     <string name="MessageRecord_left_group">အဖွဲ့မှ သင်ထွက်လိုက်သည်။</string>
     <string name="MessageRecord_you_updated_group">အဖွဲ့အား သင်ပြောင်းလဲမှုပြုလိုက်သည်။</string>
     <string name="MessageRecord_the_group_was_updated">အဖွဲ့အား အပ်ဒိတ်ပြီးပါပြီ</string>
-    <!-- Update message shown when placing an outgoing 1:1 voice/audio call and it\'s answered by the other party -->
+    <!-- Update message shown when placing an outgoing 1:1 voice/audio call -->
     <string name="MessageRecord_outgoing_voice_call">အထွက် အော်ဒီယိုကောလ်</string>
-    <!-- Update message shown when placing an outgoing 1:1 video call and it\'s answered by the other party -->
+    <!-- Update message shown when placing an outgoing 1:1 video call -->
     <string name="MessageRecord_outgoing_video_call">အထွက် ဗီဒီယိုကောလ်</string>
-    <!-- Update message shown when placing an outgoing 1:1 voice/audio call and it\'s not answered by the other party -->
-    <string name="MessageRecord_unanswered_voice_call">မဖြေဆိုသော အော်ဒီယိုကောလ်</string>
-    <!-- Update message shown when placing an outgoing 1:1 video call and it\'s not answered by the other party -->
-    <string name="MessageRecord_unanswered_video_call">မဖြေဆိုသော ဗီဒီယိုကောလ်</string>
-    <!-- Update message shown when receiving an incoming 1:1 voice/audio call and it\'s answered -->
+    <!-- Update message shown when receiving an incoming 1:1 voice/audio call and it\'s answered or ringing -->
     <string name="MessageRecord_incoming_voice_call">အဝင် အော်ဒီယိုကောလ်</string>
-    <!-- Update message shown when receiving an incoming 1:1 video call and answered -->
+    <!-- Update message shown when receiving an incoming 1:1 video call and answered or ringing -->
     <string name="MessageRecord_incoming_video_call">အဝင် ဗီဒီယိုကောလ်</string>
     <!-- Update message shown when receiving an incoming 1:1 voice/audio call and not answered -->
     <string name="MessageRecord_missed_voice_call">လွတ်သွားသော အော်ဒီယိုကောလ်</string>
@@ -1310,10 +1334,6 @@
     <string name="MessageRecord_missed_voice_call_notification_profile">အသိပေးချက် ပရိုဖိုင်ကို ဖွင့်ထားစဉ် အော်ဒီယိုကောလ် လွတ်သွားသည်</string>
     <!-- Update message shown when receiving an incoming video call and declined due to notification profile -->
     <string name="MessageRecord_missed_video_call_notification_profile">အသိပေးချက် ပရိုဖိုင်ကို ဖွင့်ထားစဉ် ဗီဒီယိုကောလ် လွတ်သွားသည်</string>
-    <!-- Update message shown when receiving an incoming 1:1 voice/audio call and explicitly declined -->
-    <string name="MessageRecord_you_declined_a_voice_call">သင်သည် အော်ဒီယိုကောလ်ကို ငြင်းပယ်လိုက်သည်</string>
-    <!-- Update message shown when receiving an incoming 1:1 video call and explicitly declined -->
-    <string name="MessageRecord_you_declined_a_video_call">သင်သည် ဗီဒီယိုကောလ်ကို ငြင်းပယ်လိုက်သည်</string>
     <!-- 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>
@@ -1514,28 +1534,53 @@
     <string name="MessageRecord_can_accept_payments">ယခုအခါ %1$s သည် ငွေပေးချေမှုများကို လက်ခံနိုင်ပါသည်</string>
 
     <!-- Group Calling update messages -->
-    <string name="MessageRecord_s_started_a_group_call_s">%1$s သည် အဖွဲ့လိုက်ခေါ်ဆိုမှု စခဲ့ပါသည် · %2$s</string>
-    <string name="MessageRecord_you_started_a_group_call_s">အဖွဲ့ကောလ်ကို သင် စတင်ခဲ့ပါသည် · %1$s</string>
-    <string name="MessageRecord_s_is_in_the_group_call_s">%1$s သည် အဖွဲ့လိုက်ခေါ်ဆိုမှုထဲ၌ ရှိပါသည် · %2$s</string>
-    <string name="MessageRecord_you_are_in_the_group_call_s1">သင်သည် အဖွဲ့လိုက်ခေါ်ဆိုမှုထဲတွင် ရှိပါသည် · %1$s</string>
-    <string name="MessageRecord_s_and_s_are_in_the_group_call_s1">%1$s နှင့် %2$s သည် အဖွဲ့လိုက်ခေါ်ဆိုမှုထဲ၌ ရှိပါသည် · %3$s</string>
-    <string name="MessageRecord_group_call_s">အဖွဲ့လိုက်ခေါ်ဆိုမှု · %1$s</string>
-
-    <string name="MessageRecord_s_started_a_group_call">%1$s သည် အဖွဲ့လိုက်ခေါ်ဆိုမှု စခဲ့ပါသည်</string>
-    <string name="MessageRecord_you_started_a_group_call">အဖွဲ့လိုက် ဖုန်းခေါ်ဆိုမှု သင်စခဲ့ပါသည်</string>
-    <string name="MessageRecord_s_is_in_the_group_call">%1$s သည် အဖွဲ့လိုက်ခေါ်ဆိုမှုထဲ၌ ရှိပါသည်</string>
-    <string name="MessageRecord_you_are_in_the_group_call">သင်သည် အဖွဲ့လိုက်ခေါ်ဆိုမှုထဲ၌ ရှိပါသည်</string>
-    <string name="MessageRecord_s_and_s_are_in_the_group_call">%1$s နှင့် %2$s သည် အဖွဲ့လိုက်ခေါ်ဆိုမှုထဲ၌ ရှိပါသည်</string>
-    <string name="MessageRecord_group_call">အဖွဲ့လိုက် ခေါ်ဆိုမှု</string>
+    <!-- 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 သည် ကောလ်ထဲတွင် ရှိနေသည် · %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">သင်သည် ကောလ်ထဲတွင် ရှိနေသည် · %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 နှင့် %2$s သည် ကောလ်ထဲ တွင်ရှိနေသည် · %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 သည် ကောလ်ထဲတွင် ရှိနေသည်</string>
+    <!-- Chat log text for an ongoing group call only the local user has joined -->
+    <string name="MessageRecord_you_are_in_the_call">သင်သည် ကောလ်ထဲတွင် ရှိနေသည်</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 နှင့် %2$s သည် ကောလ်ထဲတွင် ရှိနေသည်</string>
+    <!-- Chat log text for a group call that ended within the last 5 minutes -->
+    <string name="MessageRecord__the_video_call_has_ended">ဗီဒီယိုကောလ်ခေါ်ဆိုမှု ပြီးဆုံးသွားပါပြီ</string>
+    <!-- Chat log text for a group call that ended within the last 5 minutes with a placeholder for formatted time -->
+    <string name="MessageRecord__the_video_call_has_ended_s">ဗီဒီယိုကောလ်ခေါ်ဆိုမှု ပြီးဆုံးသွားပါပြီ · %1$s</string>
+    <!-- Chat log text for a group call that ended more than 5 minutes ago and was missed -->
+    <string name="MessageRecord__missed_video_call">လွတ်သွားသော ဗီဒီယိုကောလ်</string>
+    <!-- Chat log text for a group call that ended more than 5 minutes ago and was missed with a placeholder for formatted time -->
+    <string name="MessageRecord__missed_video_call_s">လွတ်သွားသော ဗီဒီယိုကောလ် · %1$s</string>
+    <!-- Chat log text for a group call that ended that the local user did not start -->
+    <string name="MessageRecord__incoming_video_call">အဝင် ဗီဒီယိုကောလ်</string>
+    <!-- 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">အဝင်ဗီဒီယိုကောလ် · %1$s</string>
+    <!-- Chat log text for a group call that ended that the local user started -->
+    <string name="MessageRecord__outgoing_video_call">အထွက် ဗီဒီယိုကောလ်</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">အထွက်ဗီဒီယိုကောလ် · %1$s</string>
+    <!-- Chat log text for an ongoing group call that the local user started -->
+    <string name="MessageRecord__you_started_a_video_call">သင်သည် ဗီဒီယိုကောလ်ခေါ်ဆိုမှုကို စတင်ခဲ့သည်</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">သင်သည် ဗီဒီယိုကောလ်ခေါ်ဆိုမှုကို စတင်ခဲ့သည် · %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 ဗီဒီယိုကောလ်ခေါ်ဆိုမှုကို စတင်ခဲ့သည်</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 ဗီဒီယိုကောလ်ခေါ်ဆိုမှုကို စတင်ခဲ့သည် · %2$s</string>
 
     <string name="MessageRecord_you">သင်</string>
 
-    <plurals name="MessageRecord_s_s_and_d_others_are_in_the_group_call_s">
-        <item quantity="other">%1$s၊ %2$s၊ နှင့် အခြား %3$d ယောက်များသည် ၎င်းအဖွဲ့လိုက်ခေါ်ဆိုမှုထဲတွင် ရှိပါသည် · %4$s</item>
+    <!-- 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="other">%1$s၊ %2$s၊ နှင့် အခြား %3$d ယောက်သည် ၎င်းအဖွဲ့လိုက်ခေါ်ဆိုမှုထဲတွင် ရှိသည် · %4$s</item>
     </plurals>
 
-    <plurals name="MessageRecord_s_s_and_d_others_are_in_the_group_call">
-        <item quantity="other">%1$s၊ %2$s၊ နှင့် အခြား %3$d ယောက်များသည် ၎င်းအဖွဲ့လိုက်ခေါ်ဆိုမှုထဲတွင် ရှိပါသည်</item>
+    <!-- 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="other">%1$s၊ %2$s၊ နှင့် အခြား %3$d ယောက်သည် ၎င်းအဖွဲ့လိုက်ခေါ်ဆိုမှုထဲတွင် ရှိသည်</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. -->
@@ -1984,6 +2029,7 @@
     <!-- Generic error when the app is unable to request an SMS code for an unknown reason. -->
     <string name="RegistrationActivity_unable_to_request_verification_code">အတည်ပြုကုဒ်တစ်ခုကို တောင်းဆိုနိုင်ခြင်းမရှိပါ။ သင့်ကွန်ရက် ချိတ်ဆက်မှုကို စစ်ဆေးပြီး ထပ်ကြိုးစားပါ။</string>
     <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">Molly Android - ဖုန်းနံပါတ် ပုံစံ</string>
     <!--    Small "toast" notification to the user confirming that they have requested a new code via voice call.-->
@@ -2127,7 +2173,7 @@
     <string name="SubmitDebugLogActivity_this_log_will_be_posted_publicly_online_for_contributors">ကူညီပံ့ပိုးသူများ ကြည့်ရှုနိုင်ရန်အတွက် ဤမှတ်တမ်းကို အွန်လိုင်းတွင် လူသူမရွေးကြည့်နိုင်ရန် တင်သွားပါမည်။ အပ်လုဒ်မလုပ်မီ ဆန်းစစ်နိုင်ပါသည်။</string>
 
     <!-- SupportEmailUtil -->
-  <!-- Removed by excludeNonTranslatables <string name="SupportEmailUtil_support_email" translatable="false">support@molly.im</string> -->
+  <!-- Removed by excludeNonTranslatables <string name="SupportEmailUtil_support_email" translatable="false">support@signal.org</string> -->
     <string name="SupportEmailUtil_filter">စီစစ်ခြင်း -</string>
     <string name="SupportEmailUtil_device_info">ကိရိယာအချက်အလက် -</string>
     <string name="SupportEmailUtil_android_version">Android ဗားရှင်း -</string>
@@ -2622,6 +2668,8 @@
     <string name="ConversationUpdateItem_loading">လုပ်ဆောင်နေဆဲ</string>
     <string name="ConversationUpdateItem_learn_more">ထပ်မံလေ့လာရန်</string>
     <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_call_is_full">ခေါ်ဆိုမှုထဲ လူပြည့်နေပါပြီ</string>
     <string name="ConversationUpdateItem_invite_friends">သူငယ်ချင်းများကို ဖိတ်ခေါ်ပါ</string>
@@ -2686,6 +2734,7 @@
     <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>
 
     <!-- EnableCallNotificationSettingsDialog__call_notifications_checklist -->
@@ -2992,6 +3041,7 @@
 
     <string name="arrays__default">မူလ</string>
     <string name="arrays__high">မြင့်သော</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">အများဆုံး</string>
 
     <!-- plurals.xml -->
@@ -3260,7 +3310,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">Molly ထဲတွင် ငွေပေးချေမှုများ မလုပ်ဆောင်နိုင်တော့ပါ။ ငွေလဲလှယ်မှုတစ်ခုသို့ ငွေများလွှဲနိုင်ပါသည်၊ သို့သော် သင်မှ ငွေပေးချေမှုများ ပေးပို့လက်ခံလို့မရတော့ပါ၊​ ငွေလည်း ထည့်ပေါင်းလို့မရတော့ပါ။</string>
@@ -3309,6 +3359,14 @@
     <!-- Storage permission row description -->
     <string name="GrantPermissionsFragment__send_photos_videos_and_files">သင့်စက်မှ ဓာတ်ပုံများ၊ ဗီဒီယိုများနှင့် ဖိုင်များကို ပေးပို့လိုက်ပါ။</string>
 
+    <!-- PermissionDeniedBottomSheet -->
+    <!-- Sheet describing step 1 on how to give permissions by opening settings -->
+    <string name="PermissionDeniedBottomSheet__1_tap_settings_below">1. Tap “Settings” below</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 Allow the permission</string>
+    <!-- Label for button at the bottom of the sheet which opens the system permission settings -->
+    <string name="PermissionDeniedBottomSheet__settings">Settings</string>
+
     <!-- PaymentsSecuritySetupFragment -->
     <!-- Toolbar title -->
     <string name="PaymentsSecuritySetupFragment__security_setup">လုံခြုံရေး သတ်မှတ်ချိန်ညှိမှု</string>
@@ -3349,6 +3407,7 @@
     <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__information">ငွေပေးချေမှု ငွေပမာဏနှင့် လုပ်ဆောင်သည့်အချိန် အပါအဝင် ငွေပေးငွေယူသည့် အသေးစိတ်အချက်အလက်များသည် MobileCoin စာအုပ်စာရင်း၏ အစိတ်အပိုင်းတစ်ခု ဖြစ်ပါသည်။</string>
@@ -3411,6 +3470,7 @@
     <string name="ConfirmPayment__confirm_payment">ငွေပေးချေမှု အတည်ပြုမယ်</string>
     <string name="ConfirmPayment__network_fee">ကွန်ယက်အခကြေးငွေ</string>
     <string name="ConfirmPayment__estimated_s">ခန့်မှန်းထားသည် %1$s</string>
+    <!-- Prefix to a name to indicate who a payment will be sent to -->
     <string name="ConfirmPayment__to">သို့</string>
     <string name="ConfirmPayment__total_amount">စုစုပေါင်း ပမာဏ</string>
     <string name="ConfirmPayment__balance_s">လက်ကျန်ငွေ - %1$s</string>
@@ -3559,6 +3619,14 @@
     <string name="conversation_group_options__conversation">ချက်(တ်)</string>
     <string name="conversation_group_options__broadcast">ထုတ်လွှင့်ပါ</string>
 
+    <!-- DoubleTapEditEducationSheet -->
+    <!-- Displayed as the title of the education bottom sheet -->
+    <string name="DoubleTapEditEducationSheet__double_tap_edit_title">Double tap to edit</string>
+    <!-- Text on the sheet explaining how double tapping on a message will let them edit it -->
+    <string name="DoubleTapEditEducationSheet__quickly_tap_twice">Quickly tap twice on your messages to edit them. You can edit your messages up to 24hrs after they’ve been sent.</string>
+    <!-- Button label to dismiss sheet -->
+    <string name="DoubleTapEditEducationSheet__got_it">Got it</string>
+
     <!-- text_secure_normal -->
     <string name="text_secure_normal__menu_new_group">အဖွဲ့သစ်</string>
     <string name="text_secure_normal__menu_settings">ဆက်တင်</string>
@@ -4006,6 +4074,7 @@
     <string name="RecipientBottomSheet_copied_to_clipboard">ကလစ်ဘုတ်သို့ကူးယူပြီး</string>
 
     <string name="GroupRecipientListItem_admin">စီမံသူ</string>
+    <!-- Button text to approve a user that has requested to join a group -->
     <string name="GroupRecipientListItem_approve_description">ခွင့်ပြုမယ်</string>
     <string name="GroupRecipientListItem_deny_description">ငြင်းပယ်မယ်</string>
 
@@ -4033,6 +4102,7 @@
 
     <!-- VoiceNoteMediaDescriptionCompatFactory -->
     <string name="VoiceNoteMediaItemFactory__voice_message">အသံ မက်ဆေ့ချ် · %1$s</string>
+    <!-- This is a title in a banner describing the conversation sender to receiver placeholders of the currently playing voice memo. -->
     <string name="VoiceNoteMediaItemFactory__s_to_s">%1$s မှ %2$s သို့</string>
 
     <!-- StorageUtil -->
@@ -4046,8 +4116,14 @@
     <string name="ReviewCardDialogFragment__review_members">မန်ဘာများကို ပြန်လည်သုံးသပ်ရန်</string>
     <!-- Title of a screen where the user will be prompted to review a message request matching the name of someone they already know -->
     <string name="ReviewCardDialogFragment__review_request">ပြန်လည်သုံးသပ်မှု တောင်းဆိုချက်</string>
-    <string name="ReviewCardDialogFragment__d_group_members_have_the_same_name">အဖွဲ့ဝင် %1$d ဦးသည် အမည်တူနေပါသည်၊ အောက်ပါအဖွဲ့ဝင်များကို စစ်ဆေးပါ သို့မဟုတ် လုပ်ဆောင်ချက်တစ်ခုလုပ်ရန် ရွေးချယ်ပါ။</string>
-    <string name="ReviewCardDialogFragment__if_youre_not_sure">မည်သူမှ တောင်းဆိုသည်ကို မသေချာပါက အောက်ပါ အဆက်အသွယ်များကို ပြန်လည်စစ်ဆေးပြီး လုပ်ဆောင်ချက်တစ်ခု ရွေးပါ။</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="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 -->
+    <plurals name="ReviewCardDialogFragment__if_youre_not_sure">
+        <item quantity="other">If you\'re not sure who the request is from, review the contacts below and take action.</item>
+    </plurals>
     <string name="ReviewCardDialogFragment__no_other_groups_in_common">အခြား တူညီသော အဖွဲ့များမရှိပါ</string>
     <string name="ReviewCardDialogFragment__no_groups_in_common">အခြား တူညီသော အဖွဲ့များမရှိပါ</string>
     <plurals name="ReviewCardDialogFragment__d_other_groups_in_common">
@@ -4076,11 +4152,18 @@
     <string name="CallParticipantsListUpdatePopupWindow__s_joined">အဖွဲ့ထဲ %1$s ၀င်ရောက်လာသည်။</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_and_s_joined">%1$s နှင့် %2$s တို့သည် အဖွဲ့ထဲသို့ ဝင်လာပါသည်</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_s_and_s_joined">%1$s, %2$s နှင့် %3$s တို့သည် အဖွဲ့ထဲသို့ ဝင်လာပါသည်</string>
-    <string name="CallParticipantsListUpdatePopupWindow__s_s_and_d_others_joined">%1$s, %2$s နှင့် အခြား %3$d ဦးသည် အဖွဲ့ထဲသို့ ဝင်လာပါသည်</string>
+    <!-- Toast message shown in group call when 3 or more people join -->
+    <plurals name="CallParticipantsListUpdatePopupWindow__s_s_and_d_others_joined">
+        <item quantity="other">%1$s, %2$s and %3$d others joined</item>
+    </plurals>
+    <!-- Toast/popup text shown when someone leaves a group call -->
     <string name="CallParticipantsListUpdatePopupWindow__s_left">%1$s အဖွဲ့မှ ထွက်သွားသည်</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_and_s_left">%1$s နှင့် %2$s တို့သည် အဖွဲ့မှ ထွက်သွားသည်</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_s_and_s_left">%1$s, %2$s နှင့် %3$s တို့သည် အဖွဲ့မှ ထွက်သွားသည်</string>
-    <string name="CallParticipantsListUpdatePopupWindow__s_s_and_d_others_left">%1$s, %2$s နှင့် အခြား %3$d ဦးသည် အဖွဲ့မှ ထွက်သွားသည်</string>
+    <!-- Toast message shown in group call when 3 or more people leave -->
+    <plurals name="CallParticipantsListUpdatePopupWindow__s_s_and_d_others_left">
+        <item quantity="other">%1$s, %2$s and %3$d others left</item>
+    </plurals>
 
     <string name="CallParticipant__you">သင်</string>
     <string name="CallParticipant__you_on_another_device">သင် (အခြားစက်ကိရိယာပေါ်တွင်)</string>
@@ -4448,10 +4531,14 @@
 
     <!-- PrivacySettingsFragment -->
     <string name="PrivacySettingsFragment__blocked">ဘလော့ခ်ထားပြီး</string>
-    <string name="PrivacySettingsFragment__d_contacts">အဆက်အသွယ် %1$d ခု</string>
+    <!-- Settings label that shows the number blocked contacts -->
+    <plurals name="PrivacySettingsFragment__d_contacts">
+        <item quantity="other">%1$d contacts</item>
+    </plurals>
     <string name="PrivacySettingsFragment__messaging">မက်ဆေ့ချ်ပေးပို့ခြင်း</string>
     <string name="PrivacySettingsFragment__disappearing_messages">ပျောက်ကွယ်မည့် မက်ဆေ့ချ်များ</string>
     <string name="PrivacySettingsFragment__app_security">အက်ပ် လုံခြုံရေး</string>
+    <!-- This refers to the multi-tasking overview (recent apps) from the Android operating system.-->
     <string name="PrivacySettingsFragment__block_screenshots_in_the_recents_list_and_inside_the_app">နောက်ဆုံး စာရင်းနှင့် အက်ပ်အတွင်း စခရင်ရှော့(တ်)များကို ပိတ်ရန်</string>
     <string name="PrivacySettingsFragment__signal_message_and_calls">Signal မက်ဆေ့ချ်များနှင့် ကောလ်များ၊ အမြဲတမ်း ထပ်ဆင့်ပို့ ကောလ်များနှင့် ချိပ်ပိတ်ပေးပို့သူ</string>
     <string name="PrivacySettingsFragment__default_timer_for_new_changes">ချက်(တ်)အသစ်များအတွက် ပုံသေတိုင်မာ</string>
@@ -4508,11 +4595,14 @@
     <string name="DataAndStorageSettingsFragment__media_quality">ဓာတ်ပုံ အရည်အသွေး</string>
     <string name="DataAndStorageSettingsFragment__sent_media_quality">မီဒီယာ အရည်အသွေး ပို့ပြီး</string>
     <string name="DataAndStorageSettingsFragment__sending_high_quality_media_will_use_more_data">အရည်အသွေးမြင့်သည့် မီဒီယာဖိုင်ကို ပို့လျှင် ဒေတာ ပိုသုံးပါလိမ့်မည်။</string>
+    <!-- Setting option that can be selected to default media to be sent as high quality by default -->
     <string name="DataAndStorageSettingsFragment__high">မြင့်သော</string>
+    <!-- Setting option that can be selected to default media to be sent as standard quality by default -->
     <string name="DataAndStorageSettingsFragment__standard">အသင့်အတင့်</string>
     <string name="DataAndStorageSettingsFragment__calls">ဖုန်းခေါ်ဆိုမှုများ</string>
 
     <!-- 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__use_custom_colors">စိတ်ကြိုက် အရောင်များ သုံးရန်</string>
     <string name="ChatColorSelectionFragment__chat_color">ချက်(တ်)အရောင်</string>
@@ -4721,6 +4811,7 @@
     <string name="AvatarPickerFragment__take_a_picture">ပုံရိုက်ရန်</string>
     <string name="AvatarPickerFragment__choose_a_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>
     <string name="AvatarPickerFragment__clear_avatar">Avatar ရှင်းရန်</string>
@@ -4777,7 +4868,7 @@
     <string name="MediaReviewFragment__add_a_message">မက်ဆေ့ချ် ပေါင်းထည့်ရန်</string>
     <string name="MediaReviewFragment__add_a_reply">ပြန်စာ ပေါင်းထည့်ရန်</string>
     <string name="MediaReviewFragment__send_to">ဖော်ပြပါသို့ ပို့ရန်</string>
-    <string name="MediaReviewFragment__view_once_message">မက်ဆေ့ချ်ကို တစ်ကြိမ်ကြည့်ရန်</string>
+    <string name="MediaReviewFragment__view_once_message">တစ်ခါကြည့် မီဒီယာ</string>
     <string name="MediaReviewFragment__one_or_more_items_were_too_large">တစ်ခု သို့မဟုတ် တစ်ခုထက်ပိုသော ဖိုင်များသည် ကြီးလွန်းနေပါသည်</string>
     <string name="MediaReviewFragment__one_or_more_items_were_invalid">တစ်ခု သို့မဟုတ် တစ်ခုထက်ပိုသော ဖိုင်များသည် အကျုံးမဝင်ပါ</string>
     <string name="MediaReviewFragment__too_many_items_selected">ဖိုင်များစွာကို ရွေးထားပါသည်</string>
@@ -5365,7 +5456,7 @@
     <string name="StoryViewerFragment__s_s">%1$s %2$s</string>
     <!-- Displayed when viewing a post you sent -->
     <string name="StoryViewerPageFragment__you">သင်</string>
-    <!-- Displayed when viewing a post displayed to a group -->
+    <!-- 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 -->
     <string name="StoryViewerPageFragment__reply">စာပြန်မည်</string>
@@ -6558,5 +6649,26 @@
     <!-- Content description for opening the note editor -->
     <string name="ViewNoteSheet__edit_note">မှတ်ချက်ပြင်ဆင်တည်းဖြတ်မှု</string>
 
+    <!-- BackupProgressService -->
+    <!-- Notification title shown while backup restore job is running -->
+    <string name="BackupProgressService_title">ဘက်ခ်အပ်မှ ပြန်လည်ရယူနေသည်…</string>
+    <!-- Notification title shown while downloading backup restore data -->
+    <string name="BackupProgressService_title_downloading">ဘက်ခ်အပ် ဒေတာများကို ဒေါင်းလုဒ်လုပ်နေသည်…</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>
+    <!-- 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 -->
+    <string name="BackupsTypeSettingsFragment__google_pay">Google Pay</string>
+    <!-- Displayed as the user\'s payment method as a label in a preference row -->
+    <string name="BackupsTypeSettingsFragment__bank_transfer">Bank transfer</string>
+    <!-- Displayed as the user\'s payment method as a label in a preference row -->
+    <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>
+
+
     <!-- 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 c32d9633db..f89c9805c3 100644
--- a/app/src/main/res/values-nb/strings.xml
+++ b/app/src/main/res/values-nb/strings.xml
@@ -1,6 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- smartling.instruction_comments_enabled = on -->
-<resources>
+<?xml version="1.0" encoding="UTF-8"?><!-- 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> -->
@@ -89,6 +87,16 @@
     <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">Allow access to your location</string>
+    <!-- Dialog description that will explain the steps needed to give location permission -->
+    <string name="AttachmentManager_signal_to_send_location">To send your location:</string>
+    <!-- Alert dialog description asking for location permission -->
+    <string name="AttachmentManager_signal_allow_signal_access_location">Allow Molly access to send your location.</string>
+    <!-- Toast text explaining Signal\'s need for location access -->
+    <string name="AttachmentManager_signal_needs_location_access">Molly needs location access to send your location.</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>
     <!-- Alert dialog description to send the recipient a request to activate payments -->
@@ -241,7 +249,7 @@
     <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>
@@ -386,8 +394,16 @@
     <string name="ConversationActivity_your_request_to_join_has_been_sent_to_the_group_admin">Din forespørsel om å bli med har blitt sendt til gruppeadministratoren. Du vil bli varslet når de tar aksjon.</string>
     <string name="ConversationActivity_cancel_request">Avbryt forespørsel</string>
 
-    <string name="ConversationActivity_to_send_audio_messages_allow_signal_access_to_your_microphone">For å sende lydmeldinger, gi Molly tilgang til mikrofonen din.</string>
+    <!-- Dialog title asking users for microphone permission -->
+    <string name="ConversationActivity_allow_access_microphone">Allow access to your microphone</string>
+    <!-- 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>
+    <!-- Toast text explaining Signal\'s need for microphone access -->
+    <string name="ConversationActivity_signal_needs_microphone_access_voice_message">Molly needs microphone access to record a voice message.</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">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>
@@ -411,10 +427,17 @@
     <string name="ConversationActivity_you_will_leave_this_group_and_it_will_be_deleted_from_all_of_your_devices">Du forlater denne gruppen, og den blir slettet fra alle enhetene dine.</string>
     <string name="ConversationActivity_delete">Slett</string>
     <string name="ConversationActivity_delete_and_leave">Slett og forlat</string>
-    <string name="ConversationActivity__to_call_s_signal_needs_access_to_your_microphone">Molly trenger tilgang til mikrofonen din for å ringe %1$s</string>
+
+    <!-- Dialog description that will explain the steps needed to give microphone permissions for a voice call -->
+    <string name="ConversationActivity__to_start_call">To start a 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">To start a call, allow Molly access to your microphone.</string>
+    <!-- Toast text explaining Signal\'s need for microphone access for a voice call -->
+    <string name="ConversationActivity_signal_needs_microphone_access_voice_call">Molly needs microphone access to start a call.</string>
 
 
     <string name="ConversationActivity_join">Bli med</string>
+    <!-- Button text for an active group call but the call is currently full and unjoinable -->
     <string name="ConversationActivity_full">Full</string>
 
     <string name="ConversationActivity_error_sending_media">Kunne ikke sende media</string>
@@ -613,6 +636,7 @@
     <string name="ConversationListFragment_unarchive">Hent fra arkiv</string>
     <string name="ConversationListFragment_delete">Slett</string>
     <string name="ConversationListFragment_select_all">Velg alle</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 valgt</item>
         <item quantity="other">%1$d valgt</item>
@@ -864,6 +888,7 @@
         <item quantity="one">Invitasjonen er sendt</item>
         <item quantity="other">%1$d invitasjoner er sendt</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">“%1$s” kan ikke bli automatisk lagt til denne gruppen av deg.\n\nPersonen har blitt invitert, men vil ikke se noen meldinger til gruppen før invitasjonen godtas.</string>
     <string name="GroupManagement_invite_multiple_users">Disse brukerne kan ikke automatisk legges til av deg.\n\nDe er blitt invitert, men vil ikke se noen meldinger til gruppen før invitasjonen godtas.</string>
 
@@ -1044,7 +1069,9 @@
 
     <string name="ManageGroupActivity_edit_name_and_picture">Rediger navn og bilde</string>
     <string name="ManageGroupActivity_legacy_group">\"Legacy\"-grupper</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">Dette er en \"legacy\"-gruppe. Funksjoner som gruppeadministratorer er kun tilgjengelig for \"nye\" grupper.</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">Dette er en \"legacy\"-gruppe. For å få tilgang til de nye funksjonene, som @-omtaler og gruppeadministratorer,</string>
     <string name="ManageGroupActivity_legacy_group_too_large">Denne gruppen kan ikke oppgraderes til ny gruppe fordi den er for stor. Maksimal gruppestørrelse er %1$d.</string>
     <string name="ManageGroupActivity_upgrade_this_group">Oppgrader denne gruppen.</string>
@@ -1271,6 +1298,7 @@
         <item quantity="other">Slett</item>
     </plurals>
 
+    <!-- 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 valgt (%2$s)</item>
         <item quantity="other">%1$d valgt (%2$s)</item>
@@ -1335,17 +1363,13 @@
     <string name="MessageRecord_left_group">Du har forlatt gruppa.</string>
     <string name="MessageRecord_you_updated_group">Du har oppdatert gruppa.</string>
     <string name="MessageRecord_the_group_was_updated">Gruppen ble oppdatert.</string>
-    <!-- Update message shown when placing an outgoing 1:1 voice/audio call and it\'s answered by the other party -->
+    <!-- Update message shown when placing an outgoing 1:1 voice/audio call -->
     <string name="MessageRecord_outgoing_voice_call">Utgående taleanrop</string>
-    <!-- Update message shown when placing an outgoing 1:1 video call and it\'s answered by the other party -->
+    <!-- Update message shown when placing an outgoing 1:1 video call -->
     <string name="MessageRecord_outgoing_video_call">Utgående videoanrop</string>
-    <!-- Update message shown when placing an outgoing 1:1 voice/audio call and it\'s not answered by the other party -->
-    <string name="MessageRecord_unanswered_voice_call">Ubesvart taleanrop</string>
-    <!-- Update message shown when placing an outgoing 1:1 video call and it\'s not answered by the other party -->
-    <string name="MessageRecord_unanswered_video_call">Ubesvart videoanrop</string>
-    <!-- Update message shown when receiving an incoming 1:1 voice/audio call and it\'s answered -->
+    <!-- Update message shown when receiving an incoming 1:1 voice/audio call and it\'s answered or ringing -->
     <string name="MessageRecord_incoming_voice_call">Innkommende taleanrop</string>
-    <!-- Update message shown when receiving an incoming 1:1 video call and answered -->
+    <!-- Update message shown when receiving an incoming 1:1 video call and answered or ringing -->
     <string name="MessageRecord_incoming_video_call">Innkommende videoanrop</string>
     <!-- Update message shown when receiving an incoming 1:1 voice/audio call and not answered -->
     <string name="MessageRecord_missed_voice_call">Tapt taleanrop</string>
@@ -1355,10 +1379,6 @@
     <string name="MessageRecord_missed_voice_call_notification_profile">Tapt taleanrop mens varslingsprofil var slått på</string>
     <!-- Update message shown when receiving an incoming video call and declined due to notification profile -->
     <string name="MessageRecord_missed_video_call_notification_profile">Tapt videoanrop mens varslingsprofil var slått på.</string>
-    <!-- Update message shown when receiving an incoming 1:1 voice/audio call and explicitly declined -->
-    <string name="MessageRecord_you_declined_a_voice_call">Du avviste et taleanrop</string>
-    <!-- Update message shown when receiving an incoming 1:1 video call and explicitly declined -->
-    <string name="MessageRecord_you_declined_a_video_call">Du avviste et videoanrop</string>
     <!-- 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 oppdaterte gruppa.</string>
@@ -1567,28 +1587,53 @@
     <string name="MessageRecord_can_accept_payments">%1$s kan nå motta betalinger</string>
 
     <!-- Group Calling update messages -->
-    <string name="MessageRecord_s_started_a_group_call_s">%1$s startet en gruppesamtale · %2$s</string>
-    <string name="MessageRecord_you_started_a_group_call_s">Du startet en gruppesamtale · %1$s</string>
-    <string name="MessageRecord_s_is_in_the_group_call_s">%1$s er i gruppesamtalen · %2$s</string>
-    <string name="MessageRecord_you_are_in_the_group_call_s1">Du er i gruppesamtalen · %1$s</string>
-    <string name="MessageRecord_s_and_s_are_in_the_group_call_s1">%1$s og %2$s er i gruppesamtalen · %3$s</string>
-    <string name="MessageRecord_group_call_s">Gruppesamtale · %1$s</string>
-
-    <string name="MessageRecord_s_started_a_group_call">%1$s startet en gruppesamtale</string>
-    <string name="MessageRecord_you_started_a_group_call">Du gjorde et gruppeanrop</string>
-    <string name="MessageRecord_s_is_in_the_group_call">%1$s er i gruppesamtalen</string>
-    <string name="MessageRecord_you_are_in_the_group_call">Du er med i gruppesamtalen</string>
-    <string name="MessageRecord_s_and_s_are_in_the_group_call">%1$s og %2$s er i gruppesamtalen</string>
-    <string name="MessageRecord_group_call">Gruppesamtale</string>
+    <!-- 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 er med i samtalen · %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">Du er med i samtalen · %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 og %2$s er med i samtalen · %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 er med i samtalen</string>
+    <!-- Chat log text for an ongoing group call only the local user has joined -->
+    <string name="MessageRecord_you_are_in_the_call">Du er med i samtalen</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 og %2$s er med i samtalen</string>
+    <!-- Chat log text for a group call that ended within the last 5 minutes -->
+    <string name="MessageRecord__the_video_call_has_ended">Videosamtalen er avsluttet</string>
+    <!-- Chat log text for a group call that ended within the last 5 minutes with a placeholder for formatted time -->
+    <string name="MessageRecord__the_video_call_has_ended_s">Videosamtalen er avsluttet · %1$s</string>
+    <!-- Chat log text for a group call that ended more than 5 minutes ago and was missed -->
+    <string name="MessageRecord__missed_video_call">Tapt videoanrop</string>
+    <!-- Chat log text for a group call that ended more than 5 minutes ago and was missed with a placeholder for formatted time -->
+    <string name="MessageRecord__missed_video_call_s">Ubesvart videoanrop · %1$s</string>
+    <!-- Chat log text for a group call that ended that the local user did not start -->
+    <string name="MessageRecord__incoming_video_call">Innkommende videoanrop</string>
+    <!-- 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">Innkommende videoanrop · %1$s</string>
+    <!-- Chat log text for a group call that ended that the local user started -->
+    <string name="MessageRecord__outgoing_video_call">Utgående videoanrop</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">Utgående videoanrop · %1$s</string>
+    <!-- Chat log text for an ongoing group call that the local user started -->
+    <string name="MessageRecord__you_started_a_video_call">Du startet en videosamtale</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">Du startet en videosamtale · %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 startet en videosamtale</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 startet en videosamtale · %2$s</string>
 
     <string name="MessageRecord_you">Deg</string>
 
-    <plurals name="MessageRecord_s_s_and_d_others_are_in_the_group_call_s">
+    <!-- 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, og %3$d annen er i gruppesamtalen · %4$s</item>
         <item quantity="other">%1$s, %2$s, og %3$d andre er i gruppesamtalen · %4$s</item>
     </plurals>
 
-    <plurals name="MessageRecord_s_s_and_d_others_are_in_the_group_call">
+    <!-- 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, og %3$d annen er i gruppesamtalen</item>
         <item quantity="other">%1$s, %2$s, og %3$d andre er i gruppesamtalen</item>
     </plurals>
@@ -2063,6 +2108,7 @@
     <!-- 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 ikke be om bekreftelseskode. Sjekk internettilkoblingen og prøv igjen.</string>
     <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">Molly Android – format for telefonnummer</string>
     <!--    Small "toast" notification to the user confirming that they have requested a new code via voice call.-->
@@ -2207,7 +2253,7 @@
     <string name="SubmitDebugLogActivity_this_log_will_be_posted_publicly_online_for_contributors">Denne loggen publiseres på nettet, slik at bidragsytere kan se den. Du kan se over og redigere den før du sender den inn.</string>
 
     <!-- SupportEmailUtil -->
-  <!-- Removed by excludeNonTranslatables <string name="SupportEmailUtil_support_email" translatable="false">support@molly.im</string> -->
+  <!-- Removed by excludeNonTranslatables <string name="SupportEmailUtil_support_email" translatable="false">support@signal.org</string> -->
     <string name="SupportEmailUtil_filter">Filter:</string>
     <string name="SupportEmailUtil_device_info">Enhetsinformasjon:</string>
     <string name="SupportEmailUtil_android_version">Android versjon</string>
@@ -2709,6 +2755,8 @@
     <string name="ConversationUpdateItem_loading">Laster inn</string>
     <string name="ConversationUpdateItem_learn_more">Lær mer</string>
     <string name="ConversationUpdateItem_join_call">Bli med i samtale</string>
+    <!-- Action button label for starting a new call in the current conversation -->
+    <string name="ConversationUpdateItem_call_back">Ring tilbake</string>
     <string name="ConversationUpdateItem_return_to_call">Gå tilbake til samtale</string>
     <string name="ConversationUpdateItem_call_is_full">Samtalen er full</string>
     <string name="ConversationUpdateItem_invite_friends">Inviter venner</string>
@@ -2773,6 +2821,7 @@
     <string name="safety_number_change_dialog__leave_call">Forlat samtale</string>
     <string name="safety_number_change_dialog__the_following_people_may_have_reinstalled_or_changed_devices">Følgende personer kan ha reinstallert eller byttet enhet. Bekreft sikkerhetsnummeret ditt med dem for å sikre personvernet.</string>
     <string name="safety_number_change_dialog__view">Vis</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">Tidligere bekreftet</string>
 
     <!-- EnableCallNotificationSettingsDialog__call_notifications_checklist -->
@@ -3086,6 +3135,7 @@
 
     <string name="arrays__default">Forvalgt</string>
     <string name="arrays__high">Høy</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">Maks</string>
 
     <!-- plurals.xml -->
@@ -3357,7 +3407,7 @@
     <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 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>
@@ -3406,6 +3456,14 @@
     <!-- Storage permission row description -->
     <string name="GrantPermissionsFragment__send_photos_videos_and_files">Send bilder, videoer og filer fra enheten din.</string>
 
+    <!-- PermissionDeniedBottomSheet -->
+    <!-- Sheet describing step 1 on how to give permissions by opening settings -->
+    <string name="PermissionDeniedBottomSheet__1_tap_settings_below">1. Tap “Settings” below</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 Allow the permission</string>
+    <!-- Label for button at the bottom of the sheet which opens the system permission settings -->
+    <string name="PermissionDeniedBottomSheet__settings">Settings</string>
+
     <!-- PaymentsSecuritySetupFragment -->
     <!-- Toolbar title -->
     <string name="PaymentsSecuritySetupFragment__security_setup">Sikkerhetsoppsett</string>
@@ -3446,6 +3504,7 @@
     <string name="PaymentsDetailsFragment__sent_to_s">Sendt til %1$s</string>
     <string name="PaymentsDetailsFragment__you_on_s_at_s">Du %1$s på %2$s</string>
     <string name="PaymentsDetailsFragment__s_on_s_at_s">%1$s %2$s på %3$s</string>
+    <!-- Prefix to a name to indicate who a payment was sent to -->
     <string name="PaymentsDetailsFragment__to">Til</string>
     <string name="PaymentsDetailsFragment__from">Fra</string>
     <string name="PaymentsDetailsFragment__information">Transaksjonsinformasjonen, inkludert betalingsbeløp og transaksjonstidspunkt, finner du i MobileCoin-hovedboken.</string>
@@ -3508,6 +3567,7 @@
     <string name="ConfirmPayment__confirm_payment">Bekreft betaling</string>
     <string name="ConfirmPayment__network_fee">Nettverksgebyr</string>
     <string name="ConfirmPayment__estimated_s">Beregnet %1$s</string>
+    <!-- Prefix to a name to indicate who a payment will be sent to -->
     <string name="ConfirmPayment__to">Til</string>
     <string name="ConfirmPayment__total_amount">Totalt beløp</string>
     <string name="ConfirmPayment__balance_s">Saldo: %1$s</string>
@@ -3658,6 +3718,14 @@
     <string name="conversation_group_options__conversation">Samtale</string>
     <string name="conversation_group_options__broadcast">Kringkast</string>
 
+    <!-- DoubleTapEditEducationSheet -->
+    <!-- Displayed as the title of the education bottom sheet -->
+    <string name="DoubleTapEditEducationSheet__double_tap_edit_title">Double tap to edit</string>
+    <!-- Text on the sheet explaining how double tapping on a message will let them edit it -->
+    <string name="DoubleTapEditEducationSheet__quickly_tap_twice">Quickly tap twice on your messages to edit them. You can edit your messages up to 24hrs after they’ve been sent.</string>
+    <!-- Button label to dismiss sheet -->
+    <string name="DoubleTapEditEducationSheet__got_it">Got it</string>
+
     <!-- text_secure_normal -->
     <string name="text_secure_normal__menu_new_group">Ny gruppe</string>
     <string name="text_secure_normal__menu_settings">Innstillinger</string>
@@ -4112,6 +4180,7 @@
     <string name="RecipientBottomSheet_copied_to_clipboard">Kopiert til utklippstavle</string>
 
     <string name="GroupRecipientListItem_admin">Administrator</string>
+    <!-- Button text to approve a user that has requested to join a group -->
     <string name="GroupRecipientListItem_approve_description">Godkjenn</string>
     <string name="GroupRecipientListItem_deny_description">Avslå</string>
 
@@ -4139,6 +4208,7 @@
 
     <!-- VoiceNoteMediaDescriptionCompatFactory -->
     <string name="VoiceNoteMediaItemFactory__voice_message">Lydmelding · %1$s</string>
+    <!-- This is a title in a banner describing the conversation sender to receiver placeholders of the currently playing voice memo. -->
     <string name="VoiceNoteMediaItemFactory__s_to_s">%1$s til %2$s</string>
 
     <!-- StorageUtil -->
@@ -4152,8 +4222,16 @@
     <string name="ReviewCardDialogFragment__review_members">Gå gjennom medlemslisten</string>
     <!-- Title of a screen where the user will be prompted to review a message request matching the name of someone they already know -->
     <string name="ReviewCardDialogFragment__review_request">Se gjennom forespørsel</string>
-    <string name="ReviewCardDialogFragment__d_group_members_have_the_same_name">%1$d gruppemedlemmer har det samme navnet, gå gjennom medlemmene under og velg handling.</string>
-    <string name="ReviewCardDialogFragment__if_youre_not_sure">Hvis du ikke er sikker på hvem forespørselen er fra, se gjennom kontaktene nedenfor og velg handling.</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="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 -->
+    <plurals name="ReviewCardDialogFragment__if_youre_not_sure">
+        <item quantity="one">If you\'re not sure who the request is from, review the contact below and take action.</item>
+        <item quantity="other">If you\'re not sure who the request is from, review the contacts below and take action.</item>
+    </plurals>
     <string name="ReviewCardDialogFragment__no_other_groups_in_common">Ingen andre grupper til felles.</string>
     <string name="ReviewCardDialogFragment__no_groups_in_common">Ingen grupper til felles.</string>
     <plurals name="ReviewCardDialogFragment__d_other_groups_in_common">
@@ -4184,11 +4262,20 @@
     <string name="CallParticipantsListUpdatePopupWindow__s_joined">%1$s ble med</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_and_s_joined">%1$s og %2$s ble med</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_s_and_s_joined">%1$s, %2$s og %3$s ble med</string>
-    <string name="CallParticipantsListUpdatePopupWindow__s_s_and_d_others_joined">%1$s, %2$s og %3$d andre ble med</string>
+    <!-- Toast message shown in group call when 3 or more people join -->
+    <plurals name="CallParticipantsListUpdatePopupWindow__s_s_and_d_others_joined">
+        <item quantity="one">%1$s, %2$s and %3$d other joined</item>
+        <item quantity="other">%1$s, %2$s and %3$d others joined</item>
+    </plurals>
+    <!-- Toast/popup text shown when someone leaves a group call -->
     <string name="CallParticipantsListUpdatePopupWindow__s_left">%1$s forlot</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_and_s_left">%1$s og %2$s forlot</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_s_and_s_left">%1$s, %2$s og %3$s forlot</string>
-    <string name="CallParticipantsListUpdatePopupWindow__s_s_and_d_others_left">%1$s, %2$s og %3$d andre forlot</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 and %3$d other left</item>
+        <item quantity="other">%1$s, %2$s and %3$d others left</item>
+    </plurals>
 
     <string name="CallParticipant__you">Deg</string>
     <string name="CallParticipant__you_on_another_device">Deg (på en annen enhet)</string>
@@ -4558,10 +4645,15 @@
 
     <!-- PrivacySettingsFragment -->
     <string name="PrivacySettingsFragment__blocked">Blokkert</string>
-    <string name="PrivacySettingsFragment__d_contacts">%1$d kontakter</string>
+    <!-- Settings label that shows the number blocked contacts -->
+    <plurals name="PrivacySettingsFragment__d_contacts">
+        <item quantity="one">%1$d contact</item>
+        <item quantity="other">%1$d contacts</item>
+    </plurals>
     <string name="PrivacySettingsFragment__messaging">Meldinger</string>
     <string name="PrivacySettingsFragment__disappearing_messages">Tidsavgrensede meldinger</string>
     <string name="PrivacySettingsFragment__app_security">App-sikkerhet</string>
+    <!-- This refers to the multi-tasking overview (recent apps) from the Android operating system.-->
     <string name="PrivacySettingsFragment__block_screenshots_in_the_recents_list_and_inside_the_app">Blokker skjermbilder i sist brukte-listen og inne i appen</string>
     <string name="PrivacySettingsFragment__signal_message_and_calls">Signal-meldinger og samtaler, omdiriger alle samtaler, og forseglet avsender</string>
     <string name="PrivacySettingsFragment__default_timer_for_new_changes">Standard nedtelling for nye samtaler</string>
@@ -4618,11 +4710,14 @@
     <string name="DataAndStorageSettingsFragment__media_quality">Mediekvalitet</string>
     <string name="DataAndStorageSettingsFragment__sent_media_quality">Sendt mediekvalitet</string>
     <string name="DataAndStorageSettingsFragment__sending_high_quality_media_will_use_more_data">Å sende høykvalitetsmedier vil bruke mer data.</string>
+    <!-- Setting option that can be selected to default media to be sent as high quality by default -->
     <string name="DataAndStorageSettingsFragment__high">Høy</string>
+    <!-- Setting option that can be selected to default media to be sent as standard quality by default -->
     <string name="DataAndStorageSettingsFragment__standard">Standard</string>
     <string name="DataAndStorageSettingsFragment__calls">Samtaler</string>
 
     <!-- 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__use_custom_colors">Bruk selvvalgt farge</string>
     <string name="ChatColorSelectionFragment__chat_color">Samtalefarge</string>
@@ -4834,6 +4929,7 @@
     <string name="AvatarPickerFragment__take_a_picture">Ta et bilde</string>
     <string name="AvatarPickerFragment__choose_a_photo">Velg et bilde</string>
     <string name="AvatarPickerFragment__photo">Bilde</string>
+    <!-- Button label during avatar selection/creation that when tapped lets you generate an avatar from typed in text. -->
     <string name="AvatarPickerFragment__text">Tekst</string>
     <string name="AvatarPickerFragment__save">Lagre</string>
     <string name="AvatarPickerFragment__clear_avatar">Fjern ikon</string>
@@ -4894,7 +4990,7 @@
     <string name="MediaReviewFragment__add_a_message">Legg til en melding</string>
     <string name="MediaReviewFragment__add_a_reply">Legg til et svar</string>
     <string name="MediaReviewFragment__send_to">Send til</string>
-    <string name="MediaReviewFragment__view_once_message">Se én gang-melding</string>
+    <string name="MediaReviewFragment__view_once_message">Mediefiler som vises én gang</string>
     <string name="MediaReviewFragment__one_or_more_items_were_too_large">Elementene er for store</string>
     <string name="MediaReviewFragment__one_or_more_items_were_invalid">Elementene er ugyldige</string>
     <string name="MediaReviewFragment__too_many_items_selected">For mange valgte elementer</string>
@@ -5487,7 +5583,7 @@
     <string name="StoryViewerFragment__s_s">%1$s %2$s</string>
     <!-- Displayed when viewing a post you sent -->
     <string name="StoryViewerPageFragment__you">Deg</string>
-    <!-- Displayed when viewing a post displayed to a group -->
+    <!-- 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 til %2$s</string>
     <!-- Displayed when viewing a post from another user with no replies -->
     <string name="StoryViewerPageFragment__reply">Svar</string>
@@ -6704,5 +6800,26 @@
     <!-- Content description for opening the note editor -->
     <string name="ViewNoteSheet__edit_note">Rediger notat</string>
 
+    <!-- BackupProgressService -->
+    <!-- Notification title shown while backup restore job is running -->
+    <string name="BackupProgressService_title">Gjenoppretter sikkerhetskopi …</string>
+    <!-- Notification title shown while downloading backup restore data -->
+    <string name="BackupProgressService_title_downloading">Laster ned sikkerhetskopi …</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>
+    <!-- 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 -->
+    <string name="BackupsTypeSettingsFragment__google_pay">Google Pay</string>
+    <!-- Displayed as the user\'s payment method as a label in a preference row -->
+    <string name="BackupsTypeSettingsFragment__bank_transfer">Bank transfer</string>
+    <!-- Displayed as the user\'s payment method as a label in a preference row -->
+    <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>
+
+
     <!-- 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 0590f53c43..45974f4126 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -1,6 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- smartling.instruction_comments_enabled = on -->
-<resources>
+<?xml version="1.0" encoding="UTF-8"?><!-- 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> -->
@@ -73,7 +71,7 @@
     <string name="DraftDatabase_Draft_video_snippet">(video)</string>
     <string name="DraftDatabase_Draft_location_snippet">(locatie)</string>
     <string name="DraftDatabase_Draft_quote_snippet">(citaat)</string>
-    <string name="DraftDatabase_Draft_voice_note">(Audiobericht)</string>
+    <string name="DraftDatabase_Draft_voice_note">(Spraakbericht)</string>
 
     <!-- AttachmentKeyboard -->
     <string name="AttachmentKeyboard_gallery">Galerij</string>
@@ -89,6 +87,16 @@
     <string name="AttachmentManager_signal_requires_the_external_storage_permission_in_order_to_attach_photos_videos_or_audio">Molly 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">Molly heeft toegang tot de contacten nodig om contactinformatie in Molly 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">Molly 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>
+
+    <!-- Dialog title asking users for location permission -->
+    <string name="AttachmentManager_signal_allow_access_location">Allow access to your location</string>
+    <!-- Dialog description that will explain the steps needed to give location permission -->
+    <string name="AttachmentManager_signal_to_send_location">To send your location:</string>
+    <!-- Alert dialog description asking for location permission -->
+    <string name="AttachmentManager_signal_allow_signal_access_location">Allow Molly access to send your location.</string>
+    <!-- Toast text explaining Signal\'s need for location access -->
+    <string name="AttachmentManager_signal_needs_location_access">Molly needs location access to send your location.</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>
     <!-- Alert dialog description to send the recipient a request to activate payments -->
@@ -241,7 +249,7 @@
     <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 gespreksgeschiedenis nog weergeven 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>
@@ -386,8 +394,16 @@
     <string name="ConversationActivity_your_request_to_join_has_been_sent_to_the_group_admin">Je verzoek om lid te worden van de groep is doorgestuurd naar een beheerder. Je krijgt een melding zodra deze een besluit heeft genomen.</string>
     <string name="ConversationActivity_cancel_request">Verzoek annuleren</string>
 
-    <string name="ConversationActivity_to_send_audio_messages_allow_signal_access_to_your_microphone">Om audioberichten op te nemen, moet je Molly toegang geven tot je microfoon.</string>
-    <string name="ConversationActivity_signal_requires_the_microphone_permission_in_order_to_send_audio_messages">Molly heeft toegang tot de microfoon nodig om audioberichten te kunnen opnemen, maar deze is pertinent geweigerd. Ga naar de instellingen voor deze app, tik op ‘Machtigingen’ en schakel ‘Microfoon’ in.</string>
+    <!-- Dialog title asking users for microphone permission -->
+    <string name="ConversationActivity_allow_access_microphone">Allow access to your microphone</string>
+    <!-- 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>
+    <!-- Toast text explaining Signal\'s need for microphone access -->
+    <string name="ConversationActivity_signal_needs_microphone_access_voice_message">Molly needs microphone access to record a voice message.</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">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 opnemen, maar deze is pertinent geweigerd. Ga naar de instellingen voor deze app, tik op ‘Machtigingen’ en schakel ‘Camera’ in.</string>
@@ -411,10 +427,17 @@
     <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_delete">Verwijderen</string>
     <string name="ConversationActivity_delete_and_leave">Verwijderen en verlaten</string>
-    <string name="ConversationActivity__to_call_s_signal_needs_access_to_your_microphone">Molly heeft toegang tot je microfoon nodig om %1$s te bellen.</string>
+
+    <!-- Dialog description that will explain the steps needed to give microphone permissions for a voice call -->
+    <string name="ConversationActivity__to_start_call">To start a 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">To start a call, allow Molly access to your microphone.</string>
+    <!-- Toast text explaining Signal\'s need for microphone access for a voice call -->
+    <string name="ConversationActivity_signal_needs_microphone_access_voice_call">Molly needs microphone access to start a call.</string>
 
 
     <string name="ConversationActivity_join">Deelnemen</string>
+    <!-- Button text for an active group call but the call is currently full and unjoinable -->
     <string name="ConversationActivity_full">Vol</string>
 
     <string name="ConversationActivity_error_sending_media">Fout bij het verzenden van media</string>
@@ -613,6 +636,7 @@
     <string name="ConversationListFragment_unarchive">Dearchiveren</string>
     <string name="ConversationListFragment_delete">Verwijderen</string>
     <string name="ConversationListFragment_select_all">Alles selecteren</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 geselecteerd</item>
         <item quantity="other">%1$d geselecteerd</item>
@@ -864,6 +888,7 @@
         <item quantity="one">Uitnodiging verstuurd</item>
         <item quantity="other">%1$d uitnodigingen verstuurd</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">‘%1$s’ kan niet direct door jou worden toegevoegd aan de groep.\n\nIn plaats daarvan heeft deze persoon een uitnodiging gekregen om lid te worden van de groep, en zal geen groepsberichten kunnen zien totdat die de uitnodiging heeft geaccepteerd.</string>
     <string name="GroupManagement_invite_multiple_users">Deze personen kunnen niet direct door jou aan de groep worden toegevoegd.\n\n In plaats daarvan hebben ze een uitnodiging gekregen om lid te worden van de groep, en ze zullen geen groepsberichten kunnen zien totdat ze de uitnodiging hebben geaccepteerd.</string>
 
@@ -1044,7 +1069,9 @@
 
     <string name="ManageGroupActivity_edit_name_and_picture">Naam en afbeelding bewerken</string>
     <string name="ManageGroupActivity_legacy_group">Verouderde groep</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">Dit is een verouderde groep. Om nieuwe functionaliteiten zoals groepsbeheer te kunnen gebruiken moet je een nieuwe groep aanmaken.</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">Dit is een verouderde groep; om nieuwe functionaliteiten te kunnen gebruiken zoals @vermeldingen en beheerders,</string>
     <string name="ManageGroupActivity_legacy_group_too_large">Deze verouderde groep kan niet worden omgezet naar een nieuwe-stijl groep omdat het te veel leden bevat. Het maximum ledenaantal voor een groep is %1$d.</string>
     <string name="ManageGroupActivity_upgrade_this_group">moet je deze groep omzetten.</string>
@@ -1271,6 +1298,7 @@
         <item quantity="other">Verwijderen</item>
     </plurals>
 
+    <!-- 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 geselecteerd (%2$s)</item>
         <item quantity="other">%1$d geselecteerd (%2$s)</item>
@@ -1330,22 +1358,18 @@
     <string name="MediaRepository__camera">Camera</string>
 
     <!-- MessageRecord -->
-    <string name="MessageRecord_unknown">Gebruiker niet bekend</string>
+    <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_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>
-    <!-- Update message shown when placing an outgoing 1:1 voice/audio call and it\'s answered by the other party -->
+    <!-- Update message shown when placing an outgoing 1:1 voice/audio call -->
     <string name="MessageRecord_outgoing_voice_call">Uitgaande spraakoproep</string>
-    <!-- Update message shown when placing an outgoing 1:1 video call and it\'s answered by the other party -->
+    <!-- Update message shown when placing an outgoing 1:1 video call -->
     <string name="MessageRecord_outgoing_video_call">Uitgaande video-oproep</string>
-    <!-- Update message shown when placing an outgoing 1:1 voice/audio call and it\'s not answered by the other party -->
-    <string name="MessageRecord_unanswered_voice_call">Onbeantwoorde spraakoproep</string>
-    <!-- Update message shown when placing an outgoing 1:1 video call and it\'s not answered by the other party -->
-    <string name="MessageRecord_unanswered_video_call">Onbeantwoorde video-oproep</string>
-    <!-- Update message shown when receiving an incoming 1:1 voice/audio call and it\'s answered -->
+    <!-- Update message shown when receiving an incoming 1:1 voice/audio call and it\'s answered or ringing -->
     <string name="MessageRecord_incoming_voice_call">Inkomende spraakoproep</string>
-    <!-- Update message shown when receiving an incoming 1:1 video call and answered -->
+    <!-- Update message shown when receiving an incoming 1:1 video call and answered or ringing -->
     <string name="MessageRecord_incoming_video_call">Inkomende video-oproep</string>
     <!-- Update message shown when receiving an incoming 1:1 voice/audio call and not answered -->
     <string name="MessageRecord_missed_voice_call">Gemiste spraakoproep</string>
@@ -1355,10 +1379,6 @@
     <string name="MessageRecord_missed_voice_call_notification_profile">Gemiste spraakoproep terwijl het meldingsprofiel was ingeschakeld</string>
     <!-- Update message shown when receiving an incoming video call and declined due to notification profile -->
     <string name="MessageRecord_missed_video_call_notification_profile">Gemiste video-oproep terwijl meldingsprofiel was ingeschakeld</string>
-    <!-- Update message shown when receiving an incoming 1:1 voice/audio call and explicitly declined -->
-    <string name="MessageRecord_you_declined_a_voice_call">Je hebt een spraakoproep geweigerd</string>
-    <!-- Update message shown when receiving an incoming 1:1 video call and explicitly declined -->
-    <string name="MessageRecord_you_declined_a_video_call">Je hebt een video-oproep geweigerd</string>
     <!-- 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 heeft de groep aangepast.</string>
@@ -1567,28 +1587,53 @@
     <string name="MessageRecord_can_accept_payments">%1$s kan nu Betalingen accepteren</string>
 
     <!-- Group Calling update messages -->
-    <string name="MessageRecord_s_started_a_group_call_s">%1$s heeft een groepsoproep gestart · %2$s</string>
-    <string name="MessageRecord_you_started_a_group_call_s">Je hebt een groepsoproep gestart · %1$s</string>
-    <string name="MessageRecord_s_is_in_the_group_call_s">%1$s is in deze groepsoproep aanwezig · %2$s</string>
-    <string name="MessageRecord_you_are_in_the_group_call_s1">Je neemt deel aan een groepsoproep · %1$s</string>
-    <string name="MessageRecord_s_and_s_are_in_the_group_call_s1">%1$s en %2$s zijn in deze groepsoproep aanwezig · %3$s</string>
-    <string name="MessageRecord_group_call_s">Groepsoproep · %1$s</string>
-
-    <string name="MessageRecord_s_started_a_group_call">%1$s heeft een groepsoproep gestart</string>
-    <string name="MessageRecord_you_started_a_group_call">Je hebt een groepsoproep gestart</string>
-    <string name="MessageRecord_s_is_in_the_group_call">%1$s is in deze groepsoproep aanwezig</string>
-    <string name="MessageRecord_you_are_in_the_group_call">Je neemt deel aan de groepsoproep</string>
-    <string name="MessageRecord_s_and_s_are_in_the_group_call">%1$s en %2$s zijn in deze groepsoproep aanwezig</string>
-    <string name="MessageRecord_group_call">Groepsoproep</string>
+    <!-- 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 is aanwezig in de oproep · %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">Jij bent aanwezig in de oproep · %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 en %2$s zijn aanwezig in de oproep · %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 is aanwezig in de oproep</string>
+    <!-- Chat log text for an ongoing group call only the local user has joined -->
+    <string name="MessageRecord_you_are_in_the_call">Jij bent aanwezig in de oproep</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 en %2$s zijn aanwezig in de oproep</string>
+    <!-- Chat log text for a group call that ended within the last 5 minutes -->
+    <string name="MessageRecord__the_video_call_has_ended">De video-oproep is beëindigd</string>
+    <!-- Chat log text for a group call that ended within the last 5 minutes with a placeholder for formatted time -->
+    <string name="MessageRecord__the_video_call_has_ended_s">De video-oproep is beëindigd · %1$s</string>
+    <!-- Chat log text for a group call that ended more than 5 minutes ago and was missed -->
+    <string name="MessageRecord__missed_video_call">Gemiste video-oproep</string>
+    <!-- Chat log text for a group call that ended more than 5 minutes ago and was missed with a placeholder for formatted time -->
+    <string name="MessageRecord__missed_video_call_s">Gemiste video-oproep · %1$s</string>
+    <!-- Chat log text for a group call that ended that the local user did not start -->
+    <string name="MessageRecord__incoming_video_call">Inkomende video-oproep</string>
+    <!-- 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">Inkomende video-oproep · %1$s</string>
+    <!-- Chat log text for a group call that ended that the local user started -->
+    <string name="MessageRecord__outgoing_video_call">Uitgaande video-oproep</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">Uitgaande video-oproep · %1$s</string>
+    <!-- Chat log text for an ongoing group call that the local user started -->
+    <string name="MessageRecord__you_started_a_video_call">Je bent een video-oproep gestart</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">Je bent een video-oproep gestart · %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 is een video-oproep gestart</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 is een video-oproep gestart · %2$s</string>
 
     <string name="MessageRecord_you">Jij</string>
 
-    <plurals name="MessageRecord_s_s_and_d_others_are_in_the_group_call_s">
+    <!-- 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 en %3$d ander zijn in deze groepsoproep aanwezig · %4$s</item>
         <item quantity="other">%1$s, %2$s en %3$d anderen zijn in deze groepsoproep aanwezig · %4$s</item>
     </plurals>
 
-    <plurals name="MessageRecord_s_s_and_d_others_are_in_the_group_call">
+    <!-- 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 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>
     </plurals>
@@ -2063,6 +2108,7 @@
     <!-- 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_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">Molly Android - Telefoonnummerformaat</string>
     <!--    Small "toast" notification to the user confirming that they have requested a new code via voice call.-->
@@ -2207,7 +2253,7 @@
     <string name="SubmitDebugLogActivity_this_log_will_be_posted_publicly_online_for_contributors">Dit log bevat geen persoonlijke details zoals telefoonnummers. Als je op uploaden tikt dan wordt dit log 30 dagen lang online beschikbaar gesteld op een unieke nergens onthulde URL. Die URL kun je zelf naar de ontwikkelaars sturen.</string>
 
     <!-- SupportEmailUtil -->
-  <!-- Removed by excludeNonTranslatables <string name="SupportEmailUtil_support_email" translatable="false">support@molly.im</string> -->
+  <!-- Removed by excludeNonTranslatables <string name="SupportEmailUtil_support_email" translatable="false">support@signal.org</string> -->
     <string name="SupportEmailUtil_filter">Filter:</string>
     <string name="SupportEmailUtil_device_info">Apparaatinformatie:</string>
     <string name="SupportEmailUtil_android_version">Android-versie:</string>
@@ -2250,7 +2296,7 @@
     <string name="ThreadRecord_hidden_recipient">Je hebt deze persoon verborgen. Als je hem of haar opnieuw een bericht stuurt, wordt diegene weer aan je lijst toegevoegd.</string>
     <string name="ThreadRecord_photo">Afbeelding</string>
     <string name="ThreadRecord_gif">GIF</string>
-    <string name="ThreadRecord_voice_message">Audiobericht</string>
+    <string name="ThreadRecord_voice_message">Spraakbericht</string>
     <string name="ThreadRecord_file">Bestand</string>
     <string name="ThreadRecord_video">Video</string>
     <string name="ThreadRecord_chat_session_refreshed">Chatsessie vernieuwd</string>
@@ -2476,7 +2522,7 @@
     <string name="NotificationChannel_other">Anders</string>
     <string name="NotificationChannel_group_chats">Chats</string>
     <string name="NotificationChannel_missing_display_name">Onbekend</string>
-    <string name="NotificationChannel_voice_notes">Audioberichten</string>
+    <string name="NotificationChannel_voice_notes">Spraakberichten</string>
     <string name="NotificationChannel_contact_joined_signal">Nieuw persoon bereikbaar via Signal</string>
     <string name="NotificationChannels__no_activity_available_to_open_notification_channel_settings">Geen ‘activiteit’ beschikbaar om instellingen voor meldingskanalen mee te openen.</string>
     <!-- Notification channel name for showing persistent background connection on devices without push notifications -->
@@ -2709,6 +2755,8 @@
     <string name="ConversationUpdateItem_loading">Aan het laden</string>
     <string name="ConversationUpdateItem_learn_more">Meer lezen</string>
     <string name="ConversationUpdateItem_join_call">Aan oproep deelnemen</string>
+    <!-- Action button label for starting a new call in the current conversation -->
+    <string name="ConversationUpdateItem_call_back">Terugbellen</string>
     <string name="ConversationUpdateItem_return_to_call">Naar de oproep terugkeren</string>
     <string name="ConversationUpdateItem_call_is_full">De oproep is vol</string>
     <string name="ConversationUpdateItem_invite_friends">Vrienden uitnodigen</string>
@@ -2773,6 +2821,7 @@
     <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__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>
 
     <!-- EnableCallNotificationSettingsDialog__call_notifications_checklist -->
@@ -2861,7 +2910,7 @@
     </plurals>
 
     <!-- giphy_activity -->
-    <string name="giphy_activity_toolbar__search_gifs">GIFs zoeken</string>
+    <string name="giphy_activity_toolbar__search_gifs">GIF\'s zoeken</string>
 
     <!-- giphy_fragment -->
     <string name="giphy_fragment__nothing_found">Niets gevonden</string>
@@ -3086,6 +3135,7 @@
 
     <string name="arrays__default">Systeemstandaard</string>
     <string name="arrays__high">Hoog</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">Maximaal</string>
 
     <!-- plurals.xml -->
@@ -3357,7 +3407,7 @@
     <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 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>
@@ -3396,7 +3446,7 @@
     <!-- Contacts permission row title -->
     <string name="GrantPermissionsFragment__contacts">Contacten</string>
     <!-- Contacts permission row description -->
-    <string name="GrantPermissionsFragment__find_people_you_know">Vind mensen die je kent. Je contacten zijn versleuteld en niet zichtbaar voor de Signal-service.</string>
+    <string name="GrantPermissionsFragment__find_people_you_know">Vind mensen die je kent. Je contacten zijn versleuteld en niet zichtbaar voor de Signal-dienst.</string>
     <!-- Phone calls permission row title -->
     <string name="GrantPermissionsFragment__phone_calls">Telefoonoproepen</string>
     <!-- Phone calls permission row description -->
@@ -3406,6 +3456,14 @@
     <!-- Storage permission row description -->
     <string name="GrantPermissionsFragment__send_photos_videos_and_files">Verstuur foto\'s, video\'s en bestanden vanaf je apparaat.</string>
 
+    <!-- PermissionDeniedBottomSheet -->
+    <!-- Sheet describing step 1 on how to give permissions by opening settings -->
+    <string name="PermissionDeniedBottomSheet__1_tap_settings_below">1. Tap “Settings” below</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 Allow the permission</string>
+    <!-- Label for button at the bottom of the sheet which opens the system permission settings -->
+    <string name="PermissionDeniedBottomSheet__settings">Settings</string>
+
     <!-- PaymentsSecuritySetupFragment -->
     <!-- Toolbar title -->
     <string name="PaymentsSecuritySetupFragment__security_setup">Veiligheidsinstellingen</string>
@@ -3446,6 +3504,7 @@
     <string name="PaymentsDetailsFragment__sent_to_s">Verzonden aan %1$s</string>
     <string name="PaymentsDetailsFragment__you_on_s_at_s">jou op %1$s om %2$s</string>
     <string name="PaymentsDetailsFragment__s_on_s_at_s">%1$s op %2$s om %3$s</string>
+    <!-- Prefix to a name to indicate who a payment was sent to -->
     <string name="PaymentsDetailsFragment__to">Naar</string>
     <string name="PaymentsDetailsFragment__from">Van</string>
     <string name="PaymentsDetailsFragment__information">Transactiegegevens, waaronder het bedrag en het tijdstip van de transactie, zijn onderdeel van het kasboek van MobileCoin.</string>
@@ -3508,6 +3567,7 @@
     <string name="ConfirmPayment__confirm_payment">Betaling bevestigen</string>
     <string name="ConfirmPayment__network_fee">Netwerkkosten</string>
     <string name="ConfirmPayment__estimated_s">Naar schatting %1$s</string>
+    <!-- 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>
@@ -3658,6 +3718,14 @@
     <string name="conversation_group_options__conversation">Chatten</string>
     <string name="conversation_group_options__broadcast">Uitzenden</string>
 
+    <!-- DoubleTapEditEducationSheet -->
+    <!-- Displayed as the title of the education bottom sheet -->
+    <string name="DoubleTapEditEducationSheet__double_tap_edit_title">Double tap to edit</string>
+    <!-- Text on the sheet explaining how double tapping on a message will let them edit it -->
+    <string name="DoubleTapEditEducationSheet__quickly_tap_twice">Quickly tap twice on your messages to edit them. You can edit your messages up to 24hrs after they’ve been sent.</string>
+    <!-- Button label to dismiss sheet -->
+    <string name="DoubleTapEditEducationSheet__got_it">Got it</string>
+
     <!-- text_secure_normal -->
     <string name="text_secure_normal__menu_new_group">Nieuwe groep</string>
     <string name="text_secure_normal__menu_settings">Instellingen</string>
@@ -3719,7 +3787,7 @@
     <string name="CreateKbsPinFragment__create_a_new_pin">Nieuwe pincode aanmaken</string>
     <string name="CreateKbsPinFragment__you_can_choose_a_new_pin_as_long_as_this_device_is_registered">Je kunt je pincode nu nog wijzigen omdat je telefoonnummer nog voor dit apparaat geregistreerd staat. Wanneer je telefoonnummer niet meer geregistreerd staat voor dit apparaat, dan kun je de pincode niet langer wijzigen en ook niet teruglezen. Het is daarom belangrijk dat je je pincode onthoudt.</string>
     <string name="CreateKbsPinFragment__create_your_pin">Pincode aanmaken</string>
-    <string name="CreateKbsPinFragment__pins_can_help_you_restore_your_account">Pincodes kunnen je helpen je account te herstellen en je informatie versleuteld te houden met Signal. </string>
+    <string name="CreateKbsPinFragment__pins_can_help_you_restore_your_account">Pincodes kunnen je helpen je account te herstellen en je informatie versleuteld te houden op Signal. </string>
     <string name="CreateKbsPinFragment__choose_a_stronger_pin">Verzin een sterkere pincode</string>
 
     <!-- ConfirmKbsPinFragment -->
@@ -4112,6 +4180,7 @@
     <string name="RecipientBottomSheet_copied_to_clipboard">Gekopieerd naar klembord</string>
 
     <string name="GroupRecipientListItem_admin">Beheerder</string>
+    <!-- Button text to approve a user that has requested to join a group -->
     <string name="GroupRecipientListItem_approve_description">Toestaan</string>
     <string name="GroupRecipientListItem_deny_description">Afwijzen</string>
 
@@ -4135,10 +4204,11 @@
     <string name="GroupLinkBottomSheet_the_link_is_not_currently_active">De link is momenteel niet actief</string>
 
     <!-- VoiceNotePlaybackPreparer -->
-    <string name="VoiceNotePlaybackPreparer__failed_to_play_voice_message">Het afspelen van het audiobericht is mislukt</string>
+    <string name="VoiceNotePlaybackPreparer__failed_to_play_voice_message">Het afspelen van het spraakbericht is mislukt</string>
 
     <!-- VoiceNoteMediaDescriptionCompatFactory -->
-    <string name="VoiceNoteMediaItemFactory__voice_message">Audiobericht · %1$s</string>
+    <string name="VoiceNoteMediaItemFactory__voice_message">Spraakbericht · %1$s</string>
+    <!-- This is a title in a banner describing the conversation sender to receiver placeholders of the currently playing voice memo. -->
     <string name="VoiceNoteMediaItemFactory__s_to_s">%1$s naar %2$s</string>
 
     <!-- StorageUtil -->
@@ -4152,8 +4222,16 @@
     <string name="ReviewCardDialogFragment__review_members">Groepsleden vergelijken</string>
     <!-- Title of a screen where the user will be prompted to review a message request matching the name of someone they already know -->
     <string name="ReviewCardDialogFragment__review_request">Personen vergelijken</string>
-    <string name="ReviewCardDialogFragment__d_group_members_have_the_same_name">%1$d groepsleden hebben dezelfde naam. Vergelijk deze groepsleden hieronder en onderneem actie indien je denkt dat een van hen zich probeert voor te doen als de ander.</string>
-    <string name="ReviewCardDialogFragment__if_youre_not_sure">Vergelijk, als je niet zeker bent van wie het gespreksverzoek afkomstig is, de personen hieronder en onderneem actie indien je denkt dat een van hen zich probeert voor te doen als de ander.</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="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 -->
+    <plurals name="ReviewCardDialogFragment__if_youre_not_sure">
+        <item quantity="one">If you\'re not sure who the request is from, review the contact below and take action.</item>
+        <item quantity="other">If you\'re not sure who the request is from, review the contacts below and take action.</item>
+    </plurals>
     <string name="ReviewCardDialogFragment__no_other_groups_in_common">Geen andere gemeenschappelijke groepen</string>
     <string name="ReviewCardDialogFragment__no_groups_in_common">Geen gemeenschappelijke groepen</string>
     <plurals name="ReviewCardDialogFragment__d_other_groups_in_common">
@@ -4184,11 +4262,20 @@
     <string name="CallParticipantsListUpdatePopupWindow__s_joined">%1$s neemt nu deel aan deze oproep</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_and_s_joined">%1$s en %2$s nemen nu deel</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_s_and_s_joined">%1$s, %2$s en %3$s nemen nu deel</string>
-    <string name="CallParticipantsListUpdatePopupWindow__s_s_and_d_others_joined">%1$s, %2$s en %3$d andere nemen nu deel</string>
+    <!-- Toast message shown in group call when 3 or more people join -->
+    <plurals name="CallParticipantsListUpdatePopupWindow__s_s_and_d_others_joined">
+        <item quantity="one">%1$s, %2$s and %3$d other joined</item>
+        <item quantity="other">%1$s, %2$s and %3$d others joined</item>
+    </plurals>
+    <!-- Toast/popup text shown when someone leaves a group call -->
     <string name="CallParticipantsListUpdatePopupWindow__s_left">%1$s heeft de oproep verlaten</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_and_s_left">%1$s en %2$s hebben de oproep verlaten</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_s_and_s_left">%1$s, %2$s en %3$s hebben de oproep verlaten</string>
-    <string name="CallParticipantsListUpdatePopupWindow__s_s_and_d_others_left">%1$s, %2$s en %3$d andere hebben de oproep verlaten</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 and %3$d other left</item>
+        <item quantity="other">%1$s, %2$s and %3$d others left</item>
+    </plurals>
 
     <string name="CallParticipant__you">Jij</string>
     <string name="CallParticipant__you_on_another_device">Jij (vanaf een ander apparaat)</string>
@@ -4558,10 +4645,15 @@
 
     <!-- PrivacySettingsFragment -->
     <string name="PrivacySettingsFragment__blocked">Geblokkeerd</string>
-    <string name="PrivacySettingsFragment__d_contacts">%1$d personen &amp; groepen</string>
+    <!-- Settings label that shows the number blocked contacts -->
+    <plurals name="PrivacySettingsFragment__d_contacts">
+        <item quantity="one">%1$d contact</item>
+        <item quantity="other">%1$d contacts</item>
+    </plurals>
     <string name="PrivacySettingsFragment__messaging">Berichten</string>
     <string name="PrivacySettingsFragment__disappearing_messages">Verdwijnende berichten</string>
     <string name="PrivacySettingsFragment__app_security">App-beveiliging</string>
+    <!-- This refers to the multi-tasking overview (recent apps) from the Android operating system.-->
     <string name="PrivacySettingsFragment__block_screenshots_in_the_recents_list_and_inside_the_app">Screenshots in de lijst van recent geopende apps en in de app blokkeren</string>
     <string name="PrivacySettingsFragment__signal_message_and_calls">Signal-berichten en -oproepen, alle oproepen omleiden en verzegelde afzender.</string>
     <string name="PrivacySettingsFragment__default_timer_for_new_changes">Standaardtimer voor nieuwe chats</string>
@@ -4618,11 +4710,14 @@
     <string name="DataAndStorageSettingsFragment__media_quality">Mediakwaliteit</string>
     <string name="DataAndStorageSettingsFragment__sent_media_quality">Media-verzendkwaliteit</string>
     <string name="DataAndStorageSettingsFragment__sending_high_quality_media_will_use_more_data">Als je media in hoge kwaliteit verzendt, verbruik je meer data.</string>
+    <!-- Setting option that can be selected to default media to be sent as high quality by default -->
     <string name="DataAndStorageSettingsFragment__high">Hoog</string>
+    <!-- Setting option that can be selected to default media to be sent as standard quality by default -->
     <string name="DataAndStorageSettingsFragment__standard">Standaard</string>
     <string name="DataAndStorageSettingsFragment__calls">Oproepen</string>
 
     <!-- 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__use_custom_colors">Zelfgekozen kleur gebruiken</string>
     <string name="ChatColorSelectionFragment__chat_color">Chatkleur</string>
@@ -4689,7 +4784,7 @@
     <string name="KeyboardPagerFragment_open_gif_search">GIF zoeken</string>
     <string name="KeyboardPagerFragment_stickers">Stickers</string>
     <string name="KeyboardPagerFragment_backspace">Backspace</string>
-    <string name="KeyboardPagerFragment_gifs">GIFs</string>
+    <string name="KeyboardPagerFragment_gifs">GIF\'s</string>
     <string name="KeyboardPagerFragment_search_emoji">Emoji zoeken</string>
     <string name="KeyboardPagerfragment_back_to_emoji">Terug naar emoji-overzicht</string>
     <string name="KeyboardPagerfragment_clear_search_entry">Zoekveld leegmaken</string>
@@ -4821,11 +4916,11 @@
 
     <!-- VoiceNotePlayerView -->
     <string name="VoiceNotePlayerView__dot_s">· %1$s</string>
-    <string name="VoiceNotePlayerView__stop_voice_message">Audiobericht afspelen stoppen</string>
+    <string name="VoiceNotePlayerView__stop_voice_message">Spraakbericht afspelen stoppen</string>
     <string name="VoiceNotePlayerView__change_voice_message_speed">Audioafspeelsnelheid aanpassen</string>
-    <string name="VoiceNotePlayerView__pause_voice_message">Audiobericht pauzeren</string>
-    <string name="VoiceNotePlayerView__play_voice_message">Audiobericht afspelen</string>
-    <string name="VoiceNotePlayerView__navigate_to_voice_message">Naar audiobericht navigeren</string>
+    <string name="VoiceNotePlayerView__pause_voice_message">Spraakbericht pauzeren</string>
+    <string name="VoiceNotePlayerView__play_voice_message">Spraakbericht afspelen</string>
+    <string name="VoiceNotePlayerView__navigate_to_voice_message">Naar spraakbericht navigeren</string>
 
 
     <!-- AvatarPickerFragment -->
@@ -4834,6 +4929,7 @@
     <string name="AvatarPickerFragment__take_a_picture">Neem een foto</string>
     <string name="AvatarPickerFragment__choose_a_photo">Kies een afbeelding</string>
     <string name="AvatarPickerFragment__photo">Galerij</string>
+    <!-- Button label during avatar selection/creation that when tapped lets you generate an avatar from typed in text. -->
     <string name="AvatarPickerFragment__text">Tekst</string>
     <string name="AvatarPickerFragment__save">Opslaan</string>
     <string name="AvatarPickerFragment__clear_avatar">Profielafbeelding verwijderen</string>
@@ -4894,7 +4990,7 @@
     <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>
-    <string name="MediaReviewFragment__view_once_message">Eenmaligeweergave-bericht</string>
+    <string name="MediaReviewFragment__view_once_message">Eenmaligeweergave-media</string>
     <string name="MediaReviewFragment__one_or_more_items_were_too_large">Een of meerdere items zijn te groot</string>
     <string name="MediaReviewFragment__one_or_more_items_were_invalid">Een of meerdere items zijn ongeldig</string>
     <string name="MediaReviewFragment__too_many_items_selected">Te veel items geselecteerd</string>
@@ -5487,7 +5583,7 @@
     <string name="StoryViewerFragment__s_s">%1$s %2$s</string>
     <!-- Displayed when viewing a post you sent -->
     <string name="StoryViewerPageFragment__you">Jij</string>
-    <!-- Displayed when viewing a post displayed to a group -->
+    <!-- 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 naar %2$s</string>
     <!-- Displayed when viewing a post from another user with no replies -->
     <string name="StoryViewerPageFragment__reply">Reageren</string>
@@ -6704,5 +6800,26 @@
     <!-- Content description for opening the note editor -->
     <string name="ViewNoteSheet__edit_note">Notitie bewerken</string>
 
+    <!-- BackupProgressService -->
+    <!-- Notification title shown while backup restore job is running -->
+    <string name="BackupProgressService_title">Back-upgegevens aan het terugzetten…</string>
+    <!-- Notification title shown while downloading backup restore data -->
+    <string name="BackupProgressService_title_downloading">Back-upgegevens aan het downloaden…</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>
+    <!-- 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 -->
+    <string name="BackupsTypeSettingsFragment__google_pay">Google Pay</string>
+    <!-- Displayed as the user\'s payment method as a label in a preference row -->
+    <string name="BackupsTypeSettingsFragment__bank_transfer">Bank transfer</string>
+    <!-- Displayed as the user\'s payment method as a label in a preference row -->
+    <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>
+
+
     <!-- 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 32031cba0c..4291dce0a9 100644
--- a/app/src/main/res/values-pa/strings.xml
+++ b/app/src/main/res/values-pa/strings.xml
@@ -1,6 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- smartling.instruction_comments_enabled = on -->
-<resources>
+<?xml version="1.0" encoding="UTF-8"?><!-- 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> -->
@@ -89,6 +87,16 @@
     <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">Allow access to your location</string>
+    <!-- Dialog description that will explain the steps needed to give location permission -->
+    <string name="AttachmentManager_signal_to_send_location">To send your location:</string>
+    <!-- Alert dialog description asking for location permission -->
+    <string name="AttachmentManager_signal_allow_signal_access_location">Allow Molly access to send your location.</string>
+    <!-- Toast text explaining Signal\'s need for location access -->
+    <string name="AttachmentManager_signal_needs_location_access">Molly needs location access to send your location.</string>
+
     <!-- Alert dialog title to show the recipient has not activated payments -->
     <string name="AttachmentManager__not_activated_payments">%1$s ਨੇ ਭੁਗਤਾਨ ਫੀਚਰ ਨੂੰ ਐਕਟੀਵੇਟ ਨਹੀਂ ਕੀਤਾ ਹੈ </string>
     <!-- Alert dialog description to send the recipient a request to activate payments -->
@@ -241,7 +249,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>
@@ -386,8 +394,16 @@
     <string name="ConversationActivity_your_request_to_join_has_been_sent_to_the_group_admin">ਤੁਹਾਡੀ ਸ਼ਾਮਲ ਹੋਣ ਦੀ ਬੇਨਤੀ ਗਰੁੱਪ ਪਰਸ਼ਾਸ਼ਕ ਨੂੰ ਭੇਜ ਦਿੱਤੀ ਗਈ ਹੈ। ਜਦੋਂ ਉਹ ਕਾਰਵਾਈ ਕਰਨਗੇ ਤਾਂ ਤੂਹਾਨੂੰ ਸੂਚਿਤ ਕੀਤਾ ਜਾਵੇਗਾ।</string>
     <string name="ConversationActivity_cancel_request">ਬੇਨਤੀ ਨੂੰ ਰੱਦ ਕਰੋ</string>
 
-    <string name="ConversationActivity_to_send_audio_messages_allow_signal_access_to_your_microphone">ਆਡੀਓ ਸੁਨੇਹੇ ਭੇਜਣ ਲਈ, Molly ਨੂੰ ਆਪਣੇ ਮਾਈਕ੍ਰੋਫ਼ੋਨ ਤਕ ਪਹੁੰਚ ਦਿਓ।</string>
+    <!-- Dialog title asking users for microphone permission -->
+    <string name="ConversationActivity_allow_access_microphone">Allow access to your microphone</string>
+    <!-- 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>
+    <!-- Toast text explaining Signal\'s need for microphone access -->
+    <string name="ConversationActivity_signal_needs_microphone_access_voice_message">Molly needs microphone access to record a voice message.</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 ਨੂੰ ਕਾਲ ਕਰਨ ਲਈ 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>
@@ -411,10 +427,17 @@
     <string name="ConversationActivity_you_will_leave_this_group_and_it_will_be_deleted_from_all_of_your_devices">ਤੁਸੀਂ ਇਸ ਗਰੁੱਪ ਨੂੰ ਛੱਡ ਦਿਓਗੇ, ਅਤੇ ਇਸ ਨੂੰ ਤੁਹਾਡੇ ਸਾਰੇ ਡਿਵਾਈਸਾਂ ਵਿੱਚੋਂ ਮਿਟਾ ਦਿੱਤਾ ਜਾਵੇਗਾ।</string>
     <string name="ConversationActivity_delete">ਮਿਟਾਓ</string>
     <string name="ConversationActivity_delete_and_leave">ਹਟਾਓ ਅਤੇ ਛੱਡੋ</string>
-    <string name="ConversationActivity__to_call_s_signal_needs_access_to_your_microphone">%1$s ਨੂੰ ਕਾਲ ਕਰਨ ਲਈ, Molly ਨੂੰ ਤੁਹਾਡੇ ਮਾਈਕ੍ਰੋਫ਼ੋਨ ਤੱਕ ਪਹੁੰਚ ਦੀ ਲੋੜ ਹੈ</string>
+
+    <!-- Dialog description that will explain the steps needed to give microphone permissions for a voice call -->
+    <string name="ConversationActivity__to_start_call">To start a 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">To start a call, allow Molly access to your microphone.</string>
+    <!-- Toast text explaining Signal\'s need for microphone access for a voice call -->
+    <string name="ConversationActivity_signal_needs_microphone_access_voice_call">Molly needs microphone access to start a call.</string>
 
 
     <string name="ConversationActivity_join">ਸ਼ਾਮਲ ਹੋਵੋ</string>
+    <!-- Button text for an active group call but the call is currently full and unjoinable -->
     <string name="ConversationActivity_full">ਪੂਰਾ</string>
 
     <string name="ConversationActivity_error_sending_media">ਮੀਡੀਆ ਭੇਜਣ ਦੌਰਾਨ ਤਰੁੱਟੀ</string>
@@ -613,6 +636,7 @@
     <string name="ConversationListFragment_unarchive">ਅਨਆਰਕਾਈਵ ਕਰੋ</string>
     <string name="ConversationListFragment_delete">ਮਿਟਾਓ</string>
     <string name="ConversationListFragment_select_all">ਸਭ ਚੁਣੋ</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ਚੁਣਿਆ</item>
         <item quantity="other">%1$dਚੁਣੇ</item>
@@ -864,6 +888,7 @@
         <item quantity="one">ਸੱਦਾ ਭੇਜਿਆ ਗਿਆ</item>
         <item quantity="other">%1$d ਸੱਦੇ ਭੇਜੇ ਗਏ</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">“%1$s” ਨੂੰ ਤੁਹਾਡੇ ਵੱਲੋਂ ਇਸ ਗਰੁੱਪ ਵਿੱਚ ਆਪਣੇ-ਆਪ ਸ਼ਾਮਲ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ।\n\nਉਹਨਾਂ ਨੂੰ ਸ਼ਾਮਲ ਹੋਣ ਲਈ ਸੱਦਾ ਦਿੱਤਾ ਗਿਆ ਹੈ, ਅਤੇ ਜਦੋਂ ਤੱਕ ਉਹ ਮਨਜ਼ੂਰ ਨਹੀਂ ਕਰ ਲੈਂਦੇ, ਉਦੋਂ ਤੱਕ ਗਰੁੱਪ ਦੇ ਕੋਈ ਸੁਨੇਹੇ ਨਹੀਂ ਦੇਖ ਸਕਣਗੇ।</string>
     <string name="GroupManagement_invite_multiple_users">ਇਹਨਾਂ ਵਰਤੋਂਕਾਰਾਂ ਨੂੰ ਤੁਹਾਡੇ ਵੱਲੋਂ ਇਸ ਗਰੁੱਪ ਵਿੱਚ ਆਪਣੇ-ਆਪ ਸ਼ਾਮਲ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ।\n\nਉਹਨਾਂ ਨੂੰ ਗਰੁੱਪ ਵਿੱਚ ਸ਼ਾਮਲ ਹੋਣ ਲਈ ਸੱਦਾ ਦਿੱਤਾ ਗਿਆ ਹੈ, ਅਤੇ ਜਦੋਂ ਤੱਕ ਉਹ ਮਨਜ਼ੂਰ ਨਹੀਂ ਕਰ ਲੈਂਦੇ, ਉਦੋਂ ਤੱਕ ਗਰੁੱਪ ਦੇ ਕੋਈ ਸੁਨੇਹੇ ਨਹੀਂ ਦੇਖ ਸਕਣਗੇ।</string>
 
@@ -1044,7 +1069,9 @@
 
     <string name="ManageGroupActivity_edit_name_and_picture">ਨਾਮ ਅਤੇ ਤਸਵੀਰ ਨੂੰ ਸੋਧੋ</string>
     <string name="ManageGroupActivity_legacy_group">ਲੈਗਸੀ ਗਰੁੱਪ</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">ਇਹ ਇੱਕ ਲੈਗਸੀ ਗਰੁੱਪ ਹੈ। ਗਰੁੱਪ ਪਰਸ਼ਾਸ਼ਕ ਵਰਗੀਆਂ ਵਿਸ਼ੇਸ਼ਤਾਵਾਂ ਸਿਰਫ਼ ਨਵੇਂ ਗਰੁੱਪਾਂ ਲਈ ਉਪਲਬਧ ਹਨ।</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">ਇਹ ਇੱਕ ਲੈਗਸੀ ਗਰੁੱਪ ਹੈ। @mentions ਅਤੇ ਐਡਮਿਨਾਂ ਵਰਗੀਆਂ ਨਵੀਆਂ ਵਿਸ਼ੇਸ਼ਤਾਵਾਂ ਤੱਕ ਪਹੁੰਚ ਕਰਨ ਲਈ,</string>
     <string name="ManageGroupActivity_legacy_group_too_large">ਇਸ ਲੈਗਸੀ ਗਰੁੱਪ ਨੂੰ ਕਿਸੇ ਨਵੇਂ ਗਰੁੱਪ ਵਿੱਚ ਅੱਪਗ੍ਰੇਡ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ ਕਿਉਂਕਿ ਇਹ ਬਹੁਤ ਵੱਡਾ ਹੈ। ਗਰੁੱਪ ਦਾ ਵੱਧ ਤੋਂ ਵੱਧ ਆਕਾਰ %1$d ਹੈ।</string>
     <string name="ManageGroupActivity_upgrade_this_group">ਇਸ ਗਰੁੱਪ ਨੂੰ ਅੱਪਗ੍ਰੇਡ ਕਰੋ।</string>
@@ -1271,6 +1298,7 @@
         <item quantity="other">ਮਿਟਾਓ</item>
     </plurals>
 
+    <!-- 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ਚੁਣਿਆ (%2$s)</item>
         <item quantity="other">%1$d ਚੁਣੇ (%2$s)</item>
@@ -1335,17 +1363,13 @@
     <string name="MessageRecord_left_group">ਤੁਸੀਂ ਗਰੁੱਪ ਛੱਡ ਦਿੱਤਾ ਹੈ।</string>
     <string name="MessageRecord_you_updated_group">ਤੁਸੀਂ ਗਰੁੱਪ ਨੂੰ ਅੱਪਡੇਟ ਕੀਤਾ।</string>
     <string name="MessageRecord_the_group_was_updated">ਗਰੁੱਪ ਨੂੰ ਅੱਪਡੇਟ ਕੀਤਾ ਗਿਆ ਸੀ।</string>
-    <!-- Update message shown when placing an outgoing 1:1 voice/audio call and it\'s answered by the other party -->
+    <!-- Update message shown when placing an outgoing 1:1 voice/audio call -->
     <string name="MessageRecord_outgoing_voice_call">ਆਊਟਗੋਇੰਗ ਵੌਇਸ ਕਾਲ</string>
-    <!-- Update message shown when placing an outgoing 1:1 video call and it\'s answered by the other party -->
+    <!-- Update message shown when placing an outgoing 1:1 video call -->
     <string name="MessageRecord_outgoing_video_call">ਆਊਟਗੋਇੰਗ ਵੀਡੀਓ ਕਾਲ</string>
-    <!-- Update message shown when placing an outgoing 1:1 voice/audio call and it\'s not answered by the other party -->
-    <string name="MessageRecord_unanswered_voice_call">ਵੌਇਸ ਕਾਲ ਨਹੀਂ ਚੁੱਕੀ ਗਈ</string>
-    <!-- Update message shown when placing an outgoing 1:1 video call and it\'s not answered by the other party -->
-    <string name="MessageRecord_unanswered_video_call">ਵੀਡੀਓ ਕਾਲ ਨਹੀਂ ਚੁੱਕੀ ਗਈ</string>
-    <!-- Update message shown when receiving an incoming 1:1 voice/audio call and it\'s answered -->
+    <!-- Update message shown when receiving an incoming 1:1 voice/audio call and it\'s answered or ringing -->
     <string name="MessageRecord_incoming_voice_call">ਇਨਕਮਿੰਗ ਵੌਇਸ ਕਾਲ</string>
-    <!-- Update message shown when receiving an incoming 1:1 video call and answered -->
+    <!-- Update message shown when receiving an incoming 1:1 video call and answered or ringing -->
     <string name="MessageRecord_incoming_video_call">ਇਨਕਮਿੰਗ ਵੀਡੀਓ ਕਾਲ</string>
     <!-- Update message shown when receiving an incoming 1:1 voice/audio call and not answered -->
     <string name="MessageRecord_missed_voice_call">ਵੌਇਸ ਕਾਲ ਮਿਸ ਹੋਈ</string>
@@ -1355,10 +1379,6 @@
     <string name="MessageRecord_missed_voice_call_notification_profile">ਸੂਚਨਾ ਪ੍ਰੋਫਾਈਲ ਦੇ ਚਾਲੂ ਹੋਣ ਦੌਰਾਨ ਵੌਇਸ ਕਾਲ ਮਿਸ ਹੋਈ</string>
     <!-- Update message shown when receiving an incoming video call and declined due to notification profile -->
     <string name="MessageRecord_missed_video_call_notification_profile">ਸੂਚਨਾ ਪ੍ਰੋਫਾਈਲ ਦੇ ਚਾਲੂ ਹੋਣ ਦੌਰਾਨ ਵੀਡੀਓ ਕਾਲ ਮਿਸ ਹੋਈ</string>
-    <!-- Update message shown when receiving an incoming 1:1 voice/audio call and explicitly declined -->
-    <string name="MessageRecord_you_declined_a_voice_call">ਤੁਸੀਂ ਵੌਇਸ ਕਾਲ ਨੂੰ ਅਸਵੀਕਾਰ ਕੀਤਾ</string>
-    <!-- Update message shown when receiving an incoming 1:1 video call and explicitly declined -->
-    <string name="MessageRecord_you_declined_a_video_call">ਤੁਸੀਂ ਵੀਡੀਓ ਕਾਲ ਨੂੰ ਅਸਵੀਕਾਰ ਕੀਤਾ</string>
     <!-- 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>
@@ -1567,30 +1587,55 @@
     <string name="MessageRecord_can_accept_payments">%1$s ਹੁਣ ਭੁਗਤਾਨ ਸਵੀਕਾਰ ਕਰ ਸਕਦੇ ਹਨ</string>
 
     <!-- Group Calling update messages -->
-    <string name="MessageRecord_s_started_a_group_call_s">%1$s ਨੇ ਗਰੁੱਪ ਕਾਲ ਸ਼ੁਰੂ ਕੀਤੀ · %2$s</string>
-    <string name="MessageRecord_you_started_a_group_call_s">ਤੁਸੀਂ ਗਰੁੱਪ ਕਾਲ ਸ਼ੁਰੂ ਕੀਤੀ · %1$s</string>
-    <string name="MessageRecord_s_is_in_the_group_call_s">%1$s ਗਰੁੱਪ ਕਾਲ ਵਿੱਚ ਹੈ · %2$s</string>
-    <string name="MessageRecord_you_are_in_the_group_call_s1">ਤੁਸੀਂ ਗਰੁੱਪ ਕਾਲ ਵਿੱਚ ਹੋ · %1$s</string>
-    <string name="MessageRecord_s_and_s_are_in_the_group_call_s1">%1$s ਅਤੇ %2$s ਗਰੁੱਪ ਕਾਲ ਵਿੱਚ ਹਨ · %3$s</string>
-    <string name="MessageRecord_group_call_s">ਗਰੁੱਪ ਕਾਲ · %1$s</string>
-
-    <string name="MessageRecord_s_started_a_group_call">%1$s ਨੇ ਇੱਕ ਗਰੁੱਪ ਕਾਲ ਸ਼ੁਰੂ ਕੀਤੀ</string>
-    <string name="MessageRecord_you_started_a_group_call">ਤੁਸੀਂ ਗਰੁੱਪ ਕਾਲ ਸ਼ੁਰੂ ਕੀਤੀ</string>
-    <string name="MessageRecord_s_is_in_the_group_call">%1$s ਗਰੁੱਪ ਕਾਲ ਵਿੱਚ ਹੈ</string>
-    <string name="MessageRecord_you_are_in_the_group_call">ਤੁਸੀਂ ਗਰੁੱਪ ਕਾਲ ਵਿੱਚ ਹੋ</string>
-    <string name="MessageRecord_s_and_s_are_in_the_group_call">%1$s ਅਤੇ %2$s ਗਰੁੱਪ ਕਾਲ ਵਿੱਚ ਹਨ</string>
-    <string name="MessageRecord_group_call">ਗਰੁੱਪ ਕਾਲ</string>
+    <!-- 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 ਕਾਲ ਵਿੱਚ ਹਨ · %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">ਤੁਸੀਂ ਕਾਲ ਵਿੱਚ ਹੋ · %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 ਅਤੇ %2$s ਕਾਲ ਵਿੱਚ ਹਨ · %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 ਕਾਲ ਵਿੱਚ ਹਨ</string>
+    <!-- Chat log text for an ongoing group call only the local user has joined -->
+    <string name="MessageRecord_you_are_in_the_call">ਤੁਸੀਂ ਕਾਲ ਵਿੱਚ ਹੋ</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 ਅਤੇ %2$s ਕਾਲ ਵਿੱਚ ਹਨ</string>
+    <!-- Chat log text for a group call that ended within the last 5 minutes -->
+    <string name="MessageRecord__the_video_call_has_ended">ਵੀਡੀਓ ਕਾਲ ਸਮਾਪਤ ਹੋ ਗਈ ਹੈ</string>
+    <!-- Chat log text for a group call that ended within the last 5 minutes with a placeholder for formatted time -->
+    <string name="MessageRecord__the_video_call_has_ended_s">ਵੀਡੀਓ ਕਾਲ ਸਮਾਪਤ ਹੋ ਗਈ ਹੈ · %1$s</string>
+    <!-- Chat log text for a group call that ended more than 5 minutes ago and was missed -->
+    <string name="MessageRecord__missed_video_call">ਵੀਡੀਓ ਕਾਲ ਮਿਸ ਹੋਈ</string>
+    <!-- Chat log text for a group call that ended more than 5 minutes ago and was missed with a placeholder for formatted time -->
+    <string name="MessageRecord__missed_video_call_s">ਵੀਡੀਓ ਕਾਲ ਮਿਸ ਹੋਈ · %1$s</string>
+    <!-- Chat log text for a group call that ended that the local user did not start -->
+    <string name="MessageRecord__incoming_video_call">ਇਨਕਮਿੰਗ ਵੀਡੀਓ ਕਾਲ</string>
+    <!-- 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">ਇਨਕਮਿੰਗ ਵੀਡੀਓ ਕਾਲ · %1$s</string>
+    <!-- Chat log text for a group call that ended that the local user started -->
+    <string name="MessageRecord__outgoing_video_call">ਆਊਟਗੋਇੰਗ ਵੀਡੀਓ ਕਾਲ</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">ਆਊਟਗੋਇੰਗ ਵੀਡੀਓ ਕਾਲ · %1$s</string>
+    <!-- Chat log text for an ongoing group call that the local user started -->
+    <string name="MessageRecord__you_started_a_video_call">ਤੁਸੀਂ ਵੀਡੀਓ ਕਾਲ ਸ਼ੁਰੂ ਕੀਤੀ</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">ਤੁਸੀਂ ਵੀਡੀਓ ਕਾਲ ਸ਼ੁਰੂ ਕੀਤੀ · %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 ਨੇ ਵੀਡੀਓ ਕਾਲ ਸ਼ੁਰੂ ਕੀਤੀ</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 ਨੇ ਵੀਡੀਓ ਕਾਲ ਸ਼ੁਰੂ ਕੀਤੀ · %2$s</string>
 
     <string name="MessageRecord_you">ਤੁਸੀਂ</string>
 
-    <plurals name="MessageRecord_s_s_and_d_others_are_in_the_group_call_s">
-        <item quantity="one">%1$s, %2$s, ਤੇ %3$d ਹੋਰ ਗਰੁੱਪ ਕਾਲ ਵਿੱਚ ਹਨ · %4$s</item>
-        <item quantity="other">%1$s, %2$s, ਤੇ %3$d ਹੋਰ ਗਰੁੱਪ ਕਾਲ ਵਿੱਚ ਹਨ · %4$s</item>
+    <!-- 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, ਅਤੇ %3$d ਹੋਰ ਵਿਅਕਤੀ ਗਰੁੱਪ ਕਾਲ ਵਿੱਚ ਹੈ · %4$s</item>
+        <item quantity="other">%1$s, %2$s, ਅਤੇ %3$d ਹੋਰ ਵਿਅਕਤੀ ਕਾਲ ਵਿੱਚ ਹਨ · %4$s</item>
     </plurals>
 
-    <plurals name="MessageRecord_s_s_and_d_others_are_in_the_group_call">
-        <item quantity="one">%1$s, %2$s, ਤੇ %3$d ਹੋਰ ਗਰੁੱਪ ਕਾਲ ਵਿੱਚ ਹਨ</item>
-        <item quantity="other">%1$s, %2$s, ਤੇ %3$d ਹੋਰ ਗਰੁੱਪ ਕਾਲ ਵਿੱਚ ਹਨ</item>
+    <!-- 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, ਅਤੇ %3$d ਹੋਰ ਵਿਅਕਤੀ ਗਰੁੱਪ ਕਾਲ ਵਿੱਚ ਹੈ</item>
+        <item quantity="other">%1$s, %2$s, ਅਤੇ %3$d ਹੋਰ ਵਿਅਕਤੀ ਗਰੁੱਪ ਕਾਲ ਵਿੱਚ ਹਨ</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. -->
@@ -2063,6 +2108,7 @@
     <!-- Generic error when the app is unable to request an SMS code for an unknown reason. -->
     <string name="RegistrationActivity_unable_to_request_verification_code">ਤਸਦੀਕ ਕੋਡ ਲਈ ਬੇਨਤੀ ਕਰਨ ਵਿੱਚ ਅਸਮਰੱਥ ਰਹੇ। ਕਿਰਪਾ ਕਰਕੇ ਆਪਣੇ ਨੈੱਟਵਰਕ ਕਨੈਕਸ਼ਨ ਦੀ ਜਾਂਚ ਕਰੋ ਅਤੇ ਦੁਬਾਰਾ ਕੋਸ਼ਿਸ਼ ਕਰੋ।</string>
     <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">Molly Android - ਫ਼ੋਨ ਨੰਬਰ ਫਾਰਮਿਟ</string>
     <!--    Small "toast" notification to the user confirming that they have requested a new code via voice call.-->
@@ -2207,7 +2253,7 @@
     <string name="SubmitDebugLogActivity_this_log_will_be_posted_publicly_online_for_contributors">ਇਸ ਲਾਗ ਨੂੰ ਯੋਗਦਾਨ ਪਾਉਣ ਵਾਲਿਆਂ ਦੇ ਦੇਖਣ ਲਈ ਜਨਤਕ ਤੌਰ ’ਤੇ ਆਨਲਾਈਨ ਪੋਸਟ ਕੀਤਾ ਜਾਵੇਗਾ। ਤੁਸੀਂ ਇਸ ਨੂੰ ਅੱਪਲੋਡ ਕਰਨ ਤੋਂ ਪਹਿਲਾਂ ਇਸ ਦੀ ਜਾਂਚ ਕਰ ਸਕਦੇ ਹੋ।</string>
 
     <!-- SupportEmailUtil -->
-  <!-- Removed by excludeNonTranslatables <string name="SupportEmailUtil_support_email" translatable="false">support@molly.im</string> -->
+  <!-- Removed by excludeNonTranslatables <string name="SupportEmailUtil_support_email" translatable="false">support@signal.org</string> -->
     <string name="SupportEmailUtil_filter">ਫਿਲਟਰ:</string>
     <string name="SupportEmailUtil_device_info">ਡਿਵਾਈਸ ਜਾਣਕਾਰੀ:</string>
     <string name="SupportEmailUtil_android_version">Android ਸੰਸਕਰਣ:</string>
@@ -2709,6 +2755,8 @@
     <string name="ConversationUpdateItem_loading">ਲੋਡ ਕਰ ਰਿਹਾ ਹੈ …</string>
     <string name="ConversationUpdateItem_learn_more">ਹੋਰ ਜਾਣੋ</string>
     <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_call_is_full">ਕਾਲ ਭਰੀ ਹੋਈ ਹੈ</string>
     <string name="ConversationUpdateItem_invite_friends">ਦੋਸਤਾਂ ਨੂੰ ਸੱਦਾ ਦਿਓ</string>
@@ -2773,6 +2821,7 @@
     <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>
 
     <!-- EnableCallNotificationSettingsDialog__call_notifications_checklist -->
@@ -3086,6 +3135,7 @@
 
     <string name="arrays__default">ਡਿਫੌਲਟ</string>
     <string name="arrays__high">ਉੱਚਾ</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">ਅਧਿਕਤਮ</string>
 
     <!-- plurals.xml -->
@@ -3357,7 +3407,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 ਵਾਲੇਟ ਦੀ ਵਰਤੋਂ ਦੇ ਨਿਯਮਾਂ ਦੇ ਅਧੀਨ ਹਨ। ਤੁਹਾਨੂੰ ਕੁਝ ਸਮੱਸਿਆਵਾਂ ਦਾ ਸਾਹਮਣਾ ਕਰਨਾ ਪੈ ਸਕਦਾ ਹੈ ਅਤੇ ਜਿਹੜੇ ਭੁਗਤਾਨ ਜਾਂ ਬੈਲੈਂਸ ਤੁਸੀਂ ਗੁਆ ਦਿੰਦੇ ਹੋ, ਸ਼ਾਇਦ ਤੁਸੀਂ ਉਸਨੂੰ ਮੁੜ ਪ੍ਰਾਪਤ ਨਾ ਕਰ ਸਕੋ। </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">Molly ਵਿੱਚ ਭੁਗਤਾਨ ਹੁਣ ਉਪਲਬਧ ਨਹੀਂ ਰਹੇ। ਤੁਸੀਂ ਹਾਲੇ ਵੀ ਕਿਸੇ ਐਕਸਚੇਂਜ ਵਿੱਚ ਫੰਡ ਟ੍ਰਾਂਸਫ਼ਰ ਕਰ ਸਕਦੇ ਹੋ ਪਰ ਤੁਸੀਂ ਹੁਣ ਭੁਗਤਾਨ ਭੇਜ ਅਤੇ ਪ੍ਰਾਪਤ ਨਹੀਂ ਕਰ ਸਕਦੇ ਜਾਂ ਫੰਡ ਸ਼ਾਮਲ ਨਹੀਂ ਕਰ ਸਕਦੇ।</string>
@@ -3406,6 +3456,14 @@
     <!-- Storage permission row description -->
     <string name="GrantPermissionsFragment__send_photos_videos_and_files">ਆਪਣੇ ਡਿਵਾਈਸ ਤੋਂ ਫ਼ੋਟੋਆਂ, ਵੀਡੀਓ ਅਤੇ ਫ਼ਾਈਲਾਂ ਭੇਜੋ।</string>
 
+    <!-- PermissionDeniedBottomSheet -->
+    <!-- Sheet describing step 1 on how to give permissions by opening settings -->
+    <string name="PermissionDeniedBottomSheet__1_tap_settings_below">1. Tap “Settings” below</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 Allow the permission</string>
+    <!-- Label for button at the bottom of the sheet which opens the system permission settings -->
+    <string name="PermissionDeniedBottomSheet__settings">Settings</string>
+
     <!-- PaymentsSecuritySetupFragment -->
     <!-- Toolbar title -->
     <string name="PaymentsSecuritySetupFragment__security_setup">ਸੁਰੱਖਿਆ ਸੈੱਟਅੱਪ</string>
@@ -3446,6 +3504,7 @@
     <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__information">ਭੁਗਤਾਨ ਦੀ ਰਕਮ ਅਤੇ ਟ੍ਰਾਂਜੈਕਸ਼ਨ ਦੇ ਸਮੇਂ ਸਮੇਤ ਟ੍ਰਾਂਜੈਕਸ਼ਨ ਦੇ ਵੇਰਵੇ MobileCoin ਲੈਜ਼ਰ ਦਾ ਹਿੱਸਾ ਹਨ।</string>
@@ -3508,6 +3567,7 @@
     <string name="ConfirmPayment__confirm_payment">ਭੁਗਤਾਨ ਨੂੰ ਤਸਦੀਕ ਕਰੋ</string>
     <string name="ConfirmPayment__network_fee">ਨੈੱਟਵਰਕ ਫ਼ੀਸ</string>
     <string name="ConfirmPayment__estimated_s">ਅੰਦਾਜ਼ਨ %1$s</string>
+    <!-- Prefix to a name to indicate who a payment will be sent to -->
     <string name="ConfirmPayment__to">ਪ੍ਰਤੀ</string>
     <string name="ConfirmPayment__total_amount">ਕੁੱਲ ਰਕਮ</string>
     <string name="ConfirmPayment__balance_s">ਬਕਾਇਆ: %1$s</string>
@@ -3658,6 +3718,14 @@
     <string name="conversation_group_options__conversation">ਚੈਟ</string>
     <string name="conversation_group_options__broadcast">ਬ੍ਰੌਡਕਾਸਟ</string>
 
+    <!-- DoubleTapEditEducationSheet -->
+    <!-- Displayed as the title of the education bottom sheet -->
+    <string name="DoubleTapEditEducationSheet__double_tap_edit_title">Double tap to edit</string>
+    <!-- Text on the sheet explaining how double tapping on a message will let them edit it -->
+    <string name="DoubleTapEditEducationSheet__quickly_tap_twice">Quickly tap twice on your messages to edit them. You can edit your messages up to 24hrs after they’ve been sent.</string>
+    <!-- Button label to dismiss sheet -->
+    <string name="DoubleTapEditEducationSheet__got_it">Got it</string>
+
     <!-- text_secure_normal -->
     <string name="text_secure_normal__menu_new_group">ਨਵਾਂ ਸਮੂਹ</string>
     <string name="text_secure_normal__menu_settings">ਸੈਟਿੰਗਾਂ</string>
@@ -4112,6 +4180,7 @@
     <string name="RecipientBottomSheet_copied_to_clipboard">ਕਲਿਪਬੋਰਡ ਤੇ ਕਾਪੀ ਕੀਤਾ ਗਿਆ</string>
 
     <string name="GroupRecipientListItem_admin">ਐਡਮਿਨ</string>
+    <!-- Button text to approve a user that has requested to join a group -->
     <string name="GroupRecipientListItem_approve_description">ਮਨਜ਼ੂਰ ਕਰੋ</string>
     <string name="GroupRecipientListItem_deny_description">ਇਨਕਾਰ ਕਰੋ</string>
 
@@ -4139,6 +4208,7 @@
 
     <!-- VoiceNoteMediaDescriptionCompatFactory -->
     <string name="VoiceNoteMediaItemFactory__voice_message">ਆਵਾਜ਼ ਸੁਨੇਹਾ · %1$s</string>
+    <!-- This is a title in a banner describing the conversation sender to receiver placeholders of the currently playing voice memo. -->
     <string name="VoiceNoteMediaItemFactory__s_to_s">%1$s ਤੋਂ %2$s</string>
 
     <!-- StorageUtil -->
@@ -4152,8 +4222,16 @@
     <string name="ReviewCardDialogFragment__review_members">ਮੈਂਬਰਾਂ ਦੀ ਸਮੀਖਿਆ ਕਰੋ</string>
     <!-- Title of a screen where the user will be prompted to review a message request matching the name of someone they already know -->
     <string name="ReviewCardDialogFragment__review_request">ਬੇਨਤੀ ਦੀ ਸਮੀਖਿਆ ਕਰੋ</string>
-    <string name="ReviewCardDialogFragment__d_group_members_have_the_same_name">%1$d ਗਰੁੱਪ ਮੈਂਬਰਾਂ ਦੇ ਨਾਂ ਇੱਕੋ ਜਿਹੇ ਹਨ, ਹੇਠਲੇ ਮੈਂਬਰਾਂ ਦੀ ਸਮੀਖਿਆ ਕਰੋ ਅਤੇ ਕਾਰਵਾਈ ਦੀ ਚੋਣ ਕਰੋ।</string>
-    <string name="ReviewCardDialogFragment__if_youre_not_sure">ਜੇ ਤੁਹਾਨੂੰ ਇਹ ਪੱਕਾ ਨਹੀਂ ਪਤਾ ਹੈ ਕਿ ਬੇਨਤੀ ਕਿਸ ਤੋਂ ਆਈ ਹੈ, ਤਾਂ ਹੇਠਲੇ ਸੰਪਰਕਾਂ ਦੀ ਸਮੀਖਿਆ ਕਰੋ ਅਤੇ ਕਾਰਵਾਈ ਕਰੋ।</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="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 -->
+    <plurals name="ReviewCardDialogFragment__if_youre_not_sure">
+        <item quantity="one">If you\'re not sure who the request is from, review the contact below and take action.</item>
+        <item quantity="other">If you\'re not sure who the request is from, review the contacts below and take action.</item>
+    </plurals>
     <string name="ReviewCardDialogFragment__no_other_groups_in_common">ਕੋਈ ਹੋਰ ਗਰੁੱਪ ਸਾਂਝੇ ਨਹੀਂ।</string>
     <string name="ReviewCardDialogFragment__no_groups_in_common">ਕੋਈ ਗਰੁੱਪ ਸਾਂਝੇ ਨਹੀਂ।</string>
     <plurals name="ReviewCardDialogFragment__d_other_groups_in_common">
@@ -4184,11 +4262,20 @@
     <string name="CallParticipantsListUpdatePopupWindow__s_joined">%1$s ਸ਼ਾਮਲ ਹੋਏ</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_and_s_joined">%1$s ਅਤੇ %2$s ਸ਼ਾਮਲ ਹੋਏ</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_s_and_s_joined">%1$s, %2$s ਅਤੇ %3$s ਸ਼ਾਮਲ ਹੋਏ</string>
-    <string name="CallParticipantsListUpdatePopupWindow__s_s_and_d_others_joined">%1$s, %2$s ਅਤੇ %3$d ਹੋਰ ਸ਼ਾਮਲ ਹੋਏ</string>
+    <!-- Toast message shown in group call when 3 or more people join -->
+    <plurals name="CallParticipantsListUpdatePopupWindow__s_s_and_d_others_joined">
+        <item quantity="one">%1$s, %2$s and %3$d other joined</item>
+        <item quantity="other">%1$s, %2$s and %3$d others joined</item>
+    </plurals>
+    <!-- Toast/popup text shown when someone leaves a group call -->
     <string name="CallParticipantsListUpdatePopupWindow__s_left">%1$s ਨੇ ਛੱਡਿਆ</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_and_s_left">%1$s ਅਤੇ %2$s ਨੇ ਛੱਡਿਆ</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_s_and_s_left">%1$s, %2$s ਅਤੇ %3$s ਨੇ ਛੱਡਿਆ</string>
-    <string name="CallParticipantsListUpdatePopupWindow__s_s_and_d_others_left">%1$s, %2$s ਅਤੇ %3$d ਹੋਰਾਂ ਨੇ ਛੱਡਿਆ</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 and %3$d other left</item>
+        <item quantity="other">%1$s, %2$s and %3$d others left</item>
+    </plurals>
 
     <string name="CallParticipant__you">ਤੁਸੀਂ</string>
     <string name="CallParticipant__you_on_another_device">ਤੁਸੀਂ (ਹੋਰ ਡਿਵਾਈਸ ਉੱਤੇ)</string>
@@ -4558,10 +4645,15 @@
 
     <!-- PrivacySettingsFragment -->
     <string name="PrivacySettingsFragment__blocked">ਪਾਬੰਦੀ ਲਗਾਈ ਗਈ</string>
-    <string name="PrivacySettingsFragment__d_contacts">%1$d ਸੰਪਰਕ</string>
+    <!-- Settings label that shows the number blocked contacts -->
+    <plurals name="PrivacySettingsFragment__d_contacts">
+        <item quantity="one">%1$d contact</item>
+        <item quantity="other">%1$d contacts</item>
+    </plurals>
     <string name="PrivacySettingsFragment__messaging">ਸੁਨੇਹੇ ਲੈਣ-ਦੇਣ</string>
     <string name="PrivacySettingsFragment__disappearing_messages">ਅਲੋਪ ਹੋਣ ਵਾਲੇ ਸੁਨੇਹੇ</string>
     <string name="PrivacySettingsFragment__app_security">ਐਪ ਦੀ ਸੁਰੱਖਿਆ</string>
+    <!-- This refers to the multi-tasking overview (recent apps) from the Android operating system.-->
     <string name="PrivacySettingsFragment__block_screenshots_in_the_recents_list_and_inside_the_app">ਹਾਲੀਆ ਸੂਚੀ ਵਿੱਚ ਅਤੇ ਐਪ ਦੇ ਵਿੱਚ ਸਕ੍ਰੀਨਸ਼ਾਟਾਂ ਉੱਤੇ ਪਾਬੰਦੀ ਲਗਾਓਨੂੰ ਪਾਬੰਦੀ ਲਗਾਓ</string>
     <string name="PrivacySettingsFragment__signal_message_and_calls">Signal ਸੁਨੇਹੇ ਅਤੇ ਕਾਲਾਂ, ਹਮੇਸ਼ਾਂ ਕਾਲਾਂ ਰਿਲੇਅ ਕਰੋ, ਅਤੇ ਸੀਲਬੰਦ ਭੇਜਣ ਵਾਲਾ</string>
     <string name="PrivacySettingsFragment__default_timer_for_new_changes">ਨਵੀਆਂ ਚੈਟਾਂ ਲਈ ਡਿਫੌਲਟ ਟਾਈਮਰ</string>
@@ -4618,11 +4710,14 @@
     <string name="DataAndStorageSettingsFragment__media_quality">ਮੀਡੀਆ ਕੁਆਲਟੀ</string>
     <string name="DataAndStorageSettingsFragment__sent_media_quality">ਭੇਜੀ ਮੀਡੀਆ ਕੁਆਲਟੀ</string>
     <string name="DataAndStorageSettingsFragment__sending_high_quality_media_will_use_more_data">ਵਧੀਆ ਕੁਆਲਟੀ ਮੀਡੀਆ ਭੇਜਣ ਲਈ ਵੱਧ ਡਾਟਾ ਵਰਤਿਆ ਜਾਵੇਗਾ।</string>
+    <!-- Setting option that can be selected to default media to be sent as high quality by default -->
     <string name="DataAndStorageSettingsFragment__high">ਉੱਚਾ</string>
+    <!-- Setting option that can be selected to default media to be sent as standard quality by default -->
     <string name="DataAndStorageSettingsFragment__standard">ਸਟੈਂਡਰਡ</string>
     <string name="DataAndStorageSettingsFragment__calls">ਕਾਲਾਂ</string>
 
     <!-- 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__use_custom_colors">ਪਸੰਦੀਦਾ ਰੰਗ ਵਰਤੋ</string>
     <string name="ChatColorSelectionFragment__chat_color">ਗੱਲਬਾਤ ਦਾ ਰੰਗ</string>
@@ -4834,6 +4929,7 @@
     <string name="AvatarPickerFragment__take_a_picture">ਤਸਵੀਰ ਲਓ</string>
     <string name="AvatarPickerFragment__choose_a_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>
     <string name="AvatarPickerFragment__clear_avatar">ਅਵਤਾਰ ਨੂੰ ਮਿਟਾਓ</string>
@@ -4894,7 +4990,7 @@
     <string name="MediaReviewFragment__add_a_message">ਸੁਨੇਹਾ ਜੋੜੋ</string>
     <string name="MediaReviewFragment__add_a_reply">ਜਵਾਬ ਜੋੜੋ</string>
     <string name="MediaReviewFragment__send_to">ਇਹਨਾਂ ਨੂੰ ਭੇਜੋ</string>
-    <string name="MediaReviewFragment__view_once_message">ਸੁਨੇਹੇ ਨੂੰ ਇੱਕ ਵਾਰ ਵੇਖੋ</string>
+    <string name="MediaReviewFragment__view_once_message">ਮੀਡੀਆ ਜੋ ਇੱਕ ਵਾਰ ਦੇਖਿਆ ਜਾ ਸਕਦਾ ਹੈ</string>
     <string name="MediaReviewFragment__one_or_more_items_were_too_large">ਇੱਕ ਜਾਂ ਵੱਧ ਚੀਜ਼ਾਂ ਬਹੁਤ ਵੱਡੀਆਂ ਸਨ</string>
     <string name="MediaReviewFragment__one_or_more_items_were_invalid">ਇੱਕ ਜਾਂ ਵੱਧ ਆਈਟਮਾਂ ਵਾਜਬ ਨਹੀਂ ਹਨ</string>
     <string name="MediaReviewFragment__too_many_items_selected">ਬਹੁਤ ਵੱਧ ਚੀਜ਼ਾਂ ਚੁਣੀਆਂ ਗਈਆਂ</string>
@@ -5487,7 +5583,7 @@
     <string name="StoryViewerFragment__s_s">%1$s %2$s</string>
     <!-- Displayed when viewing a post you sent -->
     <string name="StoryViewerPageFragment__you">ਤੁਸੀਂ</string>
-    <!-- Displayed when viewing a post displayed to a group -->
+    <!-- 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 -->
     <string name="StoryViewerPageFragment__reply">ਜਵਾਬ ਦਿਓ</string>
@@ -6704,5 +6800,26 @@
     <!-- Content description for opening the note editor -->
     <string name="ViewNoteSheet__edit_note">ਨੋਟ ਸੋਧੋ</string>
 
+    <!-- BackupProgressService -->
+    <!-- Notification title shown while backup restore job is running -->
+    <string name="BackupProgressService_title">ਬੈਕਅੱਪ ਰੀਸਟੋਰ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ…</string>
+    <!-- Notification title shown while downloading backup restore data -->
+    <string name="BackupProgressService_title_downloading">ਬੈਕਅੱਪ ਡਾਟਾ ਡਾਊਨਲੋਡ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ…</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>
+    <!-- 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 -->
+    <string name="BackupsTypeSettingsFragment__google_pay">Google Pay</string>
+    <!-- Displayed as the user\'s payment method as a label in a preference row -->
+    <string name="BackupsTypeSettingsFragment__bank_transfer">Bank transfer</string>
+    <!-- Displayed as the user\'s payment method as a label in a preference row -->
+    <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>
+
+
     <!-- 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 e29b688c5f..a6676ac101 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -1,6 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- smartling.instruction_comments_enabled = on -->
-<resources>
+<?xml version="1.0" encoding="UTF-8"?><!-- 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> -->
@@ -89,6 +87,16 @@
     <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">Allow access to your location</string>
+    <!-- Dialog description that will explain the steps needed to give location permission -->
+    <string name="AttachmentManager_signal_to_send_location">To send your location:</string>
+    <!-- Alert dialog description asking for location permission -->
+    <string name="AttachmentManager_signal_allow_signal_access_location">Allow Molly access to send your location.</string>
+    <!-- Toast text explaining Signal\'s need for location access -->
+    <string name="AttachmentManager_signal_needs_location_access">Molly needs location access to send your location.</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>
     <!-- Alert dialog description to send the recipient a request to activate payments -->
@@ -243,7 +251,7 @@
     <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>
@@ -392,8 +400,16 @@
     <string name="ConversationActivity_your_request_to_join_has_been_sent_to_the_group_admin">Twoja prośba o przyjęcie do grupy została wysłana do administratora. Zostaniesz powiadomiony(a), gdy podejmie decyzję.</string>
     <string name="ConversationActivity_cancel_request">Anuluj prośbę</string>
 
-    <string name="ConversationActivity_to_send_audio_messages_allow_signal_access_to_your_microphone">Aby wysyłać wiadomości głosowe, zezwól Molly na dostęp do mikrofonu.</string>
+    <!-- Dialog title asking users for microphone permission -->
+    <string name="ConversationActivity_allow_access_microphone">Allow access to your microphone</string>
+    <!-- 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>
+    <!-- Toast text explaining Signal\'s need for microphone access -->
+    <string name="ConversationActivity_signal_needs_microphone_access_voice_message">Molly needs microphone access to record a voice message.</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">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>
@@ -417,10 +433,17 @@
     <string name="ConversationActivity_you_will_leave_this_group_and_it_will_be_deleted_from_all_of_your_devices">Opuścisz tę grupę i zostanie ona usunięta ze wszystkich Twoich urządzeń.</string>
     <string name="ConversationActivity_delete">Usuń</string>
     <string name="ConversationActivity_delete_and_leave">Usuń i opuść</string>
-    <string name="ConversationActivity__to_call_s_signal_needs_access_to_your_microphone">Aby zadzwonić do %1$s, Molly potrzebuje dostępu do mikrofonu</string>
+
+    <!-- Dialog description that will explain the steps needed to give microphone permissions for a voice call -->
+    <string name="ConversationActivity__to_start_call">To start a 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">To start a call, allow Molly access to your microphone.</string>
+    <!-- Toast text explaining Signal\'s need for microphone access for a voice call -->
+    <string name="ConversationActivity_signal_needs_microphone_access_voice_call">Molly needs microphone access to start a call.</string>
 
 
     <string name="ConversationActivity_join">Dołącz</string>
+    <!-- Button text for an active group call but the call is currently full and unjoinable -->
     <string name="ConversationActivity_full">Pełne</string>
 
     <string name="ConversationActivity_error_sending_media">Błąd przy wysyłaniu multimediów</string>
@@ -645,6 +668,7 @@
     <string name="ConversationListFragment_unarchive">Cofnij z arch.</string>
     <string name="ConversationListFragment_delete">Usuń</string>
     <string name="ConversationListFragment_select_all">Zazn. wszystko</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 wybrany</item>
         <item quantity="few">%1$d wybrane</item>
@@ -902,6 +926,7 @@
         <item quantity="many">%1$d zaproszeń wysłanych</item>
         <item quantity="other">%1$d zaproszeń wysłanych</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">Nie możesz automatycznie dodać \"%1$s\" do tej grupy.\n\nUżytkownik został zaproszony i nie zobaczy żadnych wiadomości grupowych, dopóki nie przyjmie zaproszenia.</string>
     <string name="GroupManagement_invite_multiple_users">Nie możesz automatycznie dodać tych użytkowników do tej grupy.\n\nUżytkownicy zostali zaproszeni i nie zobaczą żadnych wiadomości grupowych, dopóki nie przyjmą zaproszenia.</string>
 
@@ -1114,7 +1139,9 @@
 
     <string name="ManageGroupActivity_edit_name_and_picture">Edytuj nazwę i zdjęcie</string>
     <string name="ManageGroupActivity_legacy_group">Stara grupa</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">To stara wersja grupy. Takie funkcje jak administratorzy grup są dostępne tylko w Nowej grupie.</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">To Stara grupa. Aby móc korzystać z takich funkcji jak @wzmianki i administratorzy grup,</string>
     <string name="ManageGroupActivity_legacy_group_too_large">Ta Stara grupa nie może zostać zaktualizowana do Nowej grupy, ponieważ jest zbyt duża. Maksymalny rozmiar grupy to %1$d.</string>
     <string name="ManageGroupActivity_upgrade_this_group">zaktualizuj tę grupę.</string>
@@ -1359,6 +1386,7 @@
         <item quantity="other">Usuń</item>
     </plurals>
 
+    <!-- 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 wybrany (%2$s)</item>
         <item quantity="few">%1$d wybrane (%2$s)</item>
@@ -1425,17 +1453,13 @@
     <string name="MessageRecord_left_group">Opuściłeś(aś) grupę.</string>
     <string name="MessageRecord_you_updated_group">Zaktualizowałeś(aś) grupę.</string>
     <string name="MessageRecord_the_group_was_updated">Grupa została zaktualizowana.</string>
-    <!-- Update message shown when placing an outgoing 1:1 voice/audio call and it\'s answered by the other party -->
+    <!-- Update message shown when placing an outgoing 1:1 voice/audio call -->
     <string name="MessageRecord_outgoing_voice_call">Wychodzące połączenie głosowe</string>
-    <!-- Update message shown when placing an outgoing 1:1 video call and it\'s answered by the other party -->
+    <!-- Update message shown when placing an outgoing 1:1 video call -->
     <string name="MessageRecord_outgoing_video_call">Wychodzące połączenie wideo</string>
-    <!-- Update message shown when placing an outgoing 1:1 voice/audio call and it\'s not answered by the other party -->
-    <string name="MessageRecord_unanswered_voice_call">Nieodebrane połączenie głosowe</string>
-    <!-- Update message shown when placing an outgoing 1:1 video call and it\'s not answered by the other party -->
-    <string name="MessageRecord_unanswered_video_call">Nieodebrane połączenie wideo</string>
-    <!-- Update message shown when receiving an incoming 1:1 voice/audio call and it\'s answered -->
+    <!-- Update message shown when receiving an incoming 1:1 voice/audio call and it\'s answered or ringing -->
     <string name="MessageRecord_incoming_voice_call">Przychodzące połączenie głosowe</string>
-    <!-- Update message shown when receiving an incoming 1:1 video call and answered -->
+    <!-- Update message shown when receiving an incoming 1:1 video call and answered or ringing -->
     <string name="MessageRecord_incoming_video_call">Przychodzące połączenie wideo</string>
     <!-- Update message shown when receiving an incoming 1:1 voice/audio call and not answered -->
     <string name="MessageRecord_missed_voice_call">Nieodebrane połączenie głosowe</string>
@@ -1445,10 +1469,6 @@
     <string name="MessageRecord_missed_voice_call_notification_profile">Nieodebrane połączenie głosowe przy włączonym profilu powiadomień</string>
     <!-- Update message shown when receiving an incoming video call and declined due to notification profile -->
     <string name="MessageRecord_missed_video_call_notification_profile">Nieodebrane połączenie wideo przy włączonym profilu powiadomień</string>
-    <!-- Update message shown when receiving an incoming 1:1 voice/audio call and explicitly declined -->
-    <string name="MessageRecord_you_declined_a_voice_call">Odrzucono połączenie głosowe</string>
-    <!-- Update message shown when receiving an incoming 1:1 video call and explicitly declined -->
-    <string name="MessageRecord_you_declined_a_video_call">Odrzucono połączenie wideo</string>
     <!-- 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 zaktualizował(a) grupę.</string>
@@ -1673,30 +1693,55 @@
     <string name="MessageRecord_can_accept_payments">Od teraz %1$s przyjmuje płatności</string>
 
     <!-- Group Calling update messages -->
-    <string name="MessageRecord_s_started_a_group_call_s">%1$s rozpoczął(ęła) połączenie grupowe · %2$s</string>
-    <string name="MessageRecord_you_started_a_group_call_s">Rozpoczęto połączenie grupowe · %1$s</string>
-    <string name="MessageRecord_s_is_in_the_group_call_s">%1$s uczestniczy w rozmowie · %2$s</string>
-    <string name="MessageRecord_you_are_in_the_group_call_s1">Uczestniczysz w rozmowie · %1$s</string>
-    <string name="MessageRecord_s_and_s_are_in_the_group_call_s1">%1$s i %2$s uczestniczą w rozmowie · %3$s</string>
-    <string name="MessageRecord_group_call_s">Połączenie grupowe · %1$s</string>
-
-    <string name="MessageRecord_s_started_a_group_call">%1$s rozpoczął(ęła) połączenie grupowe</string>
-    <string name="MessageRecord_you_started_a_group_call">Rozpocząłeś(ęłaś) połączenie grupowe</string>
-    <string name="MessageRecord_s_is_in_the_group_call">%1$s uczestniczy w rozmowie</string>
-    <string name="MessageRecord_you_are_in_the_group_call">Uczestniczysz w rozmowie</string>
-    <string name="MessageRecord_s_and_s_are_in_the_group_call">%1$s i %2$s uczestniczą w rozmowie</string>
-    <string name="MessageRecord_group_call">Połączenie grupowe</string>
+    <!-- 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 uczestniczy w rozmowie · %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">Uczestniczysz w rozmowie · %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 i %2$s uczestniczą w rozmowie · %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 uczestniczy w rozmowie</string>
+    <!-- Chat log text for an ongoing group call only the local user has joined -->
+    <string name="MessageRecord_you_are_in_the_call">Uczestniczysz w rozmowie</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 i %2$s uczestniczą w rozmowie</string>
+    <!-- Chat log text for a group call that ended within the last 5 minutes -->
+    <string name="MessageRecord__the_video_call_has_ended">Połączenie wideo zostało zakończone</string>
+    <!-- Chat log text for a group call that ended within the last 5 minutes with a placeholder for formatted time -->
+    <string name="MessageRecord__the_video_call_has_ended_s">Połączenie wideo zostało zakończone · %1$s</string>
+    <!-- Chat log text for a group call that ended more than 5 minutes ago and was missed -->
+    <string name="MessageRecord__missed_video_call">Nieodebrane połączenie wideo</string>
+    <!-- Chat log text for a group call that ended more than 5 minutes ago and was missed with a placeholder for formatted time -->
+    <string name="MessageRecord__missed_video_call_s">Nieodebrane połączenie wideo · %1$s</string>
+    <!-- Chat log text for a group call that ended that the local user did not start -->
+    <string name="MessageRecord__incoming_video_call">Przychodzące połączenie wideo</string>
+    <!-- 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">Przychodzące połączenie wideo · %1$s</string>
+    <!-- Chat log text for a group call that ended that the local user started -->
+    <string name="MessageRecord__outgoing_video_call">Wychodzące połączenie wideo</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">Wychodzące połączenie wideo · %1$s</string>
+    <!-- Chat log text for an ongoing group call that the local user started -->
+    <string name="MessageRecord__you_started_a_video_call">Połączenie wideo rozpoczęte przez Ciebie</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">Połączenie wideo rozpoczęte przez Ciebie · %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">Połączenie wideo rozpoczęte przez %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 and a placeholder for formatted time -->
+    <string name="MessageRecord__s_started_a_video_call_s">Połączenie wideo rozpoczęte przez %1$s · %2$s</string>
 
     <string name="MessageRecord_you">Ty</string>
 
-    <plurals name="MessageRecord_s_s_and_d_others_are_in_the_group_call_s">
+    <!-- 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 i %3$d inny uczestniczy w rozmowie · %4$s</item>
         <item quantity="few">%1$s, %2$s i %3$d innych uczestniczy w rozmowie · %4$s</item>
         <item quantity="many">%1$s, %2$s i %3$d innych uczestniczy w rozmowie · %4$s</item>
         <item quantity="other">%1$s, %2$s i %3$d innych uczestniczy w rozmowie · %4$s</item>
     </plurals>
 
-    <plurals name="MessageRecord_s_s_and_d_others_are_in_the_group_call">
+    <!-- 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 i %3$d inny uczestniczy w rozmowie</item>
         <item quantity="few">%1$s, %2$s i %3$d innych uczestniczy w rozmowie</item>
         <item quantity="many">%1$s, %2$s i %3$d innych uczestniczy w rozmowie</item>
@@ -2221,6 +2266,7 @@
     <!-- Generic error when the app is unable to request an SMS code for an unknown reason. -->
     <string name="RegistrationActivity_unable_to_request_verification_code">Nie udało się zażądać kodu weryfikacyjnego. Sprawdź swoje połączenie sieciowe i spróbuj ponownie.</string>
     <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">Molly Android - Format numeru telefonu</string>
     <!--    Small "toast" notification to the user confirming that they have requested a new code via voice call.-->
@@ -2367,7 +2413,7 @@
     <string name="SubmitDebugLogActivity_this_log_will_be_posted_publicly_online_for_contributors">Ten log zostanie upubliczniony online, aby umożliwić twórcom aplikacji jego sprawdzenie. Możesz go przejrzeć przed przesłaniem.</string>
 
     <!-- SupportEmailUtil -->
-  <!-- Removed by excludeNonTranslatables <string name="SupportEmailUtil_support_email" translatable="false">support@molly.im</string> -->
+  <!-- Removed by excludeNonTranslatables <string name="SupportEmailUtil_support_email" translatable="false">support@signal.org</string> -->
     <string name="SupportEmailUtil_filter">Filtr:</string>
     <string name="SupportEmailUtil_device_info">Dane urządzenia:</string>
     <string name="SupportEmailUtil_android_version">Wersja Androida:</string>
@@ -2883,6 +2929,8 @@
     <string name="ConversationUpdateItem_loading">Ładowanie</string>
     <string name="ConversationUpdateItem_learn_more">Dowiedz się więcej</string>
     <string name="ConversationUpdateItem_join_call">Dołącz do rozmowy</string>
+    <!-- Action button label for starting a new call in the current conversation -->
+    <string name="ConversationUpdateItem_call_back">Oddzwoń</string>
     <string name="ConversationUpdateItem_return_to_call">Wróć do rozmowy</string>
     <string name="ConversationUpdateItem_call_is_full">Połączenie jest pełne</string>
     <string name="ConversationUpdateItem_invite_friends">Zaproś znajomych</string>
@@ -2947,6 +2995,7 @@
     <string name="safety_number_change_dialog__leave_call">Opuść rozmowę</string>
     <string name="safety_number_change_dialog__the_following_people_may_have_reinstalled_or_changed_devices">Następujące osoby mogły ponownie zainstalować aplikację lub zmienić urządzenie. Zweryfikuj wasze numery bezpieczeństwa, aby zapewnić prywatność.</string>
     <string name="safety_number_change_dialog__view">Zobacz</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">Wcześniej zweryfikowane</string>
 
     <!-- EnableCallNotificationSettingsDialog__call_notifications_checklist -->
@@ -3274,6 +3323,7 @@
 
     <string name="arrays__default">Domyślny</string>
     <string name="arrays__high">Wysoki</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">Maksymalny</string>
 
     <!-- plurals.xml -->
@@ -3551,7 +3601,7 @@
     <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 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>
@@ -3600,6 +3650,14 @@
     <!-- Storage permission row description -->
     <string name="GrantPermissionsFragment__send_photos_videos_and_files">Wysyłaj zdjęcia, wideo i pliki ze swojego urządzenia.</string>
 
+    <!-- PermissionDeniedBottomSheet -->
+    <!-- Sheet describing step 1 on how to give permissions by opening settings -->
+    <string name="PermissionDeniedBottomSheet__1_tap_settings_below">1. Tap “Settings” below</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 Allow the permission</string>
+    <!-- Label for button at the bottom of the sheet which opens the system permission settings -->
+    <string name="PermissionDeniedBottomSheet__settings">Settings</string>
+
     <!-- PaymentsSecuritySetupFragment -->
     <!-- Toolbar title -->
     <string name="PaymentsSecuritySetupFragment__security_setup">Konfiguracja bezpieczeństwa</string>
@@ -3640,6 +3698,7 @@
     <string name="PaymentsDetailsFragment__sent_to_s">Wysłano do %1$s</string>
     <string name="PaymentsDetailsFragment__you_on_s_at_s">Ty, dnia %1$s o %2$s</string>
     <string name="PaymentsDetailsFragment__s_on_s_at_s">%1$s dnia %2$s o %3$s</string>
+    <!-- Prefix to a name to indicate who a payment was sent to -->
     <string name="PaymentsDetailsFragment__to">Do</string>
     <string name="PaymentsDetailsFragment__from">Od</string>
     <string name="PaymentsDetailsFragment__information">Szczegóły transakcji, uwzględniające kwotę i czas transakcji, są częścią rejestru waluty MobileCoin.</string>
@@ -3702,6 +3761,7 @@
     <string name="ConfirmPayment__confirm_payment">Potwierdź płatność</string>
     <string name="ConfirmPayment__network_fee">Opłata sieciowa</string>
     <string name="ConfirmPayment__estimated_s">Szacowane %1$s</string>
+    <!-- Prefix to a name to indicate who a payment will be sent to -->
     <string name="ConfirmPayment__to">Do</string>
     <string name="ConfirmPayment__total_amount">Suma</string>
     <string name="ConfirmPayment__balance_s">Środki: %1$s</string>
@@ -3856,6 +3916,14 @@
     <string name="conversation_group_options__conversation">Czat</string>
     <string name="conversation_group_options__broadcast">Nadawanie</string>
 
+    <!-- DoubleTapEditEducationSheet -->
+    <!-- Displayed as the title of the education bottom sheet -->
+    <string name="DoubleTapEditEducationSheet__double_tap_edit_title">Double tap to edit</string>
+    <!-- Text on the sheet explaining how double tapping on a message will let them edit it -->
+    <string name="DoubleTapEditEducationSheet__quickly_tap_twice">Quickly tap twice on your messages to edit them. You can edit your messages up to 24hrs after they’ve been sent.</string>
+    <!-- Button label to dismiss sheet -->
+    <string name="DoubleTapEditEducationSheet__got_it">Got it</string>
+
     <!-- text_secure_normal -->
     <string name="text_secure_normal__menu_new_group">Nowa grupa</string>
     <string name="text_secure_normal__menu_settings">Ustawienia</string>
@@ -4324,6 +4392,7 @@
     <string name="RecipientBottomSheet_copied_to_clipboard">Skopiowano do schowka</string>
 
     <string name="GroupRecipientListItem_admin">Administrator</string>
+    <!-- Button text to approve a user that has requested to join a group -->
     <string name="GroupRecipientListItem_approve_description">Zaakceptuj</string>
     <string name="GroupRecipientListItem_deny_description">Odrzuć</string>
 
@@ -4351,6 +4420,7 @@
 
     <!-- VoiceNoteMediaDescriptionCompatFactory -->
     <string name="VoiceNoteMediaItemFactory__voice_message">Wiadomość głosowa · %1$s</string>
+    <!-- This is a title in a banner describing the conversation sender to receiver placeholders of the currently playing voice memo. -->
     <string name="VoiceNoteMediaItemFactory__s_to_s">%1$s do %2$s</string>
 
     <!-- StorageUtil -->
@@ -4364,8 +4434,20 @@
     <string name="ReviewCardDialogFragment__review_members">Przejrzyj członków</string>
     <!-- Title of a screen where the user will be prompted to review a message request matching the name of someone they already know -->
     <string name="ReviewCardDialogFragment__review_request">Przejrzyj prośby</string>
-    <string name="ReviewCardDialogFragment__d_group_members_have_the_same_name">%1$d członków grupy ma takie samo imię, przejrzyj poniższych członków i podejmij działania.</string>
-    <string name="ReviewCardDialogFragment__if_youre_not_sure">Jeśli nie masz pewności, od kogo pochodzi ta prośba, przejrzyj poniższe kontakty i podejmij działania.</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="few">%1$d group members have the same name, review the members below and choose to take action.</item>
+        <item quantity="many">%1$d group members have the same name, review the members 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 -->
+    <plurals name="ReviewCardDialogFragment__if_youre_not_sure">
+        <item quantity="one">If you\'re not sure who the request is from, review the contact below and take action.</item>
+        <item quantity="few">If you\'re not sure who the request is from, review the contacts below and take action.</item>
+        <item quantity="many">If you\'re not sure who the request is from, review the contacts below and take action.</item>
+        <item quantity="other">If you\'re not sure who the request is from, review the contacts below and take action.</item>
+    </plurals>
     <string name="ReviewCardDialogFragment__no_other_groups_in_common">Brak innych, wspólnych grup.</string>
     <string name="ReviewCardDialogFragment__no_groups_in_common">Brak wspólnych grup.</string>
     <plurals name="ReviewCardDialogFragment__d_other_groups_in_common">
@@ -4400,11 +4482,24 @@
     <string name="CallParticipantsListUpdatePopupWindow__s_joined">%1$s dołączył(a)</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_and_s_joined">%1$s i %2$s dołączyli(ły)</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_s_and_s_joined">%1$s, %2$s i %3$s dołączyli(ły)</string>
-    <string name="CallParticipantsListUpdatePopupWindow__s_s_and_d_others_joined">%1$s, %2$s i %3$d innych dołączyło</string>
+    <!-- Toast message shown in group call when 3 or more people join -->
+    <plurals name="CallParticipantsListUpdatePopupWindow__s_s_and_d_others_joined">
+        <item quantity="one">%1$s, %2$s and %3$d other joined</item>
+        <item quantity="few">%1$s, %2$s and %3$d others joined</item>
+        <item quantity="many">%1$s, %2$s and %3$d others joined</item>
+        <item quantity="other">%1$s, %2$s and %3$d others joined</item>
+    </plurals>
+    <!-- Toast/popup text shown when someone leaves a group call -->
     <string name="CallParticipantsListUpdatePopupWindow__s_left">%1$s opuścił(a) rozmowę</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_and_s_left">%1$s i %2$s opuścii(ły) rozmowę</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_s_and_s_left">%1$s, %2$s i %3$s opuścili(ły) rozmowę</string>
-    <string name="CallParticipantsListUpdatePopupWindow__s_s_and_d_others_left">%1$s, %2$s i %3$d innych opuściło rozmowę</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 and %3$d other left</item>
+        <item quantity="few">%1$s, %2$s and %3$d others left</item>
+        <item quantity="many">%1$s, %2$s and %3$d others left</item>
+        <item quantity="other">%1$s, %2$s and %3$d others left</item>
+    </plurals>
 
     <string name="CallParticipant__you">Ty</string>
     <string name="CallParticipant__you_on_another_device">Ty (na innym urządzeniu)</string>
@@ -4778,10 +4873,17 @@
 
     <!-- PrivacySettingsFragment -->
     <string name="PrivacySettingsFragment__blocked">Zablokowano</string>
-    <string name="PrivacySettingsFragment__d_contacts">%1$d kontakty(ów)</string>
+    <!-- Settings label that shows the number blocked contacts -->
+    <plurals name="PrivacySettingsFragment__d_contacts">
+        <item quantity="one">%1$d contact</item>
+        <item quantity="few">%1$d contacts</item>
+        <item quantity="many">%1$d contacts</item>
+        <item quantity="other">%1$d contacts</item>
+    </plurals>
     <string name="PrivacySettingsFragment__messaging">Wiadomości</string>
     <string name="PrivacySettingsFragment__disappearing_messages">Znikające wiadomości</string>
     <string name="PrivacySettingsFragment__app_security">Bezpieczeństwo aplikacji</string>
+    <!-- This refers to the multi-tasking overview (recent apps) from the Android operating system.-->
     <string name="PrivacySettingsFragment__block_screenshots_in_the_recents_list_and_inside_the_app">Blokuj zrzuty ekranu na liście aktywnych oraz w aplikacji</string>
     <string name="PrivacySettingsFragment__signal_message_and_calls">Wiadomości i połączenia Signal, zawsze przekazuj połączenia i ukryty nadawca</string>
     <string name="PrivacySettingsFragment__default_timer_for_new_changes">Domyślny czas dla nowych czatów</string>
@@ -4838,11 +4940,14 @@
     <string name="DataAndStorageSettingsFragment__media_quality">Jakość multimediów</string>
     <string name="DataAndStorageSettingsFragment__sent_media_quality">Jakość wysyłanych multimediów</string>
     <string name="DataAndStorageSettingsFragment__sending_high_quality_media_will_use_more_data">Wysyłanie multimediów wysokiej jakości zużywa więcej danych.</string>
+    <!-- Setting option that can be selected to default media to be sent as high quality by default -->
     <string name="DataAndStorageSettingsFragment__high">Wysoka</string>
+    <!-- Setting option that can be selected to default media to be sent as standard quality by default -->
     <string name="DataAndStorageSettingsFragment__standard">Standardowa</string>
     <string name="DataAndStorageSettingsFragment__calls">Połączenia</string>
 
     <!-- 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__use_custom_colors">Użyj własnych kolorów</string>
     <string name="ChatColorSelectionFragment__chat_color">Kolor czatu</string>
@@ -5060,6 +5165,7 @@
     <string name="AvatarPickerFragment__take_a_picture">Zrób zdjęcie</string>
     <string name="AvatarPickerFragment__choose_a_photo">Wybierz zdjęcie</string>
     <string name="AvatarPickerFragment__photo">Zdjęcie</string>
+    <!-- Button label during avatar selection/creation that when tapped lets you generate an avatar from typed in text. -->
     <string name="AvatarPickerFragment__text">Tekst</string>
     <string name="AvatarPickerFragment__save">Zapisz</string>
     <string name="AvatarPickerFragment__clear_avatar">Usuń awatar</string>
@@ -5128,7 +5234,7 @@
     <string name="MediaReviewFragment__add_a_message">Dodaj wiadomość</string>
     <string name="MediaReviewFragment__add_a_reply">Dodaj odpowiedź</string>
     <string name="MediaReviewFragment__send_to">Wyślij do</string>
-    <string name="MediaReviewFragment__view_once_message">Wiadomość jednorazowa</string>
+    <string name="MediaReviewFragment__view_once_message">Multimedia jednorazowe</string>
     <string name="MediaReviewFragment__one_or_more_items_were_too_large">Co najmniej jeden element był zbyt duży</string>
     <string name="MediaReviewFragment__one_or_more_items_were_invalid">Co najmniej jeden element był nieprawidłowy</string>
     <string name="MediaReviewFragment__too_many_items_selected">Zbyt wiele wybranych elementów</string>
@@ -5731,7 +5837,7 @@
     <string name="StoryViewerFragment__s_s">%1$s %2$s</string>
     <!-- Displayed when viewing a post you sent -->
     <string name="StoryViewerPageFragment__you">Ty</string>
-    <!-- Displayed when viewing a post displayed to a group -->
+    <!-- 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 do %2$s</string>
     <!-- Displayed when viewing a post from another user with no replies -->
     <string name="StoryViewerPageFragment__reply">Odpowiedz</string>
@@ -6972,7 +7078,7 @@
     <!-- Title displayed at the top of the screen -->
     <string name="NicknameActivity__nickname">Pseudonim</string>
     <!-- Subtitle displayed under title -->
-    <string name="NicknameActivity__nicknames_amp_notes">Nicknames &amp; notes are stored with Signal and end-to-end encrypted. They are only visible to you.</string>
+    <string name="NicknameActivity__nicknames_amp_notes">Pseudonimy i notatki są przechowywane przez Signal za pomocą usługi szyfrowania typu end-to-end. Są one widoczne tylko dla Ciebie.</string>
     <!-- Field label for given name -->
     <string name="NicknameActivity__first_name">Imię</string>
     <!-- Content description for first name clear button -->
@@ -6986,9 +7092,9 @@
     <!-- Button label to save -->
     <string name="NicknameActivity__save">Zapisz</string>
     <!-- Dialog title for note and name deletion -->
-    <string name="NicknameActivity__delete_nickname">Delete?</string>
+    <string name="NicknameActivity__delete_nickname">Usunąć?</string>
     <!-- Dialog message for note and name deletion -->
-    <string name="NicknameActivity__this_will_permanently_delete_this_nickname_and_note">This will permanently delete any nickname and note you’ve set.</string>
+    <string name="NicknameActivity__this_will_permanently_delete_this_nickname_and_note">Spowoduje to trwałe usunięcie pseudonimu i notatki.</string>
 
     <!-- ViewNoteBottomSheetDialogFragment -->
     <!-- Sheet title -->
@@ -6996,5 +7102,26 @@
     <!-- Content description for opening the note editor -->
     <string name="ViewNoteSheet__edit_note">Edytuj notatkę</string>
 
+    <!-- BackupProgressService -->
+    <!-- Notification title shown while backup restore job is running -->
+    <string name="BackupProgressService_title">Przywracanie kopii zapasowej…</string>
+    <!-- Notification title shown while downloading backup restore data -->
+    <string name="BackupProgressService_title_downloading">Pobieranie danych kopii zapasowej…</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>
+    <!-- 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 -->
+    <string name="BackupsTypeSettingsFragment__google_pay">Google Pay</string>
+    <!-- Displayed as the user\'s payment method as a label in a preference row -->
+    <string name="BackupsTypeSettingsFragment__bank_transfer">Bank transfer</string>
+    <!-- Displayed as the user\'s payment method as a label in a preference row -->
+    <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>
+
+
     <!-- 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 680db7c062..60e21f3726 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -1,6 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- smartling.instruction_comments_enabled = on -->
-<resources>
+<?xml version="1.0" encoding="UTF-8"?><!-- 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> -->
@@ -89,6 +87,16 @@
     <string name="AttachmentManager_signal_requires_the_external_storage_permission_in_order_to_attach_photos_videos_or_audio">O Molly 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 Molly 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 Molly 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>
+
+    <!-- Dialog title asking users for location permission -->
+    <string name="AttachmentManager_signal_allow_access_location">Allow access to your location</string>
+    <!-- Dialog description that will explain the steps needed to give location permission -->
+    <string name="AttachmentManager_signal_to_send_location">To send your location:</string>
+    <!-- Alert dialog description asking for location permission -->
+    <string name="AttachmentManager_signal_allow_signal_access_location">Allow Molly access to send your location.</string>
+    <!-- Toast text explaining Signal\'s need for location access -->
+    <string name="AttachmentManager_signal_needs_location_access">Molly needs location access to send your location.</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>
     <!-- Alert dialog description to send the recipient a request to activate payments -->
@@ -241,7 +249,7 @@
     <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>
@@ -386,8 +394,16 @@
     <string name="ConversationActivity_your_request_to_join_has_been_sent_to_the_group_admin">Seu pedido para participar foi enviado ao administrador do grupo. Você será notificado quando a decisão for tomada.</string>
     <string name="ConversationActivity_cancel_request">Cancelar pedido</string>
 
-    <string name="ConversationActivity_to_send_audio_messages_allow_signal_access_to_your_microphone">Para enviar mensagens de áudio, permita ao Molly acesso ao seu microfone.</string>
+    <!-- Dialog title asking users for microphone permission -->
+    <string name="ConversationActivity_allow_access_microphone">Allow access to your microphone</string>
+    <!-- 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>
+    <!-- Toast text explaining Signal\'s need for microphone access -->
+    <string name="ConversationActivity_signal_needs_microphone_access_voice_message">Molly needs microphone access to record a voice message.</string>
     <string name="ConversationActivity_signal_requires_the_microphone_permission_in_order_to_send_audio_messages">O Molly 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_the_microphone_and_camera_permissions_in_order_to_call_s">O Molly 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 Molly acessar a câmera.</string>
     <string name="ConversationActivity_signal_needs_the_camera_permission_to_take_photos_or_video">O Molly 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>
@@ -411,10 +427,17 @@
     <string name="ConversationActivity_you_will_leave_this_group_and_it_will_be_deleted_from_all_of_your_devices">Você deixará este grupo, que será apagada de todos os seus dispositivos.</string>
     <string name="ConversationActivity_delete">Apagar</string>
     <string name="ConversationActivity_delete_and_leave">Apagar e sair</string>
-    <string name="ConversationActivity__to_call_s_signal_needs_access_to_your_microphone">Para chamar %1$s, Molly precisa acessar seu microfone</string>
+
+    <!-- Dialog description that will explain the steps needed to give microphone permissions for a voice call -->
+    <string name="ConversationActivity__to_start_call">To start a 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">To start a call, allow Molly access to your microphone.</string>
+    <!-- Toast text explaining Signal\'s need for microphone access for a voice call -->
+    <string name="ConversationActivity_signal_needs_microphone_access_voice_call">Molly needs microphone access to start a call.</string>
 
 
     <string name="ConversationActivity_join">Entrar</string>
+    <!-- Button text for an active group call but the call is currently full and unjoinable -->
     <string name="ConversationActivity_full">Lotada</string>
 
     <string name="ConversationActivity_error_sending_media">Erro ao enviar a mídia</string>
@@ -613,6 +636,7 @@
     <string name="ConversationListFragment_unarchive">Desarquivar</string>
     <string name="ConversationListFragment_delete">Excluir</string>
     <string name="ConversationListFragment_select_all">Marcar todas</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 selecionada</item>
         <item quantity="other">%1$d selecionadas</item>
@@ -864,6 +888,7 @@
         <item quantity="one">Convite enviado</item>
         <item quantity="other">%1$d convites enviados</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">“%1$s” não pode ser automaticamente adicionado a este grupo por você.\n\nEles foram convidados a participar, e não verão nenhuma mensagem do grupo até que aceitem.</string>
     <string name="GroupManagement_invite_multiple_users">Estas pessoas não podem ser adicionadas automaticamente no grupo.\n\nElas foram convidadas a participar do grupo, e não verão nenhuma mensagem do grupo até que aceitem.</string>
 
@@ -1044,7 +1069,9 @@
 
     <string name="ManageGroupActivity_edit_name_and_picture">Editar nome e foto</string>
     <string name="ManageGroupActivity_legacy_group">Grupo Legado</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 é um Grupo Legado. Recursos como administradores de grupos só estão disponíveis em Novos Grupos.</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 é um Grupo Legado. Para acessar novos recursos como @menções e administradores,</string>
     <string name="ManageGroupActivity_legacy_group_too_large">Este Grupo Legado não pode ser atualizado para um Grupo Novo porque é muito grande. O tamanho máximo de grupos é %1$d.</string>
     <string name="ManageGroupActivity_upgrade_this_group">atualizar este grupo.</string>
@@ -1271,6 +1298,7 @@
         <item quantity="other">Apagadas</item>
     </plurals>
 
+    <!-- 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 selecionada (%2$s)</item>
         <item quantity="other">%1$d selecionadas (%2$s)</item>
@@ -1335,17 +1363,13 @@
     <string name="MessageRecord_left_group">Você saiu do grupo.</string>
     <string name="MessageRecord_you_updated_group">Você atualizou o grupo.</string>
     <string name="MessageRecord_the_group_was_updated">O grupo foi atualizado.</string>
-    <!-- Update message shown when placing an outgoing 1:1 voice/audio call and it\'s answered by the other party -->
+    <!-- Update message shown when placing an outgoing 1:1 voice/audio call -->
     <string name="MessageRecord_outgoing_voice_call">Chamada de voz efetuada</string>
-    <!-- Update message shown when placing an outgoing 1:1 video call and it\'s answered by the other party -->
+    <!-- Update message shown when placing an outgoing 1:1 video call -->
     <string name="MessageRecord_outgoing_video_call">Chamada de vídeo efetuada</string>
-    <!-- Update message shown when placing an outgoing 1:1 voice/audio call and it\'s not answered by the other party -->
-    <string name="MessageRecord_unanswered_voice_call">Chamada de voz não atendida</string>
-    <!-- Update message shown when placing an outgoing 1:1 video call and it\'s not answered by the other party -->
-    <string name="MessageRecord_unanswered_video_call">Chamada de vídeo não atendida</string>
-    <!-- Update message shown when receiving an incoming 1:1 voice/audio call and it\'s answered -->
+    <!-- Update message shown when receiving an incoming 1:1 voice/audio call and it\'s answered or ringing -->
     <string name="MessageRecord_incoming_voice_call">Chamada de voz recebida</string>
-    <!-- Update message shown when receiving an incoming 1:1 video call and answered -->
+    <!-- Update message shown when receiving an incoming 1:1 video call and answered or ringing -->
     <string name="MessageRecord_incoming_video_call">Chamada de vídeo recebida</string>
     <!-- Update message shown when receiving an incoming 1:1 voice/audio call and not answered -->
     <string name="MessageRecord_missed_voice_call">Chamada de voz perdida</string>
@@ -1355,10 +1379,6 @@
     <string name="MessageRecord_missed_voice_call_notification_profile">Chamada de voz perdida com o perfil de notificação ativado</string>
     <!-- Update message shown when receiving an incoming video call and declined due to notification profile -->
     <string name="MessageRecord_missed_video_call_notification_profile">Chamada de vídeo perdida com o perfil de notificação ativado</string>
-    <!-- Update message shown when receiving an incoming 1:1 voice/audio call and explicitly declined -->
-    <string name="MessageRecord_you_declined_a_voice_call">Você recusou uma chamada de voz</string>
-    <!-- Update message shown when receiving an incoming 1:1 video call and explicitly declined -->
-    <string name="MessageRecord_you_declined_a_video_call">Você recusou uma chamada de vídeo</string>
     <!-- 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 atualizou o grupo.</string>
@@ -1567,30 +1587,55 @@
     <string name="MessageRecord_can_accept_payments">%1$s já pode aceitar Pagamentos</string>
 
     <!-- Group Calling update messages -->
-    <string name="MessageRecord_s_started_a_group_call_s">%1$s começou uma chamada em grupo · %2$s</string>
-    <string name="MessageRecord_you_started_a_group_call_s">Você começou uma chamada em grupo · %1$s</string>
-    <string name="MessageRecord_s_is_in_the_group_call_s">%1$s está na chamada em grupo · %2$s</string>
-    <string name="MessageRecord_you_are_in_the_group_call_s1">Você está na chamada em grupo · %1$s</string>
-    <string name="MessageRecord_s_and_s_are_in_the_group_call_s1">%1$s e %2$s estão na chamada em grupo · %3$s</string>
-    <string name="MessageRecord_group_call_s">Chamada em grupo · %1$s</string>
-
-    <string name="MessageRecord_s_started_a_group_call">%1$s começou uma chamada em grupo</string>
-    <string name="MessageRecord_you_started_a_group_call">Você começou uma chamada em grupo</string>
-    <string name="MessageRecord_s_is_in_the_group_call">%1$s está na chamada em grupo</string>
-    <string name="MessageRecord_you_are_in_the_group_call">Você está na chamada em grupo</string>
-    <string name="MessageRecord_s_and_s_are_in_the_group_call">%1$s e %2$s estão na chamada em grupo</string>
-    <string name="MessageRecord_group_call">Chamada em grupo</string>
+    <!-- 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 está na chamada · %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">Você está na chamada · %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 e %2$s estão na chamada · %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 está na chamada</string>
+    <!-- Chat log text for an ongoing group call only the local user has joined -->
+    <string name="MessageRecord_you_are_in_the_call">Você está na chamada</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 e %2$s estão na chamada</string>
+    <!-- Chat log text for a group call that ended within the last 5 minutes -->
+    <string name="MessageRecord__the_video_call_has_ended">A chamada de vídeo foi encerrada</string>
+    <!-- Chat log text for a group call that ended within the last 5 minutes with a placeholder for formatted time -->
+    <string name="MessageRecord__the_video_call_has_ended_s">A chamada de vídeo foi encerrada · %1$s</string>
+    <!-- Chat log text for a group call that ended more than 5 minutes ago and was missed -->
+    <string name="MessageRecord__missed_video_call">Chamada de vídeo perdida</string>
+    <!-- Chat log text for a group call that ended more than 5 minutes ago and was missed with a placeholder for formatted time -->
+    <string name="MessageRecord__missed_video_call_s">Chamada de vídeo perdida · %1$s</string>
+    <!-- Chat log text for a group call that ended that the local user did not start -->
+    <string name="MessageRecord__incoming_video_call">Chamada de vídeo recebida</string>
+    <!-- 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">Chamada de vídeo recebida · %1$s</string>
+    <!-- Chat log text for a group call that ended that the local user started -->
+    <string name="MessageRecord__outgoing_video_call">Chamada de vídeo efetuada</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">Chamada de vídeo efetuada · %1$s</string>
+    <!-- Chat log text for an ongoing group call that the local user started -->
+    <string name="MessageRecord__you_started_a_video_call">Você iniciou uma chamada de vídeo</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">Você iniciou uma chamada de vídeo · %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 iniciou uma chamada de vídeo</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 iniciou uma chamada de vídeo · %2$s</string>
 
     <string name="MessageRecord_you">Você</string>
 
-    <plurals name="MessageRecord_s_s_and_d_others_are_in_the_group_call_s">
-        <item quantity="one">%1$s, %2$s e %3$d outra pessoa estão na ligação em grupo · %4$s</item>
-        <item quantity="other">%1$s, %2$s e %3$d outras pessoas estão na ligação em grupo · %4$s</item>
+    <!-- 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 e mais %3$d pessoa estão na ligação em grupo · %4$s</item>
+        <item quantity="other">%1$s, %2$s e mais %3$d pessoas estão na ligação em grupo · %4$s</item>
     </plurals>
 
-    <plurals name="MessageRecord_s_s_and_d_others_are_in_the_group_call">
-        <item quantity="one">%1$s, %2$s e %3$d outra pessoa estão na ligação em grupo</item>
-        <item quantity="other">%1$s, %2$s e %3$d outras pessoas estão na ligação em grupo</item>
+    <!-- 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 e mais %3$d pessoa estão na ligação em grupo</item>
+        <item quantity="other">%1$s, %2$s e mais %3$d pessoas estão na ligação em grupo</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. -->
@@ -2063,6 +2108,7 @@
     <!-- Generic error when the app is unable to request an SMS code for an unknown reason. -->
     <string name="RegistrationActivity_unable_to_request_verification_code">Não foi possível solicitar um código de verificação. Verifique a sua conexão de rede e tente novamente.</string>
     <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">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.-->
@@ -2207,7 +2253,7 @@
     <string name="SubmitDebugLogActivity_this_log_will_be_posted_publicly_online_for_contributors">Este registro será postado publicamente on-line para que os contribuidores possam vê-lo. Você pode analisá-lo antes de enviar.</string>
 
     <!-- SupportEmailUtil -->
-  <!-- Removed by excludeNonTranslatables <string name="SupportEmailUtil_support_email" translatable="false">support@molly.im</string> -->
+  <!-- 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">Info do aparelho:</string>
     <string name="SupportEmailUtil_android_version">Versão do Android:</string>
@@ -2709,6 +2755,8 @@
     <string name="ConversationUpdateItem_loading">Carregando</string>
     <string name="ConversationUpdateItem_learn_more">Saiba mais</string>
     <string name="ConversationUpdateItem_join_call">Participar da chamada</string>
+    <!-- Action button label for starting a new call in the current conversation -->
+    <string name="ConversationUpdateItem_call_back">Retornar a chamada</string>
     <string name="ConversationUpdateItem_return_to_call">Voltar para a chamada</string>
     <string name="ConversationUpdateItem_call_is_full">A chamada está lotada</string>
     <string name="ConversationUpdateItem_invite_friends">Convidar amigos(as)</string>
@@ -2773,6 +2821,7 @@
     <string name="safety_number_change_dialog__leave_call">Sair da chamada</string>
     <string name="safety_number_change_dialog__the_following_people_may_have_reinstalled_or_changed_devices">As seguintes pessoas podem ter reinstalado o Signal ou mudado de aparelho. Verifique o seu número de segurança com elas para garantir a sua privacidade e a delas.</string>
     <string name="safety_number_change_dialog__view">Exibir</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">Já verificado</string>
 
     <!-- EnableCallNotificationSettingsDialog__call_notifications_checklist -->
@@ -3086,6 +3135,7 @@
 
     <string name="arrays__default">Padrão</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 -->
@@ -3357,7 +3407,7 @@
     <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 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>
@@ -3406,6 +3456,14 @@
     <!-- Storage permission row description -->
     <string name="GrantPermissionsFragment__send_photos_videos_and_files">Envie fotos, vídeos e arquivos do seu dispositivo.</string>
 
+    <!-- PermissionDeniedBottomSheet -->
+    <!-- Sheet describing step 1 on how to give permissions by opening settings -->
+    <string name="PermissionDeniedBottomSheet__1_tap_settings_below">1. Tap “Settings” below</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 Allow the permission</string>
+    <!-- Label for button at the bottom of the sheet which opens the system permission settings -->
+    <string name="PermissionDeniedBottomSheet__settings">Settings</string>
+
     <!-- PaymentsSecuritySetupFragment -->
     <!-- Toolbar title -->
     <string name="PaymentsSecuritySetupFragment__security_setup">Configuração de segurança</string>
@@ -3446,6 +3504,7 @@
     <string name="PaymentsDetailsFragment__sent_to_s">Enviado para %1$s</string>
     <string name="PaymentsDetailsFragment__you_on_s_at_s">Você em %1$s às %2$s</string>
     <string name="PaymentsDetailsFragment__s_on_s_at_s">%1$s em %2$s à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">Os detalhes da transação, incluindo o valor do pagamento e a hora da transação, fazem parte do Livro-razão MobileCoin.</string>
@@ -3508,6 +3567,7 @@
     <string name="ConfirmPayment__confirm_payment">Confirmar pagamento</string>
     <string name="ConfirmPayment__network_fee">Taxa de transação</string>
     <string name="ConfirmPayment__estimated_s">Estimada em %1$s</string>
+    <!-- Prefix to a name to indicate who a payment will be sent to -->
     <string name="ConfirmPayment__to">Para</string>
     <string name="ConfirmPayment__total_amount">Valor total</string>
     <string name="ConfirmPayment__balance_s">Saldo: %1$s</string>
@@ -3658,6 +3718,14 @@
     <string name="conversation_group_options__conversation">Chat</string>
     <string name="conversation_group_options__broadcast">Transmissão</string>
 
+    <!-- DoubleTapEditEducationSheet -->
+    <!-- Displayed as the title of the education bottom sheet -->
+    <string name="DoubleTapEditEducationSheet__double_tap_edit_title">Double tap to edit</string>
+    <!-- Text on the sheet explaining how double tapping on a message will let them edit it -->
+    <string name="DoubleTapEditEducationSheet__quickly_tap_twice">Quickly tap twice on your messages to edit them. You can edit your messages up to 24hrs after they’ve been sent.</string>
+    <!-- Button label to dismiss sheet -->
+    <string name="DoubleTapEditEducationSheet__got_it">Got it</string>
+
     <!-- text_secure_normal -->
     <string name="text_secure_normal__menu_new_group">Novo grupo</string>
     <string name="text_secure_normal__menu_settings">Configurações</string>
@@ -4112,6 +4180,7 @@
     <string name="RecipientBottomSheet_copied_to_clipboard">Copiado para a área de transferência</string>
 
     <string name="GroupRecipientListItem_admin">Admin</string>
+    <!-- Button text to approve a user that has requested to join a group -->
     <string name="GroupRecipientListItem_approve_description">Aprovar</string>
     <string name="GroupRecipientListItem_deny_description">Recusar</string>
 
@@ -4139,6 +4208,7 @@
 
     <!-- VoiceNoteMediaDescriptionCompatFactory -->
     <string name="VoiceNoteMediaItemFactory__voice_message">Mensagem de voz · %1$s</string>
+    <!-- This is a title in a banner describing the conversation sender to receiver placeholders of the currently playing voice memo. -->
     <string name="VoiceNoteMediaItemFactory__s_to_s">%1$s para %2$s</string>
 
     <!-- StorageUtil -->
@@ -4152,8 +4222,16 @@
     <string name="ReviewCardDialogFragment__review_members">Revisar os membros</string>
     <!-- Title of a screen where the user will be prompted to review a message request matching the name of someone they already know -->
     <string name="ReviewCardDialogFragment__review_request">Analisar o pedido</string>
-    <string name="ReviewCardDialogFragment__d_group_members_have_the_same_name">%1$d membros do grupo têm o mesmo nome. Revise os membros abaixo e decida o que fazer.</string>
-    <string name="ReviewCardDialogFragment__if_youre_not_sure">Se você não tiver certeza de quem é o pedido, revise os contatos abaixo e tome as providências.</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="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 -->
+    <plurals name="ReviewCardDialogFragment__if_youre_not_sure">
+        <item quantity="one">If you\'re not sure who the request is from, review the contact below and take action.</item>
+        <item quantity="other">If you\'re not sure who the request is from, review the contacts below and take action.</item>
+    </plurals>
     <string name="ReviewCardDialogFragment__no_other_groups_in_common">Nenhum outro grupo em comum.</string>
     <string name="ReviewCardDialogFragment__no_groups_in_common">Não há grupos em comum.</string>
     <plurals name="ReviewCardDialogFragment__d_other_groups_in_common">
@@ -4184,11 +4262,20 @@
     <string name="CallParticipantsListUpdatePopupWindow__s_joined">%1$s entrou</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_and_s_joined">%1$s e %2$s entraram</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_s_and_s_joined">%1$s, %2$s e %3$s entraram</string>
-    <string name="CallParticipantsListUpdatePopupWindow__s_s_and_d_others_joined">%1$s, %2$s e %3$d outras pessoas entraram</string>
+    <!-- Toast message shown in group call when 3 or more people join -->
+    <plurals name="CallParticipantsListUpdatePopupWindow__s_s_and_d_others_joined">
+        <item quantity="one">%1$s, %2$s and %3$d other joined</item>
+        <item quantity="other">%1$s, %2$s and %3$d others joined</item>
+    </plurals>
+    <!-- Toast/popup text shown when someone leaves a group call -->
     <string name="CallParticipantsListUpdatePopupWindow__s_left">%1$s saiu</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_and_s_left">%1$s e %2$s saíram</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_s_and_s_left">%1$s, %2$s e %3$s saíram</string>
-    <string name="CallParticipantsListUpdatePopupWindow__s_s_and_d_others_left">%1$s, %2$s e %3$d outras pessoas saíram</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 and %3$d other left</item>
+        <item quantity="other">%1$s, %2$s and %3$d others left</item>
+    </plurals>
 
     <string name="CallParticipant__you">Você</string>
     <string name="CallParticipant__you_on_another_device">Você (em outro aparelho)</string>
@@ -4558,10 +4645,15 @@
 
     <!-- PrivacySettingsFragment -->
     <string name="PrivacySettingsFragment__blocked">Bloqueados</string>
-    <string name="PrivacySettingsFragment__d_contacts">%1$d contatos</string>
+    <!-- Settings label that shows the number blocked contacts -->
+    <plurals name="PrivacySettingsFragment__d_contacts">
+        <item quantity="one">%1$d contact</item>
+        <item quantity="other">%1$d contacts</item>
+    </plurals>
     <string name="PrivacySettingsFragment__messaging">Mensagens</string>
     <string name="PrivacySettingsFragment__disappearing_messages">Mensagens efêmeras</string>
     <string name="PrivacySettingsFragment__app_security">Segurança do app</string>
+    <!-- This refers to the multi-tasking overview (recent apps) from the Android operating system.-->
     <string name="PrivacySettingsFragment__block_screenshots_in_the_recents_list_and_inside_the_app">Bloquear capturas de tela na lista de recentes e dentro do aplicativo</string>
     <string name="PrivacySettingsFragment__signal_message_and_calls">Mensagens e chamadas no Signal, redirecionar chamadas e remetente oculto</string>
     <string name="PrivacySettingsFragment__default_timer_for_new_changes">Cronômetro padrão para novos chats</string>
@@ -4618,11 +4710,14 @@
     <string name="DataAndStorageSettingsFragment__media_quality">Qualidade das fotos</string>
     <string name="DataAndStorageSettingsFragment__sent_media_quality">Qualidade da mídia enviada</string>
     <string name="DataAndStorageSettingsFragment__sending_high_quality_media_will_use_more_data">Enviar mídia com alta qualidade usará mais dados de internet.</string>
+    <!-- Setting option that can be selected to default media to be sent as high quality by default -->
     <string name="DataAndStorageSettingsFragment__high">Alta</string>
+    <!-- Setting option that can be selected to default media to be sent as standard quality by default -->
     <string name="DataAndStorageSettingsFragment__standard">Padrão</string>
     <string name="DataAndStorageSettingsFragment__calls">Chamadas</string>
 
     <!-- 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__use_custom_colors">Usar cores personalizadas</string>
     <string name="ChatColorSelectionFragment__chat_color">Cor da conversa</string>
@@ -4834,6 +4929,7 @@
     <string name="AvatarPickerFragment__take_a_picture">Tirar uma foto</string>
     <string name="AvatarPickerFragment__choose_a_photo">Escolher uma foto</string>
     <string name="AvatarPickerFragment__photo">Foto</string>
+    <!-- Button label during avatar selection/creation that when tapped lets you generate an avatar from typed in text. -->
     <string name="AvatarPickerFragment__text">Texto</string>
     <string name="AvatarPickerFragment__save">Salvar</string>
     <string name="AvatarPickerFragment__clear_avatar">Remover foto</string>
@@ -4894,7 +4990,7 @@
     <string name="MediaReviewFragment__add_a_message">Adicionar uma mensagem</string>
     <string name="MediaReviewFragment__add_a_reply">Responder</string>
     <string name="MediaReviewFragment__send_to">Enviar para</string>
-    <string name="MediaReviewFragment__view_once_message">Mensagem efêmera</string>
+    <string name="MediaReviewFragment__view_once_message">Mídia temporária</string>
     <string name="MediaReviewFragment__one_or_more_items_were_too_large">Um ou mais itens são muito grandes</string>
     <string name="MediaReviewFragment__one_or_more_items_were_invalid">Um ou mais itens são inválidos</string>
     <string name="MediaReviewFragment__too_many_items_selected">Muitos itens foram selecionados</string>
@@ -5487,7 +5583,7 @@
     <string name="StoryViewerFragment__s_s">%1$s %2$s</string>
     <!-- Displayed when viewing a post you sent -->
     <string name="StoryViewerPageFragment__you">Você</string>
-    <!-- Displayed when viewing a post displayed to a group -->
+    <!-- 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 em %2$s</string>
     <!-- Displayed when viewing a post from another user with no replies -->
     <string name="StoryViewerPageFragment__reply">Responder</string>
@@ -6704,5 +6800,26 @@
     <!-- Content description for opening the note editor -->
     <string name="ViewNoteSheet__edit_note">Editar nota</string>
 
+    <!-- BackupProgressService -->
+    <!-- Notification title shown while backup restore job is running -->
+    <string name="BackupProgressService_title">Restaurando backup…</string>
+    <!-- Notification title shown while downloading backup restore data -->
+    <string name="BackupProgressService_title_downloading">Baixando dados de backup…</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>
+    <!-- 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 -->
+    <string name="BackupsTypeSettingsFragment__google_pay">Google Pay</string>
+    <!-- Displayed as the user\'s payment method as a label in a preference row -->
+    <string name="BackupsTypeSettingsFragment__bank_transfer">Bank transfer</string>
+    <!-- Displayed as the user\'s payment method as a label in a preference row -->
+    <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>
+
+
     <!-- 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 01d347758d..0263d49e13 100644
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@@ -1,6 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- smartling.instruction_comments_enabled = on -->
-<resources>
+<?xml version="1.0" encoding="UTF-8"?><!-- 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> -->
@@ -89,6 +87,16 @@
     <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">Allow access to your location</string>
+    <!-- Dialog description that will explain the steps needed to give location permission -->
+    <string name="AttachmentManager_signal_to_send_location">To send your location:</string>
+    <!-- Alert dialog description asking for location permission -->
+    <string name="AttachmentManager_signal_allow_signal_access_location">Allow Molly access to send your location.</string>
+    <!-- Toast text explaining Signal\'s need for location access -->
+    <string name="AttachmentManager_signal_needs_location_access">Molly needs location access to send your location.</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>
     <!-- Alert dialog description to send the recipient a request to activate payments -->
@@ -241,7 +249,7 @@
     <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>
@@ -386,8 +394,16 @@
     <string name="ConversationActivity_your_request_to_join_has_been_sent_to_the_group_admin">O seu pedido para entrar foi enviado ao administrador do grupo. Será notificado quando ele tomar uma decisão.</string>
     <string name="ConversationActivity_cancel_request">Cancelar pedido</string>
 
-    <string name="ConversationActivity_to_send_audio_messages_allow_signal_access_to_your_microphone">Para poder enviar mensagens de áudio, permita que o Molly aceda ao microfone.</string>
+    <!-- Dialog title asking users for microphone permission -->
+    <string name="ConversationActivity_allow_access_microphone">Allow access to your microphone</string>
+    <!-- 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>
+    <!-- Toast text explaining Signal\'s need for microphone access -->
+    <string name="ConversationActivity_signal_needs_microphone_access_voice_message">Molly needs microphone access to record a voice message.</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 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>
@@ -411,10 +427,17 @@
     <string name="ConversationActivity_you_will_leave_this_group_and_it_will_be_deleted_from_all_of_your_devices">Irá abandonar este grupo, e ele será eliminado de todos os seus dispositivos.</string>
     <string name="ConversationActivity_delete">Eliminar</string>
     <string name="ConversationActivity_delete_and_leave">Eliminar e abandonar</string>
-    <string name="ConversationActivity__to_call_s_signal_needs_access_to_your_microphone">Para ligar a %1$s, o Molly necessita de ter acesso ao microfone.</string>
+
+    <!-- Dialog description that will explain the steps needed to give microphone permissions for a voice call -->
+    <string name="ConversationActivity__to_start_call">To start a 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">To start a call, allow Molly access to your microphone.</string>
+    <!-- Toast text explaining Signal\'s need for microphone access for a voice call -->
+    <string name="ConversationActivity_signal_needs_microphone_access_voice_call">Molly needs microphone access to start a call.</string>
 
 
     <string name="ConversationActivity_join">Entrar</string>
+    <!-- Button text for an active group call but the call is currently full and unjoinable -->
     <string name="ConversationActivity_full">Cheio(a)</string>
 
     <string name="ConversationActivity_error_sending_media">Erro ao enviar multimédia</string>
@@ -613,6 +636,7 @@
     <string name="ConversationListFragment_unarchive">Desarquivar</string>
     <string name="ConversationListFragment_delete">Eliminar</string>
     <string name="ConversationListFragment_select_all">Selec. tudo</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 selecionada</item>
         <item quantity="other">%1$d selecionadas</item>
@@ -864,6 +888,7 @@
         <item quantity="one">Convite enviado</item>
         <item quantity="other">%1$d convites enviados</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">“%1$s” não pode ser adicionado(a) automaticamente para este grupo por si.\n\nEle(a) foi convidado(a) a juntar-se, mas não irá ver nenhuma mensagem do grupo até que ele(a) aceite.</string>
     <string name="GroupManagement_invite_multiple_users">Estes utilizadores não podem ser adicionados automaticamente a este grupo por si.\n\nEles foram convidados a juntarem-se, mas não irão ver nenhuma mensagem do grupo até que aceite</string>
 
@@ -1044,7 +1069,9 @@
 
     <string name="ManageGroupActivity_edit_name_and_picture">Editar nome e imagem</string>
     <string name="ManageGroupActivity_legacy_group">Grupo legado</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 é um \'Grupo legado\'. Os recursos como administradores de grupo encontram-se apenas disponíveis para \'Grupos novos\'.</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 é um \'Grupo legado\'. Para aceder a novos recursos como as menções e administradores,</string>
     <string name="ManageGroupActivity_legacy_group_too_large">Não pode ser feito o upgrade deste \'Grupo legado\' porque é demasiadamente grande. O tamanho máximo do grupo é de %1$d.</string>
     <string name="ManageGroupActivity_upgrade_this_group">faça o upgrade deste grupo.</string>
@@ -1271,6 +1298,7 @@
         <item quantity="other">Eliminar</item>
     </plurals>
 
+    <!-- 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 selecionado (%2$s)</item>
         <item quantity="other">%1$d selecionados (%2$s)</item>
@@ -1335,17 +1363,13 @@
     <string name="MessageRecord_left_group">Você abandonou o grupo.</string>
     <string name="MessageRecord_you_updated_group">Você atualizou o grupo.</string>
     <string name="MessageRecord_the_group_was_updated">O grupo foi atualizado.</string>
-    <!-- Update message shown when placing an outgoing 1:1 voice/audio call and it\'s answered by the other party -->
+    <!-- Update message shown when placing an outgoing 1:1 voice/audio call -->
     <string name="MessageRecord_outgoing_voice_call">A efetuar chamada de voz</string>
-    <!-- Update message shown when placing an outgoing 1:1 video call and it\'s answered by the other party -->
+    <!-- Update message shown when placing an outgoing 1:1 video call -->
     <string name="MessageRecord_outgoing_video_call">A efetuar videochamada</string>
-    <!-- Update message shown when placing an outgoing 1:1 voice/audio call and it\'s not answered by the other party -->
-    <string name="MessageRecord_unanswered_voice_call">Chamada de voz não atendida</string>
-    <!-- Update message shown when placing an outgoing 1:1 video call and it\'s not answered by the other party -->
-    <string name="MessageRecord_unanswered_video_call">Videochamada não atendida</string>
-    <!-- Update message shown when receiving an incoming 1:1 voice/audio call and it\'s answered -->
+    <!-- Update message shown when receiving an incoming 1:1 voice/audio call and it\'s answered or ringing -->
     <string name="MessageRecord_incoming_voice_call">A receber chamada de voz</string>
-    <!-- Update message shown when receiving an incoming 1:1 video call and answered -->
+    <!-- Update message shown when receiving an incoming 1:1 video call and answered or ringing -->
     <string name="MessageRecord_incoming_video_call">A receber videochamada</string>
     <!-- Update message shown when receiving an incoming 1:1 voice/audio call and not answered -->
     <string name="MessageRecord_missed_voice_call">Chamada de voz perdida</string>
@@ -1355,10 +1379,6 @@
     <string name="MessageRecord_missed_voice_call_notification_profile">Chamada de voz perdida no modo perfil de notificação</string>
     <!-- Update message shown when receiving an incoming video call and declined due to notification profile -->
     <string name="MessageRecord_missed_video_call_notification_profile">Videochamada perdida no modo perfil de notificação</string>
-    <!-- Update message shown when receiving an incoming 1:1 voice/audio call and explicitly declined -->
-    <string name="MessageRecord_you_declined_a_voice_call">Rejeitou uma chamada de voz</string>
-    <!-- Update message shown when receiving an incoming 1:1 video call and explicitly declined -->
-    <string name="MessageRecord_you_declined_a_video_call">Rejeitou uma videochamada</string>
     <!-- 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 atualizou o grupo.</string>
@@ -1567,28 +1587,53 @@
     <string name="MessageRecord_can_accept_payments">%1$s pode agora aceitar Pagamentos</string>
 
     <!-- Group Calling update messages -->
-    <string name="MessageRecord_s_started_a_group_call_s">%1$s iniciou uma chamada em grupo · %2$s</string>
-    <string name="MessageRecord_you_started_a_group_call_s">Iniciou uma chamada de grupo · %1$s</string>
-    <string name="MessageRecord_s_is_in_the_group_call_s">%1$s está na chamada de grupo · %2$s</string>
-    <string name="MessageRecord_you_are_in_the_group_call_s1">Está na chamada de grupo · %1$s</string>
-    <string name="MessageRecord_s_and_s_are_in_the_group_call_s1">%1$s e %2$s estão na chamada de grupo · %3$s</string>
-    <string name="MessageRecord_group_call_s">Chamada de grupo · %1$s</string>
-
-    <string name="MessageRecord_s_started_a_group_call">%1$s iniciou uma chamada de grupo</string>
-    <string name="MessageRecord_you_started_a_group_call">Você iniciou uma chamada de grupo</string>
-    <string name="MessageRecord_s_is_in_the_group_call">%1$s está na chamada de grupo</string>
-    <string name="MessageRecord_you_are_in_the_group_call">Você está na chamada de grupo</string>
-    <string name="MessageRecord_s_and_s_are_in_the_group_call">%1$s e %2$s estão na chamada de grupo</string>
-    <string name="MessageRecord_group_call">Chamada de grupo</string>
+    <!-- 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 está na chamada · %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">Está na chamada · %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 e %2$s estão na chamada · %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 está na chamada</string>
+    <!-- Chat log text for an ongoing group call only the local user has joined -->
+    <string name="MessageRecord_you_are_in_the_call">Está na chamada</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 e %2$s estão nesta chamada</string>
+    <!-- Chat log text for a group call that ended within the last 5 minutes -->
+    <string name="MessageRecord__the_video_call_has_ended">A videochamada terminou</string>
+    <!-- Chat log text for a group call that ended within the last 5 minutes with a placeholder for formatted time -->
+    <string name="MessageRecord__the_video_call_has_ended_s">A videochamada terminou · %1$s</string>
+    <!-- Chat log text for a group call that ended more than 5 minutes ago and was missed -->
+    <string name="MessageRecord__missed_video_call">Videochamada perdida</string>
+    <!-- Chat log text for a group call that ended more than 5 minutes ago and was missed with a placeholder for formatted time -->
+    <string name="MessageRecord__missed_video_call_s">Chamada de vídeo perdida · %1$s</string>
+    <!-- Chat log text for a group call that ended that the local user did not start -->
+    <string name="MessageRecord__incoming_video_call">A receber videochamada</string>
+    <!-- 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">A receber videochamada · %1$s</string>
+    <!-- Chat log text for a group call that ended that the local user started -->
+    <string name="MessageRecord__outgoing_video_call">A efetuar videochamada</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">A efetuar videochamada · %1$s</string>
+    <!-- Chat log text for an ongoing group call that the local user started -->
+    <string name="MessageRecord__you_started_a_video_call">Iniciou uma videochamada</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">Iniciou uma videochamada · %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 iniciou uma videochamada</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 iniciou uma videochamada · %2$s</string>
 
     <string name="MessageRecord_you">Você</string>
 
-    <plurals name="MessageRecord_s_s_and_d_others_are_in_the_group_call_s">
+    <!-- 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, e %3$d outro estão na chamada de grupo · %4$s</item>
         <item quantity="other">%1$s, %2$s, e outros %3$d estão na chamada de grupo · %4$s</item>
     </plurals>
 
-    <plurals name="MessageRecord_s_s_and_d_others_are_in_the_group_call">
+    <!-- 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, e %3$d outro estão na chamada de grupo</item>
         <item quantity="other">%1$s, %2$s, e outros %3$d estão na chamada de grupo</item>
     </plurals>
@@ -2063,6 +2108,7 @@
     <!-- Generic error when the app is unable to request an SMS code for an unknown reason. -->
     <string name="RegistrationActivity_unable_to_request_verification_code">Não foi possível pedir o código de verificação. Verifique a sua ligação à internet e tente novamente.</string>
     <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">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.-->
@@ -2207,7 +2253,7 @@
     <string name="SubmitDebugLogActivity_this_log_will_be_posted_publicly_online_for_contributors">Este registo será publicado online para ser consultado pelos contribuidores. Poderá analisá-lo antes de o carregar.</string>
 
     <!-- SupportEmailUtil -->
-  <!-- Removed by excludeNonTranslatables <string name="SupportEmailUtil_support_email" translatable="false">support@molly.im</string> -->
+  <!-- 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">Informação do dispositivo:</string>
     <string name="SupportEmailUtil_android_version">Versão do Android:</string>
@@ -2709,6 +2755,8 @@
     <string name="ConversationUpdateItem_loading">A carregar</string>
     <string name="ConversationUpdateItem_learn_more">Saber mais</string>
     <string name="ConversationUpdateItem_join_call">Entrar na chamada</string>
+    <!-- Action button label for starting a new call in the current conversation -->
+    <string name="ConversationUpdateItem_call_back">Ligar de volta</string>
     <string name="ConversationUpdateItem_return_to_call">Regressar à chamada</string>
     <string name="ConversationUpdateItem_call_is_full">A chamada encontra-se completa</string>
     <string name="ConversationUpdateItem_invite_friends">Convidar amigos</string>
@@ -2773,6 +2821,7 @@
     <string name="safety_number_change_dialog__leave_call">Abandonar chamada</string>
     <string name="safety_number_change_dialog__the_following_people_may_have_reinstalled_or_changed_devices">As seguintes pessoas podem ter reinstalado ou mudado de dispositivo. Verifique o seu número de segurança com eles para assegurar a privacidade.</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">Verificado anteriormente</string>
 
     <!-- EnableCallNotificationSettingsDialog__call_notifications_checklist -->
@@ -3086,6 +3135,7 @@
 
     <string name="arrays__default">Predefinição</string>
     <string name="arrays__high">Elevada</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 -->
@@ -3357,7 +3407,7 @@
     <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 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>
@@ -3406,6 +3456,14 @@
     <!-- Storage permission row description -->
     <string name="GrantPermissionsFragment__send_photos_videos_and_files">Envie fotos, vídeos e ficheiros a partir do seu dispositivo.</string>
 
+    <!-- PermissionDeniedBottomSheet -->
+    <!-- Sheet describing step 1 on how to give permissions by opening settings -->
+    <string name="PermissionDeniedBottomSheet__1_tap_settings_below">1. Tap “Settings” below</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 Allow the permission</string>
+    <!-- Label for button at the bottom of the sheet which opens the system permission settings -->
+    <string name="PermissionDeniedBottomSheet__settings">Settings</string>
+
     <!-- PaymentsSecuritySetupFragment -->
     <!-- Toolbar title -->
     <string name="PaymentsSecuritySetupFragment__security_setup">Configuração de segurança</string>
@@ -3446,6 +3504,7 @@
     <string name="PaymentsDetailsFragment__sent_to_s">Enviado por %1$s</string>
     <string name="PaymentsDetailsFragment__you_on_s_at_s">Você em %1$s às %2$s</string>
     <string name="PaymentsDetailsFragment__s_on_s_at_s">%1$s em %2$s à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">Os detalhes de pagamento incluindo o montante de pagamento e o horário da transação são parte do Ledger da MobileCoin.</string>
@@ -3508,6 +3567,7 @@
     <string name="ConfirmPayment__confirm_payment">Confirmar pagamento</string>
     <string name="ConfirmPayment__network_fee">Taxa de rede</string>
     <string name="ConfirmPayment__estimated_s">Estimado %1$s</string>
+    <!-- Prefix to a name to indicate who a payment will be sent to -->
     <string name="ConfirmPayment__to">Para</string>
     <string name="ConfirmPayment__total_amount">Montante total</string>
     <string name="ConfirmPayment__balance_s">Saldo: %1$s</string>
@@ -3658,6 +3718,14 @@
     <string name="conversation_group_options__conversation">Chat</string>
     <string name="conversation_group_options__broadcast">Emissão</string>
 
+    <!-- DoubleTapEditEducationSheet -->
+    <!-- Displayed as the title of the education bottom sheet -->
+    <string name="DoubleTapEditEducationSheet__double_tap_edit_title">Double tap to edit</string>
+    <!-- Text on the sheet explaining how double tapping on a message will let them edit it -->
+    <string name="DoubleTapEditEducationSheet__quickly_tap_twice">Quickly tap twice on your messages to edit them. You can edit your messages up to 24hrs after they’ve been sent.</string>
+    <!-- Button label to dismiss sheet -->
+    <string name="DoubleTapEditEducationSheet__got_it">Got it</string>
+
     <!-- text_secure_normal -->
     <string name="text_secure_normal__menu_new_group">Novo grupo</string>
     <string name="text_secure_normal__menu_settings">Definições</string>
@@ -4112,6 +4180,7 @@
     <string name="RecipientBottomSheet_copied_to_clipboard">Copiado para a área de transferência</string>
 
     <string name="GroupRecipientListItem_admin">Administrador</string>
+    <!-- Button text to approve a user that has requested to join a group -->
     <string name="GroupRecipientListItem_approve_description">Aprovar</string>
     <string name="GroupRecipientListItem_deny_description">Negar</string>
 
@@ -4139,6 +4208,7 @@
 
     <!-- VoiceNoteMediaDescriptionCompatFactory -->
     <string name="VoiceNoteMediaItemFactory__voice_message">Mensagem de voz · %1$s</string>
+    <!-- This is a title in a banner describing the conversation sender to receiver placeholders of the currently playing voice memo. -->
     <string name="VoiceNoteMediaItemFactory__s_to_s">%1$s para %2$s</string>
 
     <!-- StorageUtil -->
@@ -4152,8 +4222,16 @@
     <string name="ReviewCardDialogFragment__review_members">Rever membros</string>
     <!-- Title of a screen where the user will be prompted to review a message request matching the name of someone they already know -->
     <string name="ReviewCardDialogFragment__review_request">Rever pedido</string>
-    <string name="ReviewCardDialogFragment__d_group_members_have_the_same_name">%1$d membros do grupo têm o mesmo nome, reveja os membros abaixo e escolha que ação tomar.</string>
-    <string name="ReviewCardDialogFragment__if_youre_not_sure">Se não tiver a certeza de quem é a solicitação, analise os contactos abaixo e tome uma atitude.</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="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 -->
+    <plurals name="ReviewCardDialogFragment__if_youre_not_sure">
+        <item quantity="one">If you\'re not sure who the request is from, review the contact below and take action.</item>
+        <item quantity="other">If you\'re not sure who the request is from, review the contacts below and take action.</item>
+    </plurals>
     <string name="ReviewCardDialogFragment__no_other_groups_in_common">Sem outros grupos em comum</string>
     <string name="ReviewCardDialogFragment__no_groups_in_common">Sem grupos em comum.</string>
     <plurals name="ReviewCardDialogFragment__d_other_groups_in_common">
@@ -4184,11 +4262,20 @@
     <string name="CallParticipantsListUpdatePopupWindow__s_joined">%1$s juntou-se</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_and_s_joined">%1$s e %2$s juntaram-se</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_s_and_s_joined">%1$s, %2$s e %3$s juntaram-se</string>
-    <string name="CallParticipantsListUpdatePopupWindow__s_s_and_d_others_joined">%1$s, %2$s e outros %3$d juntaram-se</string>
+    <!-- Toast message shown in group call when 3 or more people join -->
+    <plurals name="CallParticipantsListUpdatePopupWindow__s_s_and_d_others_joined">
+        <item quantity="one">%1$s, %2$s and %3$d other joined</item>
+        <item quantity="other">%1$s, %2$s and %3$d others joined</item>
+    </plurals>
+    <!-- Toast/popup text shown when someone leaves a group call -->
     <string name="CallParticipantsListUpdatePopupWindow__s_left">%1$s restante(s)</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_and_s_left">%1$s e %2$s restante(s)</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_s_and_s_left">%1$s, %2$s e %3$s restante(s)</string>
-    <string name="CallParticipantsListUpdatePopupWindow__s_s_and_d_others_left">%1$s, %2$s e outros %3$d restantes</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 and %3$d other left</item>
+        <item quantity="other">%1$s, %2$s and %3$d others left</item>
+    </plurals>
 
     <string name="CallParticipant__you">Você</string>
     <string name="CallParticipant__you_on_another_device">Você (noutro dispositivo)</string>
@@ -4558,10 +4645,15 @@
 
     <!-- PrivacySettingsFragment -->
     <string name="PrivacySettingsFragment__blocked">Bloqueados</string>
-    <string name="PrivacySettingsFragment__d_contacts">%1$d contactos</string>
+    <!-- Settings label that shows the number blocked contacts -->
+    <plurals name="PrivacySettingsFragment__d_contacts">
+        <item quantity="one">%1$d contact</item>
+        <item quantity="other">%1$d contacts</item>
+    </plurals>
     <string name="PrivacySettingsFragment__messaging">Mensagens</string>
     <string name="PrivacySettingsFragment__disappearing_messages">Destruição de mensagens</string>
     <string name="PrivacySettingsFragment__app_security">Segurança da aplicação</string>
+    <!-- This refers to the multi-tasking overview (recent apps) from the Android operating system.-->
     <string name="PrivacySettingsFragment__block_screenshots_in_the_recents_list_and_inside_the_app">Bloquear a captura de ecrã na lista de aplicações recentes abertas e dentro da aplicação</string>
     <string name="PrivacySettingsFragment__signal_message_and_calls">As mensagens e chamadas do Signal, retransmitem sempre as chamadas e emissor selado</string>
     <string name="PrivacySettingsFragment__default_timer_for_new_changes">Tempo padrão para chats novos</string>
@@ -4618,11 +4710,14 @@
     <string name="DataAndStorageSettingsFragment__media_quality">Qualidade média</string>
     <string name="DataAndStorageSettingsFragment__sent_media_quality">Qualidade da multimédia enviada</string>
     <string name="DataAndStorageSettingsFragment__sending_high_quality_media_will_use_more_data">Enviar multimédia com alta qualidade utilizará mais dados de internet.</string>
+    <!-- Setting option that can be selected to default media to be sent as high quality by default -->
     <string name="DataAndStorageSettingsFragment__high">Elevada</string>
+    <!-- Setting option that can be selected to default media to be sent as standard quality by default -->
     <string name="DataAndStorageSettingsFragment__standard">Normal</string>
     <string name="DataAndStorageSettingsFragment__calls">Chamadas</string>
 
     <!-- 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__use_custom_colors">Utilizar cores personalizadas</string>
     <string name="ChatColorSelectionFragment__chat_color">Cor do chat</string>
@@ -4834,6 +4929,7 @@
     <string name="AvatarPickerFragment__take_a_picture">Tirar uma fotografia</string>
     <string name="AvatarPickerFragment__choose_a_photo">Escolha uma fotografia</string>
     <string name="AvatarPickerFragment__photo">Fotografia</string>
+    <!-- Button label during avatar selection/creation that when tapped lets you generate an avatar from typed in text. -->
     <string name="AvatarPickerFragment__text">Texto</string>
     <string name="AvatarPickerFragment__save">Guardar</string>
     <string name="AvatarPickerFragment__clear_avatar">Remover avatar</string>
@@ -4894,7 +4990,7 @@
     <string name="MediaReviewFragment__add_a_message">Adicionar uma mensagem</string>
     <string name="MediaReviewFragment__add_a_reply">Adicionar uma resposta</string>
     <string name="MediaReviewFragment__send_to">Enviar para</string>
-    <string name="MediaReviewFragment__view_once_message">Mensagem de visualização única</string>
+    <string name="MediaReviewFragment__view_once_message">Ver multimédia de visualização única</string>
     <string name="MediaReviewFragment__one_or_more_items_were_too_large">Um ou mais itens são demasiado grandes</string>
     <string name="MediaReviewFragment__one_or_more_items_were_invalid">Um ou mais itens são inválidos</string>
     <string name="MediaReviewFragment__too_many_items_selected">Demasiados itens selecionados</string>
@@ -5487,7 +5583,7 @@
     <string name="StoryViewerFragment__s_s">%1$s%2$s</string>
     <!-- Displayed when viewing a post you sent -->
     <string name="StoryViewerPageFragment__you">Você</string>
-    <!-- Displayed when viewing a post displayed to a group -->
+    <!-- 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 para %2$s</string>
     <!-- Displayed when viewing a post from another user with no replies -->
     <string name="StoryViewerPageFragment__reply">Responder</string>
@@ -6680,7 +6776,7 @@
     <!-- Title displayed at the top of the screen -->
     <string name="NicknameActivity__nickname">Alcunha</string>
     <!-- Subtitle displayed under title -->
-    <string name="NicknameActivity__nicknames_amp_notes">Nicknames &amp; notes are stored with Signal and end-to-end encrypted. They are only visible to you.</string>
+    <string name="NicknameActivity__nicknames_amp_notes">As alcunhas e notas são armazenadas no Signal e encriptadas ponta a ponta. Só são visíveis para si.</string>
     <!-- Field label for given name -->
     <string name="NicknameActivity__first_name">Primeiro nome</string>
     <!-- Content description for first name clear button -->
@@ -6694,9 +6790,9 @@
     <!-- Button label to save -->
     <string name="NicknameActivity__save">Guardar</string>
     <!-- Dialog title for note and name deletion -->
-    <string name="NicknameActivity__delete_nickname">Delete?</string>
+    <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">This will permanently delete any nickname and note you’ve set.</string>
+    <string name="NicknameActivity__this_will_permanently_delete_this_nickname_and_note">Isto irá eliminar permanentemente qualquer alcunha ou nota que tenha definido.</string>
 
     <!-- ViewNoteBottomSheetDialogFragment -->
     <!-- Sheet title -->
@@ -6704,5 +6800,26 @@
     <!-- Content description for opening the note editor -->
     <string name="ViewNoteSheet__edit_note">Editar nota</string>
 
+    <!-- BackupProgressService -->
+    <!-- Notification title shown while backup restore job is running -->
+    <string name="BackupProgressService_title">A restaurar cópia de segurança…</string>
+    <!-- Notification title shown while downloading backup restore data -->
+    <string name="BackupProgressService_title_downloading">A descarregar dados da cópia de segurança…</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>
+    <!-- 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 -->
+    <string name="BackupsTypeSettingsFragment__google_pay">Google Pay</string>
+    <!-- Displayed as the user\'s payment method as a label in a preference row -->
+    <string name="BackupsTypeSettingsFragment__bank_transfer">Bank transfer</string>
+    <!-- Displayed as the user\'s payment method as a label in a preference row -->
+    <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>
+
+
     <!-- 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 d0d3a6fcbc..95a9d264fd 100644
--- a/app/src/main/res/values-ro/strings.xml
+++ b/app/src/main/res/values-ro/strings.xml
@@ -1,6 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- smartling.instruction_comments_enabled = on -->
-<resources>
+<?xml version="1.0" encoding="UTF-8"?><!-- 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> -->
@@ -89,6 +87,16 @@
     <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">Allow access to your location</string>
+    <!-- Dialog description that will explain the steps needed to give location permission -->
+    <string name="AttachmentManager_signal_to_send_location">To send your location:</string>
+    <!-- Alert dialog description asking for location permission -->
+    <string name="AttachmentManager_signal_allow_signal_access_location">Allow Molly access to send your location.</string>
+    <!-- Toast text explaining Signal\'s need for location access -->
+    <string name="AttachmentManager_signal_needs_location_access">Molly needs location access to send your location.</string>
+
     <!-- Alert dialog title to show the recipient has not activated payments -->
     <string name="AttachmentManager__not_activated_payments">%1$s nu a activat Plățile </string>
     <!-- Alert dialog description to send the recipient a request to activate payments -->
@@ -242,7 +250,7 @@
     <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>
@@ -389,8 +397,16 @@
     <string name="ConversationActivity_your_request_to_join_has_been_sent_to_the_group_admin">Solicitarea ta de a te alătura grupului a fost trimisă administratorului. Vei fi notificat când acesta ia o decizie.</string>
     <string name="ConversationActivity_cancel_request">Anulează Cerere</string>
 
-    <string name="ConversationActivity_to_send_audio_messages_allow_signal_access_to_your_microphone">Pentru a trimite mesaje audio, permite-i aplicației Molly accesul la microfonul tău.</string>
+    <!-- Dialog title asking users for microphone permission -->
+    <string name="ConversationActivity_allow_access_microphone">Allow access to your microphone</string>
+    <!-- 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>
+    <!-- Toast text explaining Signal\'s need for microphone access -->
+    <string name="ConversationActivity_signal_needs_microphone_access_voice_message">Molly needs microphone access to record a voice message.</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">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>
@@ -414,10 +430,17 @@
     <string name="ConversationActivity_you_will_leave_this_group_and_it_will_be_deleted_from_all_of_your_devices">Vei părăsi acest grup și va fi șters de pe toate dispozitivele tale.</string>
     <string name="ConversationActivity_delete">Șterge</string>
     <string name="ConversationActivity_delete_and_leave">Șterge și părăsește</string>
-    <string name="ConversationActivity__to_call_s_signal_needs_access_to_your_microphone">Pentru a apela pe %1$s, Molly are nevoie de acces la microfonul tău.</string>
+
+    <!-- Dialog description that will explain the steps needed to give microphone permissions for a voice call -->
+    <string name="ConversationActivity__to_start_call">To start a 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">To start a call, allow Molly access to your microphone.</string>
+    <!-- Toast text explaining Signal\'s need for microphone access for a voice call -->
+    <string name="ConversationActivity_signal_needs_microphone_access_voice_call">Molly needs microphone access to start a call.</string>
 
 
     <string name="ConversationActivity_join">Alătură-te</string>
+    <!-- Button text for an active group call but the call is currently full and unjoinable -->
     <string name="ConversationActivity_full">Plin</string>
 
     <string name="ConversationActivity_error_sending_media">Eroare la trimiterea conținutului media</string>
@@ -629,6 +652,7 @@
     <string name="ConversationListFragment_unarchive">Dezarhivează</string>
     <string name="ConversationListFragment_delete">Șterge</string>
     <string name="ConversationListFragment_select_all">Selectează tot</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 selectată</item>
         <item quantity="few">%1$d selectate</item>
@@ -883,6 +907,7 @@
         <item quantity="few">%1$d invitații trimise</item>
         <item quantity="other">%1$d de invitații trimise</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">\"%1$s\" nu poate fi adăugat automat la acest grup de către tine.\n\nAu fost invitați să se alăture și nu vor vedea niciun mesaj de grup până când nu acceptă.</string>
     <string name="GroupManagement_invite_multiple_users">Acești utilizatori nu pot fi adăugați automat la acest grup de către tine.\n\nAu fost invitați să se alăture și nu vor vedea niciun mesaj de grup până când nu acceptă.</string>
 
@@ -1079,7 +1104,9 @@
 
     <string name="ManageGroupActivity_edit_name_and_picture">Editare nume și poză</string>
     <string name="ManageGroupActivity_legacy_group">Grup Vechi</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">Acesta este un grup vechi. Funcții precum administratorii de grup sunt disponibile doar grupurilor noi.</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">Acesta este un grup vechi. Pentru a accesa funcții precum @mențiuni și administratorii de grup,</string>
     <string name="ManageGroupActivity_legacy_group_too_large">Acest grup vechi nu poate fi actualizat la unul nou, pentru că este prea mare. Dimensiunea maximă a unui grup este de %1$d.</string>
     <string name="ManageGroupActivity_upgrade_this_group">actualizează acest grup.</string>
@@ -1315,6 +1342,7 @@
         <item quantity="other">Șterge</item>
     </plurals>
 
+    <!-- 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 selectat (%2$s)</item>
         <item quantity="few">%1$d selectate (%2$s)</item>
@@ -1380,17 +1408,13 @@
     <string name="MessageRecord_left_group">Ai părăsit grupul.</string>
     <string name="MessageRecord_you_updated_group">Ai actualizat grupul.</string>
     <string name="MessageRecord_the_group_was_updated">Grupul a fost actualizat.</string>
-    <!-- Update message shown when placing an outgoing 1:1 voice/audio call and it\'s answered by the other party -->
+    <!-- Update message shown when placing an outgoing 1:1 voice/audio call -->
     <string name="MessageRecord_outgoing_voice_call">Apel de ieșire vocal</string>
-    <!-- Update message shown when placing an outgoing 1:1 video call and it\'s answered by the other party -->
+    <!-- Update message shown when placing an outgoing 1:1 video call -->
     <string name="MessageRecord_outgoing_video_call">Apel de ieșire video</string>
-    <!-- Update message shown when placing an outgoing 1:1 voice/audio call and it\'s not answered by the other party -->
-    <string name="MessageRecord_unanswered_voice_call">Apel vocal nepreluat</string>
-    <!-- Update message shown when placing an outgoing 1:1 video call and it\'s not answered by the other party -->
-    <string name="MessageRecord_unanswered_video_call">Apel video nepreluat</string>
-    <!-- Update message shown when receiving an incoming 1:1 voice/audio call and it\'s answered -->
+    <!-- Update message shown when receiving an incoming 1:1 voice/audio call and it\'s answered or ringing -->
     <string name="MessageRecord_incoming_voice_call">Apel de intrare vocal</string>
-    <!-- Update message shown when receiving an incoming 1:1 video call and answered -->
+    <!-- Update message shown when receiving an incoming 1:1 video call and answered or ringing -->
     <string name="MessageRecord_incoming_video_call">Apel de intrare video</string>
     <!-- Update message shown when receiving an incoming 1:1 voice/audio call and not answered -->
     <string name="MessageRecord_missed_voice_call">Apel vocal nepreluat</string>
@@ -1400,10 +1424,6 @@
     <string name="MessageRecord_missed_voice_call_notification_profile">Apel vocal pierdut în timp ce profilul de notificare este activat</string>
     <!-- Update message shown when receiving an incoming video call and declined due to notification profile -->
     <string name="MessageRecord_missed_video_call_notification_profile">Apel video pierdut în timp ce profilul de notificare este activat</string>
-    <!-- Update message shown when receiving an incoming 1:1 voice/audio call and explicitly declined -->
-    <string name="MessageRecord_you_declined_a_voice_call">Ai respins un apel vocal</string>
-    <!-- Update message shown when receiving an incoming 1:1 video call and explicitly declined -->
-    <string name="MessageRecord_you_declined_a_video_call">Ai respins un apel video</string>
     <!-- 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 a actualizat grupul.</string>
@@ -1620,32 +1640,57 @@
     <string name="MessageRecord_can_accept_payments">%1$s poate să accepte acum Plăți</string>
 
     <!-- Group Calling update messages -->
-    <string name="MessageRecord_s_started_a_group_call_s">%1$s a început un apel de grup · %2$s</string>
-    <string name="MessageRecord_you_started_a_group_call_s">Ai început un apel de grup · %1$s</string>
-    <string name="MessageRecord_s_is_in_the_group_call_s">%1$s este în apelul de grup · %2$s</string>
-    <string name="MessageRecord_you_are_in_the_group_call_s1">Ești în apelul de grup · %1$s</string>
-    <string name="MessageRecord_s_and_s_are_in_the_group_call_s1">%1$s și %2$s sunt în apelul de grup · %3$s</string>
-    <string name="MessageRecord_group_call_s">Apel de grup · %1$s</string>
-
-    <string name="MessageRecord_s_started_a_group_call">%1$s a început un apel de grup</string>
-    <string name="MessageRecord_you_started_a_group_call">Ai început un apel de grup</string>
-    <string name="MessageRecord_s_is_in_the_group_call">%1$s este în apelul de grup</string>
-    <string name="MessageRecord_you_are_in_the_group_call">Ești în apelul de grup</string>
-    <string name="MessageRecord_s_and_s_are_in_the_group_call">%1$s și %2$s sunt în apelul de grup</string>
-    <string name="MessageRecord_group_call">Apel de grup</string>
+    <!-- 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 este în apel · %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">Ești în apel · %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 și %2$s sunt în apel · %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 este în apel</string>
+    <!-- Chat log text for an ongoing group call only the local user has joined -->
+    <string name="MessageRecord_you_are_in_the_call">Tu ești în apel</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 și %2$s sunt în acest apel</string>
+    <!-- Chat log text for a group call that ended within the last 5 minutes -->
+    <string name="MessageRecord__the_video_call_has_ended">Apelul video s-a încheiat</string>
+    <!-- Chat log text for a group call that ended within the last 5 minutes with a placeholder for formatted time -->
+    <string name="MessageRecord__the_video_call_has_ended_s">Apelul video s-a încheiat · %1$s</string>
+    <!-- Chat log text for a group call that ended more than 5 minutes ago and was missed -->
+    <string name="MessageRecord__missed_video_call">Apel video nepreluat</string>
+    <!-- Chat log text for a group call that ended more than 5 minutes ago and was missed with a placeholder for formatted time -->
+    <string name="MessageRecord__missed_video_call_s">Apel video nepreluat · %1$s</string>
+    <!-- Chat log text for a group call that ended that the local user did not start -->
+    <string name="MessageRecord__incoming_video_call">Apel de intrare video</string>
+    <!-- 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">Apel de intrare video · %1$s</string>
+    <!-- Chat log text for a group call that ended that the local user started -->
+    <string name="MessageRecord__outgoing_video_call">Apel de ieșire video</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">Apel de ieșire video · %1$s</string>
+    <!-- Chat log text for an ongoing group call that the local user started -->
+    <string name="MessageRecord__you_started_a_video_call">Ai început un apel video</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">Ai început un apel video · %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 a început un apel video</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 a început un apel video · %2$s</string>
 
     <string name="MessageRecord_you">Tu</string>
 
-    <plurals name="MessageRecord_s_s_and_d_others_are_in_the_group_call_s">
+    <!-- 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 și %3$d sunt în apelul de grup · %4$s</item>
         <item quantity="few">%1$s, %2$s și alte %3$d persoane sunt în apelul de grup · %4$s</item>
-        <item quantity="other">%1$s, %2$s și alte %3$d de persoane sunt în apelul de grup · %4$s</item>
+        <item quantity="other">%1$s, %2$s și alte %3$d persoane sunt în apelul de grup · %4$s</item>
     </plurals>
 
-    <plurals name="MessageRecord_s_s_and_d_others_are_in_the_group_call">
+    <!-- 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 și %3$d sunt în apelul de grup</item>
         <item quantity="few">%1$s, %2$s și alte %3$d persoane sunt în apelul de grup</item>
-        <item quantity="other">%1$s, %2$s și alte %3$d de persoane sunt în apelul de grup</item>
+        <item quantity="other">%1$s, %2$s și alte %3$d persoane sunt în apelul de grup</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. -->
@@ -2142,6 +2187,7 @@
     <!-- Generic error when the app is unable to request an SMS code for an unknown reason. -->
     <string name="RegistrationActivity_unable_to_request_verification_code">Nu s-a putut cere un cod de verificare. Te rugăm să verifici conexiunea și să încerci din nou.</string>
     <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">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.-->
@@ -2287,7 +2333,7 @@
     <string name="SubmitDebugLogActivity_this_log_will_be_posted_publicly_online_for_contributors">Acest jurnal va fi publicat online pentru a fi vizualizat de către contribuitori. Poți să-l examinezi înainte să fie încărcat.</string>
 
     <!-- SupportEmailUtil -->
-  <!-- Removed by excludeNonTranslatables <string name="SupportEmailUtil_support_email" translatable="false">support@molly.im</string> -->
+  <!-- Removed by excludeNonTranslatables <string name="SupportEmailUtil_support_email" translatable="false">support@signal.org</string> -->
     <string name="SupportEmailUtil_filter">Filtru:</string>
     <string name="SupportEmailUtil_device_info">Informații dispozitiv:</string>
     <string name="SupportEmailUtil_android_version">Versiune Android:</string>
@@ -2796,6 +2842,8 @@
     <string name="ConversationUpdateItem_loading">Se încarcă</string>
     <string name="ConversationUpdateItem_learn_more">Află mai multe</string>
     <string name="ConversationUpdateItem_join_call">Alătură-te apelului</string>
+    <!-- Action button label for starting a new call in the current conversation -->
+    <string name="ConversationUpdateItem_call_back">Apelează înapoi</string>
     <string name="ConversationUpdateItem_return_to_call">Întoarcere la apel</string>
     <string name="ConversationUpdateItem_call_is_full">Numărul maxim de participanți a fost atins</string>
     <string name="ConversationUpdateItem_invite_friends">Invită prieteni</string>
@@ -2860,6 +2908,7 @@
     <string name="safety_number_change_dialog__leave_call">Părăsește apelul</string>
     <string name="safety_number_change_dialog__the_following_people_may_have_reinstalled_or_changed_devices">Este posibil ca următoarele persoane să fi reinstalat sau schimbat dispozitivele. Verifică numărul tău de siguranță cu acestea pentru a asigura confidențialitatea.</string>
     <string name="safety_number_change_dialog__view">Vizualizare</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">Verificat anterior</string>
 
     <!-- EnableCallNotificationSettingsDialog__call_notifications_checklist -->
@@ -3180,6 +3229,7 @@
 
     <string name="arrays__default">Implicit</string>
     <string name="arrays__high">Mare</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">Maximă</string>
 
     <!-- plurals.xml -->
@@ -3454,7 +3504,7 @@
     <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 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>
@@ -3503,6 +3553,14 @@
     <!-- Storage permission row description -->
     <string name="GrantPermissionsFragment__send_photos_videos_and_files">Trimite fotografii, videoclipuri și fișiere de pe dispozitivul tău.</string>
 
+    <!-- PermissionDeniedBottomSheet -->
+    <!-- Sheet describing step 1 on how to give permissions by opening settings -->
+    <string name="PermissionDeniedBottomSheet__1_tap_settings_below">1. Tap “Settings” below</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 Allow the permission</string>
+    <!-- Label for button at the bottom of the sheet which opens the system permission settings -->
+    <string name="PermissionDeniedBottomSheet__settings">Settings</string>
+
     <!-- PaymentsSecuritySetupFragment -->
     <!-- Toolbar title -->
     <string name="PaymentsSecuritySetupFragment__security_setup">Configurarea securității</string>
@@ -3543,6 +3601,7 @@
     <string name="PaymentsDetailsFragment__sent_to_s">Trimis către %1$s</string>
     <string name="PaymentsDetailsFragment__you_on_s_at_s">Tine %1$s la %2$s</string>
     <string name="PaymentsDetailsFragment__s_on_s_at_s">%1$s %2$s la %3$s</string>
+    <!-- Prefix to a name to indicate who a payment was sent to -->
     <string name="PaymentsDetailsFragment__to">Către</string>
     <string name="PaymentsDetailsFragment__from">De la</string>
     <string name="PaymentsDetailsFragment__information">Detaliile tranzacției inclusiv valoarea și data acesteia, fac parte din registrul MobileCoin.</string>
@@ -3605,6 +3664,7 @@
     <string name="ConfirmPayment__confirm_payment">Confirmă plata</string>
     <string name="ConfirmPayment__network_fee">Comision de rețea</string>
     <string name="ConfirmPayment__estimated_s">Estimat %1$s</string>
+    <!-- Prefix to a name to indicate who a payment will be sent to -->
     <string name="ConfirmPayment__to">Către</string>
     <string name="ConfirmPayment__total_amount">Suma totală</string>
     <string name="ConfirmPayment__balance_s">Sold: %1$s</string>
@@ -3757,6 +3817,14 @@
     <string name="conversation_group_options__conversation">Conversație</string>
     <string name="conversation_group_options__broadcast">Difuzare</string>
 
+    <!-- DoubleTapEditEducationSheet -->
+    <!-- Displayed as the title of the education bottom sheet -->
+    <string name="DoubleTapEditEducationSheet__double_tap_edit_title">Double tap to edit</string>
+    <!-- Text on the sheet explaining how double tapping on a message will let them edit it -->
+    <string name="DoubleTapEditEducationSheet__quickly_tap_twice">Quickly tap twice on your messages to edit them. You can edit your messages up to 24hrs after they’ve been sent.</string>
+    <!-- Button label to dismiss sheet -->
+    <string name="DoubleTapEditEducationSheet__got_it">Got it</string>
+
     <!-- text_secure_normal -->
     <string name="text_secure_normal__menu_new_group">Grup nou</string>
     <string name="text_secure_normal__menu_settings">Setări</string>
@@ -4218,6 +4286,7 @@
     <string name="RecipientBottomSheet_copied_to_clipboard">S-a copiat în clipboard</string>
 
     <string name="GroupRecipientListItem_admin">Administrator</string>
+    <!-- Button text to approve a user that has requested to join a group -->
     <string name="GroupRecipientListItem_approve_description">Aprobă</string>
     <string name="GroupRecipientListItem_deny_description">Refuză</string>
 
@@ -4245,6 +4314,7 @@
 
     <!-- VoiceNoteMediaDescriptionCompatFactory -->
     <string name="VoiceNoteMediaItemFactory__voice_message">Mesaj vocal · %1$s</string>
+    <!-- This is a title in a banner describing the conversation sender to receiver placeholders of the currently playing voice memo. -->
     <string name="VoiceNoteMediaItemFactory__s_to_s">%1$s la %2$s</string>
 
     <!-- StorageUtil -->
@@ -4258,8 +4328,18 @@
     <string name="ReviewCardDialogFragment__review_members">Revizuire membri</string>
     <!-- Title of a screen where the user will be prompted to review a message request matching the name of someone they already know -->
     <string name="ReviewCardDialogFragment__review_request">Revizuire solicitare</string>
-    <string name="ReviewCardDialogFragment__d_group_members_have_the_same_name">%1$d membri ai grupului au același nume, revizuiește membrii de mai jos și ia măsuri.</string>
-    <string name="ReviewCardDialogFragment__if_youre_not_sure">Dacă nu ești sigur de la cine provine solicitarea, consultă persoanele de contact de mai jos și ia măsuri.</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="few">%1$d group members have the same name, review the members 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 -->
+    <plurals name="ReviewCardDialogFragment__if_youre_not_sure">
+        <item quantity="one">If you\'re not sure who the request is from, review the contact below and take action.</item>
+        <item quantity="few">If you\'re not sure who the request is from, review the contacts below and take action.</item>
+        <item quantity="other">If you\'re not sure who the request is from, review the contacts below and take action.</item>
+    </plurals>
     <string name="ReviewCardDialogFragment__no_other_groups_in_common">Nu există alte grupuri în comun.</string>
     <string name="ReviewCardDialogFragment__no_groups_in_common">Niciun grup în comun.</string>
     <plurals name="ReviewCardDialogFragment__d_other_groups_in_common">
@@ -4292,11 +4372,22 @@
     <string name="CallParticipantsListUpdatePopupWindow__s_joined">%1$s s-a alăturat</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_and_s_joined">%1$s și %2$s s-au alăturat</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_s_and_s_joined">%1$s, %2$s și %3$s s-au alăturat</string>
-    <string name="CallParticipantsListUpdatePopupWindow__s_s_and_d_others_joined">%1$s, %2$s și %3$d alții s-au alăturat</string>
+    <!-- Toast message shown in group call when 3 or more people join -->
+    <plurals name="CallParticipantsListUpdatePopupWindow__s_s_and_d_others_joined">
+        <item quantity="one">%1$s, %2$s and %3$d other joined</item>
+        <item quantity="few">%1$s, %2$s and %3$d others joined</item>
+        <item quantity="other">%1$s, %2$s and %3$d others joined</item>
+    </plurals>
+    <!-- Toast/popup text shown when someone leaves a group call -->
     <string name="CallParticipantsListUpdatePopupWindow__s_left">%1$s a ieșit</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_and_s_left">%1$s și %2$s au ieșit</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_s_and_s_left">%1$s, %2$s și %3$s au ieșit</string>
-    <string name="CallParticipantsListUpdatePopupWindow__s_s_and_d_others_left">%1$s, %2$s și %3$d alții au ieșit</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 and %3$d other left</item>
+        <item quantity="few">%1$s, %2$s and %3$d others left</item>
+        <item quantity="other">%1$s, %2$s and %3$d others left</item>
+    </plurals>
 
     <string name="CallParticipant__you">Tu</string>
     <string name="CallParticipant__you_on_another_device">Tu (pe alt dispozitiv)</string>
@@ -4668,10 +4759,16 @@
 
     <!-- PrivacySettingsFragment -->
     <string name="PrivacySettingsFragment__blocked">Blocat</string>
-    <string name="PrivacySettingsFragment__d_contacts">%1$d contacte</string>
+    <!-- Settings label that shows the number blocked contacts -->
+    <plurals name="PrivacySettingsFragment__d_contacts">
+        <item quantity="one">%1$d contact</item>
+        <item quantity="few">%1$d contacts</item>
+        <item quantity="other">%1$d contacts</item>
+    </plurals>
     <string name="PrivacySettingsFragment__messaging">Mesagerie</string>
     <string name="PrivacySettingsFragment__disappearing_messages">Dispariție mesaje</string>
     <string name="PrivacySettingsFragment__app_security">Securitate aplicație</string>
+    <!-- This refers to the multi-tasking overview (recent apps) from the Android operating system.-->
     <string name="PrivacySettingsFragment__block_screenshots_in_the_recents_list_and_inside_the_app">Blochează capturile de ecran în lista cu aplicații recente și în interiorul aplicației</string>
     <string name="PrivacySettingsFragment__signal_message_and_calls">Mesaje și apeluri Signal, redirecționare apeluri și expeditor ascuns</string>
     <string name="PrivacySettingsFragment__default_timer_for_new_changes">Temporizator implicit pentru conversații noi</string>
@@ -4728,11 +4825,14 @@
     <string name="DataAndStorageSettingsFragment__media_quality">Calitate Media</string>
     <string name="DataAndStorageSettingsFragment__sent_media_quality">Calitatea fișierelor media trimise</string>
     <string name="DataAndStorageSettingsFragment__sending_high_quality_media_will_use_more_data">Trimiterea fișierelor media la calitate înaltă va duce la un consum mai mare de date.</string>
+    <!-- Setting option that can be selected to default media to be sent as high quality by default -->
     <string name="DataAndStorageSettingsFragment__high">Mare</string>
+    <!-- Setting option that can be selected to default media to be sent as standard quality by default -->
     <string name="DataAndStorageSettingsFragment__standard">Standard</string>
     <string name="DataAndStorageSettingsFragment__calls">Apeluri</string>
 
     <!-- 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__use_custom_colors">Utilizează culori personalizate</string>
     <string name="ChatColorSelectionFragment__chat_color">Culoare conversație</string>
@@ -4947,6 +5047,7 @@
     <string name="AvatarPickerFragment__take_a_picture">Fă o poză</string>
     <string name="AvatarPickerFragment__choose_a_photo">Alege o poză</string>
     <string name="AvatarPickerFragment__photo">Poză</string>
+    <!-- Button label during avatar selection/creation that when tapped lets you generate an avatar from typed in text. -->
     <string name="AvatarPickerFragment__text">Text</string>
     <string name="AvatarPickerFragment__save">Salvează</string>
     <string name="AvatarPickerFragment__clear_avatar">Șterge avatarul</string>
@@ -5011,7 +5112,7 @@
     <string name="MediaReviewFragment__add_a_message">Adaugă un mesaj</string>
     <string name="MediaReviewFragment__add_a_reply">Adaugă un răspuns</string>
     <string name="MediaReviewFragment__send_to">Trimite către</string>
-    <string name="MediaReviewFragment__view_once_message">Mesaj vizibil o singură dată</string>
+    <string name="MediaReviewFragment__view_once_message">Mijloc media vizibil o singură dată</string>
     <string name="MediaReviewFragment__one_or_more_items_were_too_large">Unul sau mai multe elemente au fost prea mari</string>
     <string name="MediaReviewFragment__one_or_more_items_were_invalid">Unul sau mai multe elemente au fost invalide</string>
     <string name="MediaReviewFragment__too_many_items_selected">Prea multe elemente selectate</string>
@@ -5609,7 +5710,7 @@
     <string name="StoryViewerFragment__s_s">%1$s %2$s</string>
     <!-- Displayed when viewing a post you sent -->
     <string name="StoryViewerPageFragment__you">Tu</string>
-    <!-- Displayed when viewing a post displayed to a group -->
+    <!-- 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 la %2$s</string>
     <!-- Displayed when viewing a post from another user with no replies -->
     <string name="StoryViewerPageFragment__reply">Răspunde</string>
@@ -6850,5 +6951,26 @@
     <!-- Content description for opening the note editor -->
     <string name="ViewNoteSheet__edit_note">Editează nota</string>
 
+    <!-- BackupProgressService -->
+    <!-- Notification title shown while backup restore job is running -->
+    <string name="BackupProgressService_title">Se restaurează copia de rezervă…</string>
+    <!-- Notification title shown while downloading backup restore data -->
+    <string name="BackupProgressService_title_downloading">Se descarcă datele din copia de rezervă…</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>
+    <!-- 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 -->
+    <string name="BackupsTypeSettingsFragment__google_pay">Google Pay</string>
+    <!-- Displayed as the user\'s payment method as a label in a preference row -->
+    <string name="BackupsTypeSettingsFragment__bank_transfer">Bank transfer</string>
+    <!-- Displayed as the user\'s payment method as a label in a preference row -->
+    <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>
+
+
     <!-- 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 fed335ef61..769e110f04 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -1,6 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- smartling.instruction_comments_enabled = on -->
-<resources>
+<?xml version="1.0" encoding="UTF-8"?><!-- 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> -->
@@ -89,6 +87,16 @@
     <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">Allow access to your location</string>
+    <!-- Dialog description that will explain the steps needed to give location permission -->
+    <string name="AttachmentManager_signal_to_send_location">To send your location:</string>
+    <!-- Alert dialog description asking for location permission -->
+    <string name="AttachmentManager_signal_allow_signal_access_location">Allow Molly access to send your location.</string>
+    <!-- Toast text explaining Signal\'s need for location access -->
+    <string name="AttachmentManager_signal_needs_location_access">Molly needs location access to send your location.</string>
+
     <!-- Alert dialog title to show the recipient has not activated payments -->
     <string name="AttachmentManager__not_activated_payments">Пользователь %1$s не активировал платежи </string>
     <!-- Alert dialog description to send the recipient a request to activate payments -->
@@ -243,7 +251,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 устарела. Вы можете просматривать свою историю сообщений, но не сможете отправлять или получать сообщения, пока не обновите версию 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>
@@ -392,8 +400,16 @@
     <string name="ConversationActivity_your_request_to_join_has_been_sent_to_the_group_admin">Ваш запрос на присоединение был отправлен администратору группы. Вы будете уведомлены, когда он примет решение.</string>
     <string name="ConversationActivity_cancel_request">Отменить запрос</string>
 
-    <string name="ConversationActivity_to_send_audio_messages_allow_signal_access_to_your_microphone">Для отправки аудиосообщений разрешите Molly доступ к микрофону.</string>
+    <!-- Dialog title asking users for microphone permission -->
+    <string name="ConversationActivity_allow_access_microphone">Allow access to your microphone</string>
+    <!-- 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>
+    <!-- Toast text explaining Signal\'s need for microphone access -->
+    <string name="ConversationActivity_signal_needs_microphone_access_voice_message">Molly needs microphone access to record a voice message.</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">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>
@@ -417,10 +433,17 @@
     <string name="ConversationActivity_you_will_leave_this_group_and_it_will_be_deleted_from_all_of_your_devices">Вы покинете эту группу, и она будет удалена со всех ваших устройств.</string>
     <string name="ConversationActivity_delete">Удалить</string>
     <string name="ConversationActivity_delete_and_leave">Удалить и покинуть</string>
-    <string name="ConversationActivity__to_call_s_signal_needs_access_to_your_microphone">Чтобы позвонить %1$s, Molly необходим доступ к вашему микрофону</string>
+
+    <!-- Dialog description that will explain the steps needed to give microphone permissions for a voice call -->
+    <string name="ConversationActivity__to_start_call">To start a 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">To start a call, allow Molly access to your microphone.</string>
+    <!-- Toast text explaining Signal\'s need for microphone access for a voice call -->
+    <string name="ConversationActivity_signal_needs_microphone_access_voice_call">Molly needs microphone access to start a call.</string>
 
 
     <string name="ConversationActivity_join">Войти</string>
+    <!-- Button text for an active group call but the call is currently full and unjoinable -->
     <string name="ConversationActivity_full">Заполнен</string>
 
     <string name="ConversationActivity_error_sending_media">Ошибка при отправке медиафайла</string>
@@ -645,6 +668,7 @@
     <string name="ConversationListFragment_unarchive">Разархивировать</string>
     <string name="ConversationListFragment_delete">Удалить</string>
     <string name="ConversationListFragment_select_all">Выбрать все</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 выбран</item>
         <item quantity="few">%1$d выбрано</item>
@@ -902,6 +926,7 @@
         <item quantity="many">%1$d приглашений отправлено</item>
         <item quantity="other">%1$d приглашений отправлено</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">Вы не можете автоматически добавить «%1$s» в эту группу.\n\nЕму (ей) было отправлено приглашение присоединиться, и он(-а) не увидит сообщения в группе, пока не примет приглашение.</string>
     <string name="GroupManagement_invite_multiple_users">Вы не можете автоматически добавить этих пользователей в эту группу.\n\nИм было отправлено приглашение присоединиться, и они не увидят сообщения в группе, пока не примут приглашение.</string>
 
@@ -1114,7 +1139,9 @@
 
     <string name="ManageGroupActivity_edit_name_and_picture">Редактировать имя и фото</string>
     <string name="ManageGroupActivity_legacy_group">Старая группа</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">Это Старая группа. Такие функции, как администраторы групп, доступны только для Новых групп.</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">Это Старая группа. Чтобы получить доступ к таким функциям, как @упоминания и администраторы групп,</string>
     <string name="ManageGroupActivity_legacy_group_too_large">Эта Старая группа не может быть обновлена до Новой группы, потому что она слишком большая. Максимальный размер группы — %1$d.</string>
     <string name="ManageGroupActivity_upgrade_this_group">обновите эту группу.</string>
@@ -1359,6 +1386,7 @@
         <item quantity="other">Удалить</item>
     </plurals>
 
+    <!-- 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 выбран (%2$s)</item>
         <item quantity="few">%1$d выбрано (%2$s)</item>
@@ -1425,17 +1453,13 @@
     <string name="MessageRecord_left_group">Вы покинули группу.</string>
     <string name="MessageRecord_you_updated_group">Вы обновили группу.</string>
     <string name="MessageRecord_the_group_was_updated">Группа была обновлена.</string>
-    <!-- Update message shown when placing an outgoing 1:1 voice/audio call and it\'s answered by the other party -->
+    <!-- Update message shown when placing an outgoing 1:1 voice/audio call -->
     <string name="MessageRecord_outgoing_voice_call">Исходящий голосовой звонок</string>
-    <!-- Update message shown when placing an outgoing 1:1 video call and it\'s answered by the other party -->
+    <!-- Update message shown when placing an outgoing 1:1 video call -->
     <string name="MessageRecord_outgoing_video_call">Исходящий видеозвонок</string>
-    <!-- Update message shown when placing an outgoing 1:1 voice/audio call and it\'s not answered by the other party -->
-    <string name="MessageRecord_unanswered_voice_call">Неотвеченный голосовой звонок</string>
-    <!-- Update message shown when placing an outgoing 1:1 video call and it\'s not answered by the other party -->
-    <string name="MessageRecord_unanswered_video_call">Неотвеченный исходящий видеозвонок</string>
-    <!-- Update message shown when receiving an incoming 1:1 voice/audio call and it\'s answered -->
+    <!-- Update message shown when receiving an incoming 1:1 voice/audio call and it\'s answered or ringing -->
     <string name="MessageRecord_incoming_voice_call">Входящий голосовой звонок</string>
-    <!-- Update message shown when receiving an incoming 1:1 video call and answered -->
+    <!-- Update message shown when receiving an incoming 1:1 video call and answered or ringing -->
     <string name="MessageRecord_incoming_video_call">Входящий видеозвонок</string>
     <!-- Update message shown when receiving an incoming 1:1 voice/audio call and not answered -->
     <string name="MessageRecord_missed_voice_call">Пропущенный голосовой звонок</string>
@@ -1445,10 +1469,6 @@
     <string name="MessageRecord_missed_voice_call_notification_profile">Пропущенный аудиозвонок при включённом профиле уведомлений</string>
     <!-- Update message shown when receiving an incoming video call and declined due to notification profile -->
     <string name="MessageRecord_missed_video_call_notification_profile">Пропущенный видеозвонок при включённом профиле уведомлений</string>
-    <!-- Update message shown when receiving an incoming 1:1 voice/audio call and explicitly declined -->
-    <string name="MessageRecord_you_declined_a_voice_call">Вы отклонили голосовой звонок</string>
-    <!-- Update message shown when receiving an incoming 1:1 video call and explicitly declined -->
-    <string name="MessageRecord_you_declined_a_video_call">Вы отклонили видеозвонок</string>
     <!-- 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>
@@ -1673,30 +1693,55 @@
     <string name="MessageRecord_can_accept_payments">%1$s теперь может принимать платежи</string>
 
     <!-- Group Calling update messages -->
-    <string name="MessageRecord_s_started_a_group_call_s">%1$s начал(-а) групповой звонок · %2$s</string>
-    <string name="MessageRecord_you_started_a_group_call_s">Вы начали групповой звонок · %1$s</string>
-    <string name="MessageRecord_s_is_in_the_group_call_s">%1$s в групповом звонке · %2$s</string>
-    <string name="MessageRecord_you_are_in_the_group_call_s1">Вы в групповом звонке · %1$s</string>
-    <string name="MessageRecord_s_and_s_are_in_the_group_call_s1">%1$s и %2$s в групповом звонке · %3$s</string>
-    <string name="MessageRecord_group_call_s">Групповой звонок · %1$s</string>
-
-    <string name="MessageRecord_s_started_a_group_call">%1$s начал(-а) групповой звонок</string>
-    <string name="MessageRecord_you_started_a_group_call">Вы начали групповой звонок</string>
-    <string name="MessageRecord_s_is_in_the_group_call">%1$s в групповом звонке</string>
-    <string name="MessageRecord_you_are_in_the_group_call">Вы в групповом звонке</string>
-    <string name="MessageRecord_s_and_s_are_in_the_group_call">%1$s и %2$s в групповом звонке</string>
-    <string name="MessageRecord_group_call">Групповой звонок</string>
+    <!-- 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 участвует в звонке · %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">Вы участвуете в звонке · %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 и %2$s участвуют в звонке · %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 участвует в звонке</string>
+    <!-- Chat log text for an ongoing group call only the local user has joined -->
+    <string name="MessageRecord_you_are_in_the_call">Вы участвуете в звонке</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 и %2$s участвуют в звонке</string>
+    <!-- Chat log text for a group call that ended within the last 5 minutes -->
+    <string name="MessageRecord__the_video_call_has_ended">Видеозвонок был завершён</string>
+    <!-- Chat log text for a group call that ended within the last 5 minutes with a placeholder for formatted time -->
+    <string name="MessageRecord__the_video_call_has_ended_s">Видеозвонок был завершён · %1$s</string>
+    <!-- Chat log text for a group call that ended more than 5 minutes ago and was missed -->
+    <string name="MessageRecord__missed_video_call">Пропущенный видеозвонок</string>
+    <!-- Chat log text for a group call that ended more than 5 minutes ago and was missed with a placeholder for formatted time -->
+    <string name="MessageRecord__missed_video_call_s">Пропущенный видеозвонок · %1$s</string>
+    <!-- Chat log text for a group call that ended that the local user did not start -->
+    <string name="MessageRecord__incoming_video_call">Входящий видеозвонок</string>
+    <!-- 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">Входящий видеозвонок · %1$s</string>
+    <!-- Chat log text for a group call that ended that the local user started -->
+    <string name="MessageRecord__outgoing_video_call">Исходящий видеозвонок</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">Исходящий видеозвонок · %1$s</string>
+    <!-- Chat log text for an ongoing group call that the local user started -->
+    <string name="MessageRecord__you_started_a_video_call">Вы начали видеозвонок</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">Вы начали видеозвонок · %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 начал(а) видеозвонок</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 начал(а) видеозвонок · %2$s</string>
 
     <string name="MessageRecord_you">Вы</string>
 
-    <plurals name="MessageRecord_s_s_and_d_others_are_in_the_group_call_s">
+    <!-- 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 и ещё %3$d человек в групповом звонке · %4$s</item>
         <item quantity="few">%1$s, %2$s и ещё %3$d человека в групповом звонке · %4$s</item>
         <item quantity="many">%1$s, %2$s и ещё %3$d человек в групповом звонке · %4$s</item>
         <item quantity="other">%1$s, %2$s и ещё %3$d человек в групповом звонке · %4$s</item>
     </plurals>
 
-    <plurals name="MessageRecord_s_s_and_d_others_are_in_the_group_call">
+    <!-- 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 и ещё %3$d человек в групповом звонке</item>
         <item quantity="few">%1$s, %2$s и ещё %3$d человека в групповом звонке</item>
         <item quantity="many">%1$s, %2$s и ещё %3$d человек в групповом звонке</item>
@@ -2221,6 +2266,7 @@
     <!-- Generic error when the app is unable to request an SMS code for an unknown reason. -->
     <string name="RegistrationActivity_unable_to_request_verification_code">Не удаётся запросить код подтверждения. Пожалуйста, проверьте ваше подключение к интернету и попробуйте ещё раз.</string>
     <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">Molly Android - Формат номера телефона</string>
     <!--    Small "toast" notification to the user confirming that they have requested a new code via voice call.-->
@@ -2367,7 +2413,7 @@
     <string name="SubmitDebugLogActivity_this_log_will_be_posted_publicly_online_for_contributors">Этот журнал будет опубликован в интернете, чтобы разработчики смогли его просмотреть. Вы можете изучить его перед отправкой.</string>
 
     <!-- SupportEmailUtil -->
-  <!-- Removed by excludeNonTranslatables <string name="SupportEmailUtil_support_email" translatable="false">support@molly.im</string> -->
+  <!-- Removed by excludeNonTranslatables <string name="SupportEmailUtil_support_email" translatable="false">support@signal.org</string> -->
     <string name="SupportEmailUtil_filter">Фильтр:</string>
     <string name="SupportEmailUtil_device_info">Информация об устройстве:</string>
     <string name="SupportEmailUtil_android_version">Версия Android:</string>
@@ -2883,6 +2929,8 @@
     <string name="ConversationUpdateItem_loading">Загрузка</string>
     <string name="ConversationUpdateItem_learn_more">Узнать больше</string>
     <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_call_is_full">Звонок заполнен</string>
     <string name="ConversationUpdateItem_invite_friends">Пригласить друзей</string>
@@ -2947,6 +2995,7 @@
     <string name="safety_number_change_dialog__leave_call">Покинуть звонок</string>
     <string name="safety_number_change_dialog__the_following_people_may_have_reinstalled_or_changed_devices">Следующие люди могли переустановить Signal или сменить устройства. Подтвердите ваш код безопасности с ними, чтобы обеспечить конфиденциальность.</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>
 
     <!-- EnableCallNotificationSettingsDialog__call_notifications_checklist -->
@@ -3274,6 +3323,7 @@
 
     <string name="arrays__default">По умолчанию</string>
     <string name="arrays__high">Высокий</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">Максимальный</string>
 
     <!-- plurals.xml -->
@@ -3551,7 +3601,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">Вы можете использовать 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">Платежи в Molly больше не доступны. Вы можете перевести средства на биржу, но больше не можете отправлять или получать платежи или пополнять баланс.</string>
@@ -3600,6 +3650,14 @@
     <!-- Storage permission row description -->
     <string name="GrantPermissionsFragment__send_photos_videos_and_files">Отправляйте фото, видео и файлы со своего устройства.</string>
 
+    <!-- PermissionDeniedBottomSheet -->
+    <!-- Sheet describing step 1 on how to give permissions by opening settings -->
+    <string name="PermissionDeniedBottomSheet__1_tap_settings_below">1. Tap “Settings” below</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 Allow the permission</string>
+    <!-- Label for button at the bottom of the sheet which opens the system permission settings -->
+    <string name="PermissionDeniedBottomSheet__settings">Settings</string>
+
     <!-- PaymentsSecuritySetupFragment -->
     <!-- Toolbar title -->
     <string name="PaymentsSecuritySetupFragment__security_setup">Настройки безопасности</string>
@@ -3640,6 +3698,7 @@
     <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__information">Подробности транзакции, включая сумму платежа и время транзакции, являются частью распределённого реестра MobileCoin.</string>
@@ -3702,6 +3761,7 @@
     <string name="ConfirmPayment__confirm_payment">Подтвердить платёж</string>
     <string name="ConfirmPayment__network_fee">Комиссия сети</string>
     <string name="ConfirmPayment__estimated_s">Ориентировочно в %1$s</string>
+    <!-- Prefix to a name to indicate who a payment will be sent to -->
     <string name="ConfirmPayment__to">Кому</string>
     <string name="ConfirmPayment__total_amount">Итоговая сумма</string>
     <string name="ConfirmPayment__balance_s">Баланс: %1$s</string>
@@ -3856,6 +3916,14 @@
     <string name="conversation_group_options__conversation">Чат</string>
     <string name="conversation_group_options__broadcast">Вещание</string>
 
+    <!-- DoubleTapEditEducationSheet -->
+    <!-- Displayed as the title of the education bottom sheet -->
+    <string name="DoubleTapEditEducationSheet__double_tap_edit_title">Double tap to edit</string>
+    <!-- Text on the sheet explaining how double tapping on a message will let them edit it -->
+    <string name="DoubleTapEditEducationSheet__quickly_tap_twice">Quickly tap twice on your messages to edit them. You can edit your messages up to 24hrs after they’ve been sent.</string>
+    <!-- Button label to dismiss sheet -->
+    <string name="DoubleTapEditEducationSheet__got_it">Got it</string>
+
     <!-- text_secure_normal -->
     <string name="text_secure_normal__menu_new_group">Новая группа</string>
     <string name="text_secure_normal__menu_settings">Настройки</string>
@@ -4324,6 +4392,7 @@
     <string name="RecipientBottomSheet_copied_to_clipboard">Скопировано в буфер обмена</string>
 
     <string name="GroupRecipientListItem_admin">Администратор</string>
+    <!-- Button text to approve a user that has requested to join a group -->
     <string name="GroupRecipientListItem_approve_description">Принять</string>
     <string name="GroupRecipientListItem_deny_description">Отклонить</string>
 
@@ -4351,6 +4420,7 @@
 
     <!-- VoiceNoteMediaDescriptionCompatFactory -->
     <string name="VoiceNoteMediaItemFactory__voice_message">Голосовое сообщение · %1$s</string>
+    <!-- This is a title in a banner describing the conversation sender to receiver placeholders of the currently playing voice memo. -->
     <string name="VoiceNoteMediaItemFactory__s_to_s">%1$s в %2$s</string>
 
     <!-- StorageUtil -->
@@ -4364,8 +4434,20 @@
     <string name="ReviewCardDialogFragment__review_members">Проверить участников</string>
     <!-- Title of a screen where the user will be prompted to review a message request matching the name of someone they already know -->
     <string name="ReviewCardDialogFragment__review_request">Проверить запрос</string>
-    <string name="ReviewCardDialogFragment__d_group_members_have_the_same_name">%1$d участников группы имеют одинаковое имя. Просмотрите участников ниже и, если необходимо, примите меры.</string>
-    <string name="ReviewCardDialogFragment__if_youre_not_sure">Если вы не уверены, от кого этот запрос, просмотрите участников ниже и примите меры.</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="few">%1$d group members have the same name, review the members below and choose to take action.</item>
+        <item quantity="many">%1$d group members have the same name, review the members 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 -->
+    <plurals name="ReviewCardDialogFragment__if_youre_not_sure">
+        <item quantity="one">If you\'re not sure who the request is from, review the contact below and take action.</item>
+        <item quantity="few">If you\'re not sure who the request is from, review the contacts below and take action.</item>
+        <item quantity="many">If you\'re not sure who the request is from, review the contacts below and take action.</item>
+        <item quantity="other">If you\'re not sure who the request is from, review the contacts below and take action.</item>
+    </plurals>
     <string name="ReviewCardDialogFragment__no_other_groups_in_common">Нет других общих групп.</string>
     <string name="ReviewCardDialogFragment__no_groups_in_common">Нет общих групп.</string>
     <plurals name="ReviewCardDialogFragment__d_other_groups_in_common">
@@ -4400,11 +4482,24 @@
     <string name="CallParticipantsListUpdatePopupWindow__s_joined">%1$s присоединился(-лась)</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_and_s_joined">%1$s и %2$s присоединились</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_s_and_s_joined">%1$s, %2$s и %3$s присоединились</string>
-    <string name="CallParticipantsListUpdatePopupWindow__s_s_and_d_others_joined">%1$s, %2$s и ещё %3$d присоединились</string>
+    <!-- Toast message shown in group call when 3 or more people join -->
+    <plurals name="CallParticipantsListUpdatePopupWindow__s_s_and_d_others_joined">
+        <item quantity="one">%1$s, %2$s and %3$d other joined</item>
+        <item quantity="few">%1$s, %2$s and %3$d others joined</item>
+        <item quantity="many">%1$s, %2$s and %3$d others joined</item>
+        <item quantity="other">%1$s, %2$s and %3$d others joined</item>
+    </plurals>
+    <!-- Toast/popup text shown when someone leaves a group call -->
     <string name="CallParticipantsListUpdatePopupWindow__s_left">%1$s покинул(-а) звонок</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_and_s_left">%1$s и %2$s покинули звонок</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_s_and_s_left">%1$s, %2$s и %3$s покинули звонок</string>
-    <string name="CallParticipantsListUpdatePopupWindow__s_s_and_d_others_left">%1$s, %2$s и ещё %3$d покинули звонок</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 and %3$d other left</item>
+        <item quantity="few">%1$s, %2$s and %3$d others left</item>
+        <item quantity="many">%1$s, %2$s and %3$d others left</item>
+        <item quantity="other">%1$s, %2$s and %3$d others left</item>
+    </plurals>
 
     <string name="CallParticipant__you">Вы</string>
     <string name="CallParticipant__you_on_another_device">Вы (на другом устройстве)</string>
@@ -4778,10 +4873,17 @@
 
     <!-- PrivacySettingsFragment -->
     <string name="PrivacySettingsFragment__blocked">Заблокированные</string>
-    <string name="PrivacySettingsFragment__d_contacts">%1$d контактов</string>
+    <!-- Settings label that shows the number blocked contacts -->
+    <plurals name="PrivacySettingsFragment__d_contacts">
+        <item quantity="one">%1$d contact</item>
+        <item quantity="few">%1$d contacts</item>
+        <item quantity="many">%1$d contacts</item>
+        <item quantity="other">%1$d contacts</item>
+    </plurals>
     <string name="PrivacySettingsFragment__messaging">Общение</string>
     <string name="PrivacySettingsFragment__disappearing_messages">Исчезающие сообщения</string>
     <string name="PrivacySettingsFragment__app_security">Безопасность приложения</string>
+    <!-- This refers to the multi-tasking overview (recent apps) from the Android operating system.-->
     <string name="PrivacySettingsFragment__block_screenshots_in_the_recents_list_and_inside_the_app">Блокировать снимки экрана в списке недавних приложений и внутри приложения</string>
     <string name="PrivacySettingsFragment__signal_message_and_calls">Звонки и сообщения Signal, ретрансляция звонков и запечатанный отправитель</string>
     <string name="PrivacySettingsFragment__default_timer_for_new_changes">Таймер по умолчанию для новых чатов</string>
@@ -4838,11 +4940,14 @@
     <string name="DataAndStorageSettingsFragment__media_quality">Качество медиа</string>
     <string name="DataAndStorageSettingsFragment__sent_media_quality">Качество отправляемого медиа</string>
     <string name="DataAndStorageSettingsFragment__sending_high_quality_media_will_use_more_data">Отправление медиа в высоком качестве использует больше данных.</string>
+    <!-- Setting option that can be selected to default media to be sent as high quality by default -->
     <string name="DataAndStorageSettingsFragment__high">Высокое</string>
+    <!-- Setting option that can be selected to default media to be sent as standard quality by default -->
     <string name="DataAndStorageSettingsFragment__standard">Стандартное</string>
     <string name="DataAndStorageSettingsFragment__calls">Звонки</string>
 
     <!-- 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__use_custom_colors">Использовать пользовательские цвета</string>
     <string name="ChatColorSelectionFragment__chat_color">Цвет чата</string>
@@ -5060,6 +5165,7 @@
     <string name="AvatarPickerFragment__take_a_picture">Сделать снимок</string>
     <string name="AvatarPickerFragment__choose_a_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>
     <string name="AvatarPickerFragment__clear_avatar">Удалить аватар</string>
@@ -5128,7 +5234,7 @@
     <string name="MediaReviewFragment__add_a_message">Добавьте сообщение</string>
     <string name="MediaReviewFragment__add_a_reply">Добавьте ответ</string>
     <string name="MediaReviewFragment__send_to">Отправить</string>
-    <string name="MediaReviewFragment__view_once_message">Одноразовое сообщение</string>
+    <string name="MediaReviewFragment__view_once_message">Просмотреть одноразовые медиа</string>
     <string name="MediaReviewFragment__one_or_more_items_were_too_large">Один или несколько элементов были слишком большими</string>
     <string name="MediaReviewFragment__one_or_more_items_were_invalid">Один или несколько элементов были недействительными</string>
     <string name="MediaReviewFragment__too_many_items_selected">Выбрано слишком много элементов</string>
@@ -5731,7 +5837,7 @@
     <string name="StoryViewerFragment__s_s">%1$s %2$s</string>
     <!-- Displayed when viewing a post you sent -->
     <string name="StoryViewerPageFragment__you">Вы</string>
-    <!-- Displayed when viewing a post displayed to a group -->
+    <!-- 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 -->
     <string name="StoryViewerPageFragment__reply">Ответить</string>
@@ -6996,5 +7102,26 @@
     <!-- Content description for opening the note editor -->
     <string name="ViewNoteSheet__edit_note">Изменить заметку</string>
 
+    <!-- BackupProgressService -->
+    <!-- Notification title shown while backup restore job is running -->
+    <string name="BackupProgressService_title">Восстановление резервной копии…</string>
+    <!-- Notification title shown while downloading backup restore data -->
+    <string name="BackupProgressService_title_downloading">Скачиваем резервную копию…</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>
+    <!-- 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 -->
+    <string name="BackupsTypeSettingsFragment__google_pay">Google Pay</string>
+    <!-- Displayed as the user\'s payment method as a label in a preference row -->
+    <string name="BackupsTypeSettingsFragment__bank_transfer">Bank transfer</string>
+    <!-- Displayed as the user\'s payment method as a label in a preference row -->
+    <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>
+
+
     <!-- 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 f15dedf80d..c3045dfcbe 100644
--- a/app/src/main/res/values-sk/strings.xml
+++ b/app/src/main/res/values-sk/strings.xml
@@ -1,6 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- smartling.instruction_comments_enabled = on -->
-<resources>
+<?xml version="1.0" encoding="UTF-8"?><!-- 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> -->
@@ -89,6 +87,16 @@
     <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">Allow access to your location</string>
+    <!-- Dialog description that will explain the steps needed to give location permission -->
+    <string name="AttachmentManager_signal_to_send_location">To send your location:</string>
+    <!-- Alert dialog description asking for location permission -->
+    <string name="AttachmentManager_signal_allow_signal_access_location">Allow Molly access to send your location.</string>
+    <!-- Toast text explaining Signal\'s need for location access -->
+    <string name="AttachmentManager_signal_needs_location_access">Molly needs location access to send your location.</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>
     <!-- Alert dialog description to send the recipient a request to activate payments -->
@@ -243,7 +251,7 @@
     <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>
@@ -392,8 +400,16 @@
     <string name="ConversationActivity_your_request_to_join_has_been_sent_to_the_group_admin">Vaša žiadosť o členstvo bola odoslaná administrátorovi skupiny. Keď na ňu zareaguje, dostanete oznámenie.</string>
     <string name="ConversationActivity_cancel_request">Zrušiť žiadosť</string>
 
-    <string name="ConversationActivity_to_send_audio_messages_allow_signal_access_to_your_microphone">Pre posielanie zvukových správ potrebuje Molly prístup k mikrofónu.</string>
+    <!-- Dialog title asking users for microphone permission -->
+    <string name="ConversationActivity_allow_access_microphone">Allow access to your microphone</string>
+    <!-- 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>
+    <!-- Toast text explaining Signal\'s need for microphone access -->
+    <string name="ConversationActivity_signal_needs_microphone_access_voice_message">Molly needs microphone access to record a voice message.</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">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>
@@ -417,10 +433,17 @@
     <string name="ConversationActivity_you_will_leave_this_group_and_it_will_be_deleted_from_all_of_your_devices">Opustíte túto skupinu a vymažete ju zo všetkých vašich zariadení.</string>
     <string name="ConversationActivity_delete">Vymazať</string>
     <string name="ConversationActivity_delete_and_leave">Vymazať a opustiť</string>
-    <string name="ConversationActivity__to_call_s_signal_needs_access_to_your_microphone">Pre volanie %1$s potrebuje Molly prístup k vášmu mikrofónu</string>
+
+    <!-- Dialog description that will explain the steps needed to give microphone permissions for a voice call -->
+    <string name="ConversationActivity__to_start_call">To start a 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">To start a call, allow Molly access to your microphone.</string>
+    <!-- Toast text explaining Signal\'s need for microphone access for a voice call -->
+    <string name="ConversationActivity_signal_needs_microphone_access_voice_call">Molly needs microphone access to start a call.</string>
 
 
     <string name="ConversationActivity_join">Pridať sa</string>
+    <!-- Button text for an active group call but the call is currently full and unjoinable -->
     <string name="ConversationActivity_full">Plný</string>
 
     <string name="ConversationActivity_error_sending_media">Chyba pri odosielaní médií</string>
@@ -645,6 +668,7 @@
     <string name="ConversationListFragment_unarchive">Odarchivovať</string>
     <string name="ConversationListFragment_delete">Vymazať</string>
     <string name="ConversationListFragment_select_all">Označiť všetko</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 vybrané</item>
         <item quantity="few">%1$d vybraných</item>
@@ -902,6 +926,7 @@
         <item quantity="many">Bolo odoslanej %1$d pozvánky</item>
         <item quantity="other">Bolo odoslaných %1$d pozvánok</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">“%1$s” nemôžete automaticky pridať do tejto skupiny.\n\nTomuto používateľovi bola odoslaná pozvánka, aby sa pridal, a kým pozvanie nepríjme, neuvidí žiadne správy zo skupiny.</string>
     <string name="GroupManagement_invite_multiple_users">Týchto používateľov nemôžete automaticky pridať do tejto skupiny.\n\nBoli im odoslané pozvánky, aby sa pridali, a kým pozvanie nepríjmu, neuvidia žiadne správy zo skupiny.</string>
 
@@ -1114,7 +1139,9 @@
 
     <string name="ManageGroupActivity_edit_name_and_picture">Zmeniť názov a obrázok</string>
     <string name="ManageGroupActivity_legacy_group">Zastaraná skupina</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">Toto je Zastaraná skupina. Funkcie ako administrátori skupín sú dostupné len pre Nové skupiny.</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">Toto je Zastaraná skupina. Pre prístup k novým funkciám ako @spomenutia a administrátori</string>
     <string name="ManageGroupActivity_legacy_group_too_large">Táto Zastaraná skupina nemôže byť modernizovaná na Novú skupinu, lebo je príliš veľká. Maximálna veľkosť skupiny je %1$d.</string>
     <string name="ManageGroupActivity_upgrade_this_group">modernizujte túto skupinu.</string>
@@ -1359,6 +1386,7 @@
         <item quantity="other">Vymazať</item>
     </plurals>
 
+    <!-- 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 vybrané (%2$s)</item>
         <item quantity="few">%1$d vybraných (%2$s)</item>
@@ -1425,17 +1453,13 @@
     <string name="MessageRecord_left_group">Opustili ste skupinu.</string>
     <string name="MessageRecord_you_updated_group">Aktualizovali ste skupinu.</string>
     <string name="MessageRecord_the_group_was_updated">Skupina bola aktualizovaná</string>
-    <!-- Update message shown when placing an outgoing 1:1 voice/audio call and it\'s answered by the other party -->
+    <!-- Update message shown when placing an outgoing 1:1 voice/audio call -->
     <string name="MessageRecord_outgoing_voice_call">Odchádzajúci hlasový hovor</string>
-    <!-- Update message shown when placing an outgoing 1:1 video call and it\'s answered by the other party -->
+    <!-- Update message shown when placing an outgoing 1:1 video call -->
     <string name="MessageRecord_outgoing_video_call">Odchádzajúci videohovor</string>
-    <!-- Update message shown when placing an outgoing 1:1 voice/audio call and it\'s not answered by the other party -->
-    <string name="MessageRecord_unanswered_voice_call">Neprijatý hlasový hovor</string>
-    <!-- Update message shown when placing an outgoing 1:1 video call and it\'s not answered by the other party -->
-    <string name="MessageRecord_unanswered_video_call">Neprijatý videohovor</string>
-    <!-- Update message shown when receiving an incoming 1:1 voice/audio call and it\'s answered -->
+    <!-- Update message shown when receiving an incoming 1:1 voice/audio call and it\'s answered or ringing -->
     <string name="MessageRecord_incoming_voice_call">Prichádzajúci hlasový hovor</string>
-    <!-- Update message shown when receiving an incoming 1:1 video call and answered -->
+    <!-- Update message shown when receiving an incoming 1:1 video call and answered or ringing -->
     <string name="MessageRecord_incoming_video_call">Prichádzajúci videohovor</string>
     <!-- Update message shown when receiving an incoming 1:1 voice/audio call and not answered -->
     <string name="MessageRecord_missed_voice_call">Zmeškaný hlasový hovor</string>
@@ -1445,10 +1469,6 @@
     <string name="MessageRecord_missed_voice_call_notification_profile">Zmeškaný hlasový hovor pri zapnutom profile upozornení</string>
     <!-- Update message shown when receiving an incoming video call and declined due to notification profile -->
     <string name="MessageRecord_missed_video_call_notification_profile">Zmeškaný videohovor pri zapnutom profile upozornení</string>
-    <!-- Update message shown when receiving an incoming 1:1 voice/audio call and explicitly declined -->
-    <string name="MessageRecord_you_declined_a_voice_call">Odmietli ste hlasový hovor</string>
-    <!-- Update message shown when receiving an incoming 1:1 video call and explicitly declined -->
-    <string name="MessageRecord_you_declined_a_video_call">Odmietli ste videohovor</string>
     <!-- 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 aktualizoval/a skupinu.</string>
@@ -1673,30 +1693,55 @@
     <string name="MessageRecord_can_accept_payments">%1$s odteraz môže prijímať platby</string>
 
     <!-- Group Calling update messages -->
-    <string name="MessageRecord_s_started_a_group_call_s">%1$s zahájil(a) skupinový hovor · %2$s</string>
-    <string name="MessageRecord_you_started_a_group_call_s">Zahájili ste skupinový hovor · %1$s</string>
-    <string name="MessageRecord_s_is_in_the_group_call_s">%1$s je v skupinovom hovore · %2$s</string>
-    <string name="MessageRecord_you_are_in_the_group_call_s1">Ste v skupinovom hovore · %1$s</string>
-    <string name="MessageRecord_s_and_s_are_in_the_group_call_s1">%1$s a %2$s sú v skupinovom hovore · %3$s</string>
-    <string name="MessageRecord_group_call_s">Skupinový hovor · %1$s</string>
-
-    <string name="MessageRecord_s_started_a_group_call">%1$s zahájil(a) skupinový hovor</string>
-    <string name="MessageRecord_you_started_a_group_call">Zahájili ste skupinový hovor</string>
-    <string name="MessageRecord_s_is_in_the_group_call">%1$s je v skupinovom hovore</string>
-    <string name="MessageRecord_you_are_in_the_group_call">Ste v skupinovom hovore</string>
-    <string name="MessageRecord_s_and_s_are_in_the_group_call">%1$s a %2$s sú v skupinovom hovore</string>
-    <string name="MessageRecord_group_call">Skupinový hovor</string>
+    <!-- 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 sa zúčastňuje hovoru · %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">Zúčastňujete sa hovoru · %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 a %2$s sa zúčastňujú hovoru · %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 sa zúčastňuje hovoru</string>
+    <!-- Chat log text for an ongoing group call only the local user has joined -->
+    <string name="MessageRecord_you_are_in_the_call">Zúčastňujete sa hovoru</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 a %2$s sa zúčastňujú hovoru</string>
+    <!-- Chat log text for a group call that ended within the last 5 minutes -->
+    <string name="MessageRecord__the_video_call_has_ended">Videohovor sa skončil</string>
+    <!-- Chat log text for a group call that ended within the last 5 minutes with a placeholder for formatted time -->
+    <string name="MessageRecord__the_video_call_has_ended_s">Videohovor sa skončil · %1$s</string>
+    <!-- Chat log text for a group call that ended more than 5 minutes ago and was missed -->
+    <string name="MessageRecord__missed_video_call">Zmeškaný videohovor</string>
+    <!-- Chat log text for a group call that ended more than 5 minutes ago and was missed with a placeholder for formatted time -->
+    <string name="MessageRecord__missed_video_call_s">Zmeškaný videohovor · %1$s</string>
+    <!-- Chat log text for a group call that ended that the local user did not start -->
+    <string name="MessageRecord__incoming_video_call">Prichádzajúci videohovor</string>
+    <!-- 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">Prichádzajúci videohovor · %1$s</string>
+    <!-- Chat log text for a group call that ended that the local user started -->
+    <string name="MessageRecord__outgoing_video_call">Odchádzajúci videohovor</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">Odchádzajúci videohovor · %1$s</string>
+    <!-- Chat log text for an ongoing group call that the local user started -->
+    <string name="MessageRecord__you_started_a_video_call">Začali ste videohovor</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">Začali ste videohovor · %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">Používateľ %1$s začal videohovor</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">Používateľ %1$s začal videohovor · %2$s</string>
 
     <string name="MessageRecord_you">Vy</string>
 
-    <plurals name="MessageRecord_s_s_and_d_others_are_in_the_group_call_s">
+    <!-- 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 a %3$d ďalší sú v skupinovom hovore · %4$s</item>
         <item quantity="few">%1$s, %2$s a %3$d ďalší sú v skupinovom hovore · %4$s</item>
         <item quantity="many">%1$s, %2$s a %3$d ďalší sú v skupinovom hovore · %4$s</item>
         <item quantity="other">%1$s, %2$s a %3$d ďalší sú v skupinovom hovore · %4$s</item>
     </plurals>
 
-    <plurals name="MessageRecord_s_s_and_d_others_are_in_the_group_call">
+    <!-- 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 a %3$d ďalší sú v skupinovom hovore</item>
         <item quantity="few">%1$s, %2$s a %3$d ďalší sú v skupinovom hovore</item>
         <item quantity="many">%1$s, %2$s a %3$d ďalší sú v skupinovom hovore</item>
@@ -2221,6 +2266,7 @@
     <!-- Generic error when the app is unable to request an SMS code for an unknown reason. -->
     <string name="RegistrationActivity_unable_to_request_verification_code">Nie je možné požiadať o overovací kód. Skontrolujte pripojenie k sieti a skúste to znova.</string>
     <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">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.-->
@@ -2367,7 +2413,7 @@
     <string name="SubmitDebugLogActivity_this_log_will_be_posted_publicly_online_for_contributors">Tento denník bude zverejnený online, aby si ho mohli prispievatelia vidieť. Pred nahraním to môžete skontrolovať.</string>
 
     <!-- SupportEmailUtil -->
-  <!-- Removed by excludeNonTranslatables <string name="SupportEmailUtil_support_email" translatable="false">support@molly.im</string> -->
+  <!-- Removed by excludeNonTranslatables <string name="SupportEmailUtil_support_email" translatable="false">support@signal.org</string> -->
     <string name="SupportEmailUtil_filter">Filter:</string>
     <string name="SupportEmailUtil_device_info">Info o zariadení:</string>
     <string name="SupportEmailUtil_android_version">Verzia Androidu:</string>
@@ -2883,6 +2929,8 @@
     <string name="ConversationUpdateItem_loading">Načítava sa</string>
     <string name="ConversationUpdateItem_learn_more">Dozvedieť sa viac</string>
     <string name="ConversationUpdateItem_join_call">Pripojiť sa k hovoru</string>
+    <!-- Action button label for starting a new call in the current conversation -->
+    <string name="ConversationUpdateItem_call_back">Zavolať späť</string>
     <string name="ConversationUpdateItem_return_to_call">Vrátiť sa k hovoru</string>
     <string name="ConversationUpdateItem_call_is_full">Hovor je plne obsadený</string>
     <string name="ConversationUpdateItem_invite_friends">Pozvať priateľov</string>
@@ -2947,6 +2995,7 @@
     <string name="safety_number_change_dialog__leave_call">Opustiť hovor</string>
     <string name="safety_number_change_dialog__the_following_people_may_have_reinstalled_or_changed_devices">Nasledujúce osoby si možno preinštalovali alebo zmenili zariadenia. Overte si s nimi vaše bezpečnostné číslo pre zaistenie súkromia.</string>
     <string name="safety_number_change_dialog__view">Zobraziť</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">V minulosti overený</string>
 
     <!-- EnableCallNotificationSettingsDialog__call_notifications_checklist -->
@@ -3274,6 +3323,7 @@
 
     <string name="arrays__default">Predvolená</string>
     <string name="arrays__high">Vysoká</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">Maximálna</string>
 
     <!-- plurals.xml -->
@@ -3551,7 +3601,7 @@
     <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 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>
@@ -3600,6 +3650,14 @@
     <!-- Storage permission row description -->
     <string name="GrantPermissionsFragment__send_photos_videos_and_files">Posielajte fotografie, videá a súbory zo svojho zariadenia.</string>
 
+    <!-- PermissionDeniedBottomSheet -->
+    <!-- Sheet describing step 1 on how to give permissions by opening settings -->
+    <string name="PermissionDeniedBottomSheet__1_tap_settings_below">1. Tap “Settings” below</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 Allow the permission</string>
+    <!-- Label for button at the bottom of the sheet which opens the system permission settings -->
+    <string name="PermissionDeniedBottomSheet__settings">Settings</string>
+
     <!-- PaymentsSecuritySetupFragment -->
     <!-- Toolbar title -->
     <string name="PaymentsSecuritySetupFragment__security_setup">Nastavenie zabezpečenia</string>
@@ -3640,6 +3698,7 @@
     <string name="PaymentsDetailsFragment__sent_to_s">Odoslané používateľovi %1$s</string>
     <string name="PaymentsDetailsFragment__you_on_s_at_s">Vy na %1$s s %2$s</string>
     <string name="PaymentsDetailsFragment__s_on_s_at_s">%1$s na %2$s s %3$s</string>
+    <!-- Prefix to a name to indicate who a payment was sent to -->
     <string name="PaymentsDetailsFragment__to">Komu</string>
     <string name="PaymentsDetailsFragment__from">Od</string>
     <string name="PaymentsDetailsFragment__information">Podrobnosti o transakcii vrátane sumy a času transakcie sú súčasťou MobileCoin Ledger.</string>
@@ -3702,6 +3761,7 @@
     <string name="ConfirmPayment__confirm_payment">Potvrďte platbu</string>
     <string name="ConfirmPayment__network_fee">Sieťový poplatok</string>
     <string name="ConfirmPayment__estimated_s">Odhadované %1$s</string>
+    <!-- Prefix to a name to indicate who a payment will be sent to -->
     <string name="ConfirmPayment__to">Komu</string>
     <string name="ConfirmPayment__total_amount">Celková suma</string>
     <string name="ConfirmPayment__balance_s">Zostatok: %1$s</string>
@@ -3856,6 +3916,14 @@
     <string name="conversation_group_options__conversation">Čet</string>
     <string name="conversation_group_options__broadcast">Poslať všetkým</string>
 
+    <!-- DoubleTapEditEducationSheet -->
+    <!-- Displayed as the title of the education bottom sheet -->
+    <string name="DoubleTapEditEducationSheet__double_tap_edit_title">Double tap to edit</string>
+    <!-- Text on the sheet explaining how double tapping on a message will let them edit it -->
+    <string name="DoubleTapEditEducationSheet__quickly_tap_twice">Quickly tap twice on your messages to edit them. You can edit your messages up to 24hrs after they’ve been sent.</string>
+    <!-- Button label to dismiss sheet -->
+    <string name="DoubleTapEditEducationSheet__got_it">Got it</string>
+
     <!-- text_secure_normal -->
     <string name="text_secure_normal__menu_new_group">Nová skupina</string>
     <string name="text_secure_normal__menu_settings">Nastavenia</string>
@@ -4324,6 +4392,7 @@
     <string name="RecipientBottomSheet_copied_to_clipboard">Skopírované do schránky</string>
 
     <string name="GroupRecipientListItem_admin">Admin</string>
+    <!-- Button text to approve a user that has requested to join a group -->
     <string name="GroupRecipientListItem_approve_description">Prijať</string>
     <string name="GroupRecipientListItem_deny_description">Odmietnuť</string>
 
@@ -4351,6 +4420,7 @@
 
     <!-- VoiceNoteMediaDescriptionCompatFactory -->
     <string name="VoiceNoteMediaItemFactory__voice_message">Hlasová správa · %1$s</string>
+    <!-- This is a title in a banner describing the conversation sender to receiver placeholders of the currently playing voice memo. -->
     <string name="VoiceNoteMediaItemFactory__s_to_s">od %1$s do %2$s</string>
 
     <!-- StorageUtil -->
@@ -4364,8 +4434,20 @@
     <string name="ReviewCardDialogFragment__review_members">Skontrolujte členov</string>
     <!-- Title of a screen where the user will be prompted to review a message request matching the name of someone they already know -->
     <string name="ReviewCardDialogFragment__review_request">Overiť žiadosť</string>
-    <string name="ReviewCardDialogFragment__d_group_members_have_the_same_name">%1$d členovia skupiny majú rovnaké meno. Overte nižšie zobrazených členov a zvoľte ďalší krok.</string>
-    <string name="ReviewCardDialogFragment__if_youre_not_sure">Ak si nie ste istý/á, od koho je táto žiadosť, overte nižšie zobrazené kontakty a zvoľte úkon.</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="few">%1$d group members have the same name, review the members below and choose to take action.</item>
+        <item quantity="many">%1$d group members have the same name, review the members 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 -->
+    <plurals name="ReviewCardDialogFragment__if_youre_not_sure">
+        <item quantity="one">If you\'re not sure who the request is from, review the contact below and take action.</item>
+        <item quantity="few">If you\'re not sure who the request is from, review the contacts below and take action.</item>
+        <item quantity="many">If you\'re not sure who the request is from, review the contacts below and take action.</item>
+        <item quantity="other">If you\'re not sure who the request is from, review the contacts below and take action.</item>
+    </plurals>
     <string name="ReviewCardDialogFragment__no_other_groups_in_common">Žiadne ďalšie spoločné skupiny.</string>
     <string name="ReviewCardDialogFragment__no_groups_in_common">Žiadne spoločné skupiny.</string>
     <plurals name="ReviewCardDialogFragment__d_other_groups_in_common">
@@ -4400,11 +4482,24 @@
     <string name="CallParticipantsListUpdatePopupWindow__s_joined">%1$s sa pripojil(a) k hovoru</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_and_s_joined">%1$s a %2$s sa pripojili k hovoru</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_s_and_s_joined">%1$s, %2$s a %3$s sa pripojili k hovoru</string>
-    <string name="CallParticipantsListUpdatePopupWindow__s_s_and_d_others_joined">%1$s, %2$s a %3$d ďalší sa pripojili k hovoru</string>
+    <!-- Toast message shown in group call when 3 or more people join -->
+    <plurals name="CallParticipantsListUpdatePopupWindow__s_s_and_d_others_joined">
+        <item quantity="one">%1$s, %2$s and %3$d other joined</item>
+        <item quantity="few">%1$s, %2$s and %3$d others joined</item>
+        <item quantity="many">%1$s, %2$s and %3$d others joined</item>
+        <item quantity="other">%1$s, %2$s and %3$d others joined</item>
+    </plurals>
+    <!-- Toast/popup text shown when someone leaves a group call -->
     <string name="CallParticipantsListUpdatePopupWindow__s_left">%1$s opustil(a) hovor</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_and_s_left">%1$s a %2$s opustili hovor</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_s_and_s_left">%1$s, %2$s a %3$s opustili hovor</string>
-    <string name="CallParticipantsListUpdatePopupWindow__s_s_and_d_others_left">%1$s, %2$s a %3$d ďalší opusili hovor</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 and %3$d other left</item>
+        <item quantity="few">%1$s, %2$s and %3$d others left</item>
+        <item quantity="many">%1$s, %2$s and %3$d others left</item>
+        <item quantity="other">%1$s, %2$s and %3$d others left</item>
+    </plurals>
 
     <string name="CallParticipant__you">Vy</string>
     <string name="CallParticipant__you_on_another_device">Vy (na inom zariadení)</string>
@@ -4778,10 +4873,17 @@
 
     <!-- PrivacySettingsFragment -->
     <string name="PrivacySettingsFragment__blocked">Blokované</string>
-    <string name="PrivacySettingsFragment__d_contacts">%1$d kontaktov</string>
+    <!-- Settings label that shows the number blocked contacts -->
+    <plurals name="PrivacySettingsFragment__d_contacts">
+        <item quantity="one">%1$d contact</item>
+        <item quantity="few">%1$d contacts</item>
+        <item quantity="many">%1$d contacts</item>
+        <item quantity="other">%1$d contacts</item>
+    </plurals>
     <string name="PrivacySettingsFragment__messaging">Odosielanie správ</string>
     <string name="PrivacySettingsFragment__disappearing_messages">Miznúce správy</string>
     <string name="PrivacySettingsFragment__app_security">Zabezpečenie aplikácie</string>
+    <!-- This refers to the multi-tasking overview (recent apps) from the Android operating system.-->
     <string name="PrivacySettingsFragment__block_screenshots_in_the_recents_list_and_inside_the_app">Zakázať vytváranie snímkov obrazovky v aplikácii a zozname nedávnych konverzácií</string>
     <string name="PrivacySettingsFragment__signal_message_and_calls">Správy a hovory Signal, vždy opakované hovory a zapečatený odosielateľ</string>
     <string name="PrivacySettingsFragment__default_timer_for_new_changes">Predvolený časovač pre nové čety</string>
@@ -4838,11 +4940,14 @@
     <string name="DataAndStorageSettingsFragment__media_quality">Kvalita médií</string>
     <string name="DataAndStorageSettingsFragment__sent_media_quality">Kvalita odoslaných médií</string>
     <string name="DataAndStorageSettingsFragment__sending_high_quality_media_will_use_more_data">Odosielanie médií vo vysokej kvalite využije viac dát.</string>
+    <!-- Setting option that can be selected to default media to be sent as high quality by default -->
     <string name="DataAndStorageSettingsFragment__high">Vysoká</string>
+    <!-- Setting option that can be selected to default media to be sent as standard quality by default -->
     <string name="DataAndStorageSettingsFragment__standard">Štandardná</string>
     <string name="DataAndStorageSettingsFragment__calls">Volania</string>
 
     <!-- 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__use_custom_colors">Použite vlastné farby</string>
     <string name="ChatColorSelectionFragment__chat_color">Farba četu</string>
@@ -5060,6 +5165,7 @@
     <string name="AvatarPickerFragment__take_a_picture">Odfoťte sa</string>
     <string name="AvatarPickerFragment__choose_a_photo">Vyberte fotku</string>
     <string name="AvatarPickerFragment__photo">Fotka</string>
+    <!-- Button label during avatar selection/creation that when tapped lets you generate an avatar from typed in text. -->
     <string name="AvatarPickerFragment__text">Text</string>
     <string name="AvatarPickerFragment__save">Uložiť</string>
     <string name="AvatarPickerFragment__clear_avatar">Vymazať avatara</string>
@@ -5128,7 +5234,7 @@
     <string name="MediaReviewFragment__add_a_message">Pridajte správu</string>
     <string name="MediaReviewFragment__add_a_reply">Pridať odpoveď</string>
     <string name="MediaReviewFragment__send_to">Odoslať</string>
-    <string name="MediaReviewFragment__view_once_message">Zobraziť správu raz</string>
+    <string name="MediaReviewFragment__view_once_message">Médiá na jedno pozretie</string>
     <string name="MediaReviewFragment__one_or_more_items_were_too_large">Jedna, alebo viac položiek bolo príliš veľkých</string>
     <string name="MediaReviewFragment__one_or_more_items_were_invalid">Jedna, alebo viac položiek je neplatných</string>
     <string name="MediaReviewFragment__too_many_items_selected">Je vybratých príliš veľa položiek</string>
@@ -5731,7 +5837,7 @@
     <string name="StoryViewerFragment__s_s">%1$s %2$s</string>
     <!-- Displayed when viewing a post you sent -->
     <string name="StoryViewerPageFragment__you">Vy</string>
-    <!-- Displayed when viewing a post displayed to a group -->
+    <!-- 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">od %1$s do %2$s</string>
     <!-- Displayed when viewing a post from another user with no replies -->
     <string name="StoryViewerPageFragment__reply">Odpovedať</string>
@@ -6996,5 +7102,26 @@
     <!-- Content description for opening the note editor -->
     <string name="ViewNoteSheet__edit_note">Upraviť poznámku</string>
 
+    <!-- BackupProgressService -->
+    <!-- Notification title shown while backup restore job is running -->
+    <string name="BackupProgressService_title">Obnovuje sa záloha…</string>
+    <!-- Notification title shown while downloading backup restore data -->
+    <string name="BackupProgressService_title_downloading">Sťahujú sa zálohované údaje…</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>
+    <!-- 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 -->
+    <string name="BackupsTypeSettingsFragment__google_pay">Google Pay</string>
+    <!-- Displayed as the user\'s payment method as a label in a preference row -->
+    <string name="BackupsTypeSettingsFragment__bank_transfer">Bank transfer</string>
+    <!-- Displayed as the user\'s payment method as a label in a preference row -->
+    <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>
+
+
     <!-- 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 db910a7d24..2f5d2b3b04 100644
--- a/app/src/main/res/values-sl/strings.xml
+++ b/app/src/main/res/values-sl/strings.xml
@@ -1,6 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- smartling.instruction_comments_enabled = on -->
-<resources>
+<?xml version="1.0" encoding="UTF-8"?><!-- 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> -->
@@ -89,6 +87,16 @@
     <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">Allow access to your location</string>
+    <!-- Dialog description that will explain the steps needed to give location permission -->
+    <string name="AttachmentManager_signal_to_send_location">To send your location:</string>
+    <!-- Alert dialog description asking for location permission -->
+    <string name="AttachmentManager_signal_allow_signal_access_location">Allow Molly access to send your location.</string>
+    <!-- Toast text explaining Signal\'s need for location access -->
+    <string name="AttachmentManager_signal_needs_location_access">Molly needs location access to send your location.</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>
     <!-- Alert dialog description to send the recipient a request to activate payments -->
@@ -243,7 +251,7 @@
     <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>
@@ -392,8 +400,16 @@
     <string name="ConversationActivity_your_request_to_join_has_been_sent_to_the_group_admin">Vaša prošnja za pridružitev je bila posredovana skrbniku_ci skupine. Ob njegovem_njenem odzivu boste obveščeni.</string>
     <string name="ConversationActivity_cancel_request">Preklic prošnje</string>
 
-    <string name="ConversationActivity_to_send_audio_messages_allow_signal_access_to_your_microphone">Za pošiljanje zvočnih sporočil dovolite aplikaciji Molly dostop do mikrofona naprave.</string>
+    <!-- Dialog title asking users for microphone permission -->
+    <string name="ConversationActivity_allow_access_microphone">Allow access to your microphone</string>
+    <!-- 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>
+    <!-- Toast text explaining Signal\'s need for microphone access -->
+    <string name="ConversationActivity_signal_needs_microphone_access_voice_message">Molly needs microphone access to record a voice message.</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 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>
@@ -417,10 +433,17 @@
     <string name="ConversationActivity_you_will_leave_this_group_and_it_will_be_deleted_from_all_of_your_devices">Zapustili boste skupino in ta bo izbrisana na vseh vaših napravah.</string>
     <string name="ConversationActivity_delete">Izbriši</string>
     <string name="ConversationActivity_delete_and_leave">Izbriši in zapusti</string>
-    <string name="ConversationActivity__to_call_s_signal_needs_access_to_your_microphone">Za klic uporabnika_ce %1$s, Molly potrebuje dostop do mikrofona</string>
+
+    <!-- Dialog description that will explain the steps needed to give microphone permissions for a voice call -->
+    <string name="ConversationActivity__to_start_call">To start a 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">To start a call, allow Molly access to your microphone.</string>
+    <!-- Toast text explaining Signal\'s need for microphone access for a voice call -->
+    <string name="ConversationActivity_signal_needs_microphone_access_voice_call">Molly needs microphone access to start a call.</string>
 
 
     <string name="ConversationActivity_join">Pridruži se</string>
+    <!-- Button text for an active group call but the call is currently full and unjoinable -->
     <string name="ConversationActivity_full">Polno</string>
 
     <string name="ConversationActivity_error_sending_media">Napaka pri pošiljanju medijske datoteke</string>
@@ -645,6 +668,7 @@
     <string name="ConversationListFragment_unarchive">Od-arhiviraj</string>
     <string name="ConversationListFragment_delete">Izbriši</string>
     <string name="ConversationListFragment_select_all">Označi vse</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 izbran</item>
         <item quantity="two">%1$d izbrana</item>
@@ -902,6 +926,7 @@
         <item quantity="few">%1$d vabila so poslana</item>
         <item quantity="other">%1$d vabil je poslanih</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">Uporabnika_ce “%1$s” ne morete avtomatično dodati k skupini.\n\nPoslano mu_ji je bilo vabilo in dokler ga ne potrdi, ne bo videl_a sporočil skupine.</string>
     <string name="GroupManagement_invite_multiple_users">Teh uporabnikov_ic ne morete avtomatično dodati v skupino.\n\nPoslano jim je bilo vabilo in dokler ga ne potrdijo, ne bodo videli_e sporočil skupine.</string>
 
@@ -1114,7 +1139,9 @@
 
     <string name="ManageGroupActivity_edit_name_and_picture">Uredi ime in sliko</string>
     <string name="ManageGroupActivity_legacy_group">Stara oblika skupine</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">To je Stara skupina. Funkcije, kot so skrbniki_ce skupin, so na voljo le pri Novih skupinah.</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">To je Stara skupina. Za dostop do naprednih funkcij, kot so @omembe in skrbniki_ce skupin,</string>
     <string name="ManageGroupActivity_legacy_group_too_large">Ta Stara skupina je prevelika, da bi bila lahko nadgrajena v Novo skupino. Največja velikost skupine je %1$d.</string>
     <string name="ManageGroupActivity_upgrade_this_group">nadgradite to skupino.</string>
@@ -1359,6 +1386,7 @@
         <item quantity="other">Izbriši</item>
     </plurals>
 
+    <!-- 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 izbran (%2$s)</item>
         <item quantity="two">%1$d izbrana (%2$s)</item>
@@ -1425,17 +1453,13 @@
     <string name="MessageRecord_left_group">Zapustili ste skupino.</string>
     <string name="MessageRecord_you_updated_group">Posodobili ste skupino.</string>
     <string name="MessageRecord_the_group_was_updated">Skupina je bila posodobljena</string>
-    <!-- Update message shown when placing an outgoing 1:1 voice/audio call and it\'s answered by the other party -->
+    <!-- Update message shown when placing an outgoing 1:1 voice/audio call -->
     <string name="MessageRecord_outgoing_voice_call">Odhodni glasovni klic</string>
-    <!-- Update message shown when placing an outgoing 1:1 video call and it\'s answered by the other party -->
+    <!-- Update message shown when placing an outgoing 1:1 video call -->
     <string name="MessageRecord_outgoing_video_call">Odhodni video klic</string>
-    <!-- Update message shown when placing an outgoing 1:1 voice/audio call and it\'s not answered by the other party -->
-    <string name="MessageRecord_unanswered_voice_call">Neodgovorjen glasovni klic</string>
-    <!-- Update message shown when placing an outgoing 1:1 video call and it\'s not answered by the other party -->
-    <string name="MessageRecord_unanswered_video_call">Neodgovorjen video klic</string>
-    <!-- Update message shown when receiving an incoming 1:1 voice/audio call and it\'s answered -->
+    <!-- Update message shown when receiving an incoming 1:1 voice/audio call and it\'s answered or ringing -->
     <string name="MessageRecord_incoming_voice_call">Dohodni glasovni klic</string>
-    <!-- Update message shown when receiving an incoming 1:1 video call and answered -->
+    <!-- Update message shown when receiving an incoming 1:1 video call and answered or ringing -->
     <string name="MessageRecord_incoming_video_call">Dohodni video klic</string>
     <!-- Update message shown when receiving an incoming 1:1 voice/audio call and not answered -->
     <string name="MessageRecord_missed_voice_call">Zgrešen glasovni klic</string>
@@ -1445,10 +1469,6 @@
     <string name="MessageRecord_missed_voice_call_notification_profile">Neodgovorjen zvočni klic, medtem ko je profil za obvestila vklopljen</string>
     <!-- Update message shown when receiving an incoming video call and declined due to notification profile -->
     <string name="MessageRecord_missed_video_call_notification_profile">Neodgovorjen video klic, medtem ko je profil za obvestila vklopljen</string>
-    <!-- Update message shown when receiving an incoming 1:1 voice/audio call and explicitly declined -->
-    <string name="MessageRecord_you_declined_a_voice_call">Zavrnili ste glasovni klic</string>
-    <!-- Update message shown when receiving an incoming 1:1 video call and explicitly declined -->
-    <string name="MessageRecord_you_declined_a_video_call">Zavrnili ste video klic</string>
     <!-- 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 je posodobil_a skupino.</string>
@@ -1673,30 +1693,55 @@
     <string name="MessageRecord_can_accept_payments">%1$s lahko zdaj sprejema plačila</string>
 
     <!-- Group Calling update messages -->
-    <string name="MessageRecord_s_started_a_group_call_s">%1$s je začel_a skupinski klic. · %2$s</string>
-    <string name="MessageRecord_you_started_a_group_call_s">Začeli ste skupinski klic · %1$s</string>
-    <string name="MessageRecord_s_is_in_the_group_call_s">%1$s je v skupinskem klicu. · %2$s</string>
-    <string name="MessageRecord_you_are_in_the_group_call_s1">Ste v skupinskem klicu · %1$s</string>
-    <string name="MessageRecord_s_and_s_are_in_the_group_call_s1">%1$s in %2$s sta v skupinskem klicu · %3$s</string>
-    <string name="MessageRecord_group_call_s">Skupinski klic · %1$s</string>
-
-    <string name="MessageRecord_s_started_a_group_call">%1$s je začel_a skupinski klic</string>
-    <string name="MessageRecord_you_started_a_group_call">Začeki ste skupinski klic</string>
-    <string name="MessageRecord_s_is_in_the_group_call">%1$s je v skupinskem klicu.</string>
-    <string name="MessageRecord_you_are_in_the_group_call">Ste v skupinskem klicu</string>
-    <string name="MessageRecord_s_and_s_are_in_the_group_call">%1$s in %2$s sta v skupinskem klicu</string>
-    <string name="MessageRecord_group_call">Skupinski klic</string>
+    <!-- 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 je v klicu · %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">Ste v klicu · %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 in %2$s sta v klicu · %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 je v klicu</string>
+    <!-- Chat log text for an ongoing group call only the local user has joined -->
+    <string name="MessageRecord_you_are_in_the_call">Ste v klicu</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 in %2$s sta v klicu</string>
+    <!-- Chat log text for a group call that ended within the last 5 minutes -->
+    <string name="MessageRecord__the_video_call_has_ended">Video klic se je končal</string>
+    <!-- Chat log text for a group call that ended within the last 5 minutes with a placeholder for formatted time -->
+    <string name="MessageRecord__the_video_call_has_ended_s">Video klic se je končal · %1$s</string>
+    <!-- Chat log text for a group call that ended more than 5 minutes ago and was missed -->
+    <string name="MessageRecord__missed_video_call">Zgrešen video klic</string>
+    <!-- Chat log text for a group call that ended more than 5 minutes ago and was missed with a placeholder for formatted time -->
+    <string name="MessageRecord__missed_video_call_s">Zamujen video klic · %1$s</string>
+    <!-- Chat log text for a group call that ended that the local user did not start -->
+    <string name="MessageRecord__incoming_video_call">Dohodni video klic</string>
+    <!-- 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">Dohodni video klic · %1$s</string>
+    <!-- Chat log text for a group call that ended that the local user started -->
+    <string name="MessageRecord__outgoing_video_call">Odhodni video klic</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">Odhodni video klic · %1$s</string>
+    <!-- Chat log text for an ongoing group call that the local user started -->
+    <string name="MessageRecord__you_started_a_video_call">Začeli ste video klic</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">Začeli ste video klic · %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 je začel_a video klic</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 je začel_a video klic · %2$s</string>
 
     <string name="MessageRecord_you">Vi</string>
 
-    <plurals name="MessageRecord_s_s_and_d_others_are_in_the_group_call_s">
+    <!-- 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, in še %3$d drug_a so v skupinskem klicu · %4$s</item>
         <item quantity="two">%1$s, %2$s, in še %3$d druga_i so v skupinskem klicu · %4$s</item>
         <item quantity="few">%1$s, %2$s, in še %3$d drugi_e so v skupinskem klicu · %4$s</item>
         <item quantity="other">%1$s, %2$s in še %3$d drugih je v skupinskem klicu · %4$s</item>
     </plurals>
 
-    <plurals name="MessageRecord_s_s_and_d_others_are_in_the_group_call">
+    <!-- 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, in še %3$d drug_a so v skupinskem klicu</item>
         <item quantity="two">%1$s, %2$s, in še %3$d druga_i so v skupinskem klicu</item>
         <item quantity="few">%1$s, %2$s in še %3$d drugi_e so v skupinskem klicu</item>
@@ -2221,6 +2266,7 @@
     <!-- Generic error when the app is unable to request an SMS code for an unknown reason. -->
     <string name="RegistrationActivity_unable_to_request_verification_code">Ni mogoče zahtevati kode za preverjanje. Preverite svojo omrežno povezavo in poskusite znova.</string>
     <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">Molly Android - Format telefonskih številk</string>
     <!--    Small "toast" notification to the user confirming that they have requested a new code via voice call.-->
@@ -2367,7 +2413,7 @@
     <string name="SubmitDebugLogActivity_this_log_will_be_posted_publicly_online_for_contributors">Sistemska zabeležba bo javno objavljena na spletu za razvijalce aplikacije. Pred objavo jo lahko pregledate.</string>
 
     <!-- SupportEmailUtil -->
-  <!-- Removed by excludeNonTranslatables <string name="SupportEmailUtil_support_email" translatable="false">support@molly.im</string> -->
+  <!-- Removed by excludeNonTranslatables <string name="SupportEmailUtil_support_email" translatable="false">support@signal.org</string> -->
     <string name="SupportEmailUtil_filter">Filter:</string>
     <string name="SupportEmailUtil_device_info">Podatki o napravi:</string>
     <string name="SupportEmailUtil_android_version">Različica Android:</string>
@@ -2883,6 +2929,8 @@
     <string name="ConversationUpdateItem_loading">Nalagam</string>
     <string name="ConversationUpdateItem_learn_more">Izvedite več</string>
     <string name="ConversationUpdateItem_join_call">Pridruži se klicu</string>
+    <!-- Action button label for starting a new call in the current conversation -->
+    <string name="ConversationUpdateItem_call_back">Pokliči nazaj</string>
     <string name="ConversationUpdateItem_return_to_call">Zopet se pridruži klicu</string>
     <string name="ConversationUpdateItem_call_is_full">Klic je polno zaseden</string>
     <string name="ConversationUpdateItem_invite_friends">Vabilo prijateljem_icam</string>
@@ -2947,6 +2995,7 @@
     <string name="safety_number_change_dialog__leave_call">Zapusti klic</string>
     <string name="safety_number_change_dialog__the_following_people_may_have_reinstalled_or_changed_devices">Našteti uporabniki_ce so najbrž ponovno namestili Signal ali zamenjali napravo. Za potrditev istovetnosti ponovno preverite varnostno število z njimi.</string>
     <string name="safety_number_change_dialog__view">Preglej</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">Prej potrjeno</string>
 
     <!-- EnableCallNotificationSettingsDialog__call_notifications_checklist -->
@@ -3274,6 +3323,7 @@
 
     <string name="arrays__default">Privzeto</string>
     <string name="arrays__high">Visoka</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">Najvišja</string>
 
     <!-- plurals.xml -->
@@ -3551,7 +3601,7 @@
     <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 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>
@@ -3600,6 +3650,14 @@
     <!-- Storage permission row description -->
     <string name="GrantPermissionsFragment__send_photos_videos_and_files">Pošiljajte fotografije, videoposnetke in datoteke iz svoje naprave.</string>
 
+    <!-- PermissionDeniedBottomSheet -->
+    <!-- Sheet describing step 1 on how to give permissions by opening settings -->
+    <string name="PermissionDeniedBottomSheet__1_tap_settings_below">1. Tap “Settings” below</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 Allow the permission</string>
+    <!-- Label for button at the bottom of the sheet which opens the system permission settings -->
+    <string name="PermissionDeniedBottomSheet__settings">Settings</string>
+
     <!-- PaymentsSecuritySetupFragment -->
     <!-- Toolbar title -->
     <string name="PaymentsSecuritySetupFragment__security_setup">Nastavitev varnosti</string>
@@ -3640,6 +3698,7 @@
     <string name="PaymentsDetailsFragment__sent_to_s">Poslano %1$s</string>
     <string name="PaymentsDetailsFragment__you_on_s_at_s">Vi na %1$s za %2$s</string>
     <string name="PaymentsDetailsFragment__s_on_s_at_s">%1$s na %2$s za %3$s</string>
+    <!-- Prefix to a name to indicate who a payment was sent to -->
     <string name="PaymentsDetailsFragment__to">Naslovnik</string>
     <string name="PaymentsDetailsFragment__from">Pošiljatelj</string>
     <string name="PaymentsDetailsFragment__information">Podatki o transakcijah, vključno z zneskom plačil in časom transakcij, so del MobileCoinove knjige transakcij MobileCoin Ledger.</string>
@@ -3702,6 +3761,7 @@
     <string name="ConfirmPayment__confirm_payment">Potrditev plačila</string>
     <string name="ConfirmPayment__network_fee">Omrežna pristojbina</string>
     <string name="ConfirmPayment__estimated_s">Predviden znesek %1$s</string>
+    <!-- Prefix to a name to indicate who a payment will be sent to -->
     <string name="ConfirmPayment__to">Naslovnik</string>
     <string name="ConfirmPayment__total_amount">Skupni znesek</string>
     <string name="ConfirmPayment__balance_s">Stanje: %1$s</string>
@@ -3856,6 +3916,14 @@
     <string name="conversation_group_options__conversation">Klepet</string>
     <string name="conversation_group_options__broadcast">Oddaja</string>
 
+    <!-- DoubleTapEditEducationSheet -->
+    <!-- Displayed as the title of the education bottom sheet -->
+    <string name="DoubleTapEditEducationSheet__double_tap_edit_title">Double tap to edit</string>
+    <!-- Text on the sheet explaining how double tapping on a message will let them edit it -->
+    <string name="DoubleTapEditEducationSheet__quickly_tap_twice">Quickly tap twice on your messages to edit them. You can edit your messages up to 24hrs after they’ve been sent.</string>
+    <!-- Button label to dismiss sheet -->
+    <string name="DoubleTapEditEducationSheet__got_it">Got it</string>
+
     <!-- text_secure_normal -->
     <string name="text_secure_normal__menu_new_group">Nova skupina</string>
     <string name="text_secure_normal__menu_settings">Nastavitve</string>
@@ -4324,6 +4392,7 @@
     <string name="RecipientBottomSheet_copied_to_clipboard">Kopirano v odložišče</string>
 
     <string name="GroupRecipientListItem_admin">Skrbnik_ca</string>
+    <!-- Button text to approve a user that has requested to join a group -->
     <string name="GroupRecipientListItem_approve_description">Potrdi</string>
     <string name="GroupRecipientListItem_deny_description">Zavrni</string>
 
@@ -4351,6 +4420,7 @@
 
     <!-- VoiceNoteMediaDescriptionCompatFactory -->
     <string name="VoiceNoteMediaItemFactory__voice_message">Glasovno sporočilo · %1$s</string>
+    <!-- This is a title in a banner describing the conversation sender to receiver placeholders of the currently playing voice memo. -->
     <string name="VoiceNoteMediaItemFactory__s_to_s">%1$s do %2$s</string>
 
     <!-- StorageUtil -->
@@ -4364,8 +4434,20 @@
     <string name="ReviewCardDialogFragment__review_members">Pregled članstva</string>
     <!-- Title of a screen where the user will be prompted to review a message request matching the name of someone they already know -->
     <string name="ReviewCardDialogFragment__review_request">Pregled prošnje</string>
-    <string name="ReviewCardDialogFragment__d_group_members_have_the_same_name">%1$d članov_ic skupine ima enako ime. Preglejte člane_ice spodaj in ustrezno ukrepajte.</string>
-    <string name="ReviewCardDialogFragment__if_youre_not_sure">Če niste prepričani, čigava je prošnja, preglejte stike spodaj in ustrezno ukrepajte.</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="two">%1$d group members have the same name, review the members below and choose to take action.</item>
+        <item quantity="few">%1$d group members have the same name, review the members 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 -->
+    <plurals name="ReviewCardDialogFragment__if_youre_not_sure">
+        <item quantity="one">If you\'re not sure who the request is from, review the contact below and take action.</item>
+        <item quantity="two">If you\'re not sure who the request is from, review the contacts below and take action.</item>
+        <item quantity="few">If you\'re not sure who the request is from, review the contacts below and take action.</item>
+        <item quantity="other">If you\'re not sure who the request is from, review the contacts below and take action.</item>
+    </plurals>
     <string name="ReviewCardDialogFragment__no_other_groups_in_common">Ni drugih skupnih skupin.</string>
     <string name="ReviewCardDialogFragment__no_groups_in_common">Ni skupnih skupin.</string>
     <plurals name="ReviewCardDialogFragment__d_other_groups_in_common">
@@ -4400,11 +4482,24 @@
     <string name="CallParticipantsListUpdatePopupWindow__s_joined">Pridružil_a se je %1$s</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_and_s_joined">Pridružila_li sta se %1$s in %2$s</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_s_and_s_joined">Pridružili_le so se %1$s, %2$s in %3$s</string>
-    <string name="CallParticipantsListUpdatePopupWindow__s_s_and_d_others_joined">Pridružila_li sta se %1$s, %2$s in še %3$d drugih</string>
+    <!-- Toast message shown in group call when 3 or more people join -->
+    <plurals name="CallParticipantsListUpdatePopupWindow__s_s_and_d_others_joined">
+        <item quantity="one">%1$s, %2$s and %3$d other joined</item>
+        <item quantity="two">%1$s, %2$s and %3$d others joined</item>
+        <item quantity="few">%1$s, %2$s and %3$d others joined</item>
+        <item quantity="other">%1$s, %2$s and %3$d others joined</item>
+    </plurals>
+    <!-- Toast/popup text shown when someone leaves a group call -->
     <string name="CallParticipantsListUpdatePopupWindow__s_left">%1$s je odšel_la</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_and_s_left">%1$s in %2$s sta odšla_li</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_s_and_s_left">%1$s, %2$s in %3$s so odšli_le</string>
-    <string name="CallParticipantsListUpdatePopupWindow__s_s_and_d_others_left">%1$s, %2$s in še %3$d drugih je odšlo</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 and %3$d other left</item>
+        <item quantity="two">%1$s, %2$s and %3$d others left</item>
+        <item quantity="few">%1$s, %2$s and %3$d others left</item>
+        <item quantity="other">%1$s, %2$s and %3$d others left</item>
+    </plurals>
 
     <string name="CallParticipant__you">Vi</string>
     <string name="CallParticipant__you_on_another_device">Vi (na drugi napravi)</string>
@@ -4778,10 +4873,17 @@
 
     <!-- PrivacySettingsFragment -->
     <string name="PrivacySettingsFragment__blocked">Blokirano</string>
-    <string name="PrivacySettingsFragment__d_contacts">%1$d stikov</string>
+    <!-- Settings label that shows the number blocked contacts -->
+    <plurals name="PrivacySettingsFragment__d_contacts">
+        <item quantity="one">%1$d contact</item>
+        <item quantity="two">%1$d contacts</item>
+        <item quantity="few">%1$d contacts</item>
+        <item quantity="other">%1$d contacts</item>
+    </plurals>
     <string name="PrivacySettingsFragment__messaging">Sporočanje</string>
     <string name="PrivacySettingsFragment__disappearing_messages">Izginjajoča sporočila</string>
     <string name="PrivacySettingsFragment__app_security">Varnost aplikacije</string>
+    <!-- This refers to the multi-tasking overview (recent apps) from the Android operating system.-->
     <string name="PrivacySettingsFragment__block_screenshots_in_the_recents_list_and_inside_the_app">Prepreči zajem slike zaslona na seznamu nedavnih sporočil in v aplikaciji</string>
     <string name="PrivacySettingsFragment__signal_message_and_calls">Sporočila in klici Signal, posredovanje klicev in zakriti pošiljatelj</string>
     <string name="PrivacySettingsFragment__default_timer_for_new_changes">Privzeti odštevalnik za nove klepete</string>
@@ -4838,11 +4940,14 @@
     <string name="DataAndStorageSettingsFragment__media_quality">Kvaliteta medisjkih datotek</string>
     <string name="DataAndStorageSettingsFragment__sent_media_quality">Kvaliteta poslanih medijskih datotek</string>
     <string name="DataAndStorageSettingsFragment__sending_high_quality_media_will_use_more_data">Pošiljanje medijskih datotek boljše kvalitete porabi več podatkov.</string>
+    <!-- Setting option that can be selected to default media to be sent as high quality by default -->
     <string name="DataAndStorageSettingsFragment__high">Visoka</string>
+    <!-- Setting option that can be selected to default media to be sent as standard quality by default -->
     <string name="DataAndStorageSettingsFragment__standard">Standardna</string>
     <string name="DataAndStorageSettingsFragment__calls">Klici</string>
 
     <!-- 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__use_custom_colors">Uporabi barve po meri</string>
     <string name="ChatColorSelectionFragment__chat_color">Barva klepeta</string>
@@ -5060,6 +5165,7 @@
     <string name="AvatarPickerFragment__take_a_picture">Ustvari fotografijo</string>
     <string name="AvatarPickerFragment__choose_a_photo">Izberi fotografijo</string>
     <string name="AvatarPickerFragment__photo">Slika</string>
+    <!-- Button label during avatar selection/creation that when tapped lets you generate an avatar from typed in text. -->
     <string name="AvatarPickerFragment__text">Besedilo</string>
     <string name="AvatarPickerFragment__save">Shrani</string>
     <string name="AvatarPickerFragment__clear_avatar">Izbriši avatar</string>
@@ -5128,7 +5234,7 @@
     <string name="MediaReviewFragment__add_a_message">Dodaj sporočilo</string>
     <string name="MediaReviewFragment__add_a_reply">Dodaj odgovor</string>
     <string name="MediaReviewFragment__send_to">Poslano uporabniku_ci</string>
-    <string name="MediaReviewFragment__view_once_message">Enkratni ogled sporočila</string>
+    <string name="MediaReviewFragment__view_once_message">Datoteka za enkratni ogled</string>
     <string name="MediaReviewFragment__one_or_more_items_were_too_large">En ali več predmetov je bilo prevelikih</string>
     <string name="MediaReviewFragment__one_or_more_items_were_invalid">En ali več predmetov je bilo neveljavnih</string>
     <string name="MediaReviewFragment__too_many_items_selected">Preveč izbranih predmetov</string>
@@ -5731,7 +5837,7 @@
     <string name="StoryViewerFragment__s_s">%1$s %2$s</string>
     <!-- Displayed when viewing a post you sent -->
     <string name="StoryViewerPageFragment__you">Vi</string>
-    <!-- Displayed when viewing a post displayed to a group -->
+    <!-- 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 do %2$s</string>
     <!-- Displayed when viewing a post from another user with no replies -->
     <string name="StoryViewerPageFragment__reply">Odgovori</string>
@@ -6996,5 +7102,26 @@
     <!-- Content description for opening the note editor -->
     <string name="ViewNoteSheet__edit_note">Uredi zaznamek</string>
 
+    <!-- BackupProgressService -->
+    <!-- Notification title shown while backup restore job is running -->
+    <string name="BackupProgressService_title">Obnavljanje podatkov iz varnostne kopije …</string>
+    <!-- Notification title shown while downloading backup restore data -->
+    <string name="BackupProgressService_title_downloading">Prenos varnostne kopije …</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>
+    <!-- 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 -->
+    <string name="BackupsTypeSettingsFragment__google_pay">Google Pay</string>
+    <!-- Displayed as the user\'s payment method as a label in a preference row -->
+    <string name="BackupsTypeSettingsFragment__bank_transfer">Bank transfer</string>
+    <!-- Displayed as the user\'s payment method as a label in a preference row -->
+    <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>
+
+
     <!-- 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 73c5f1aac3..ef103e5555 100644
--- a/app/src/main/res/values-sq/strings.xml
+++ b/app/src/main/res/values-sq/strings.xml
@@ -1,6 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- smartling.instruction_comments_enabled = on -->
-<resources>
+<?xml version="1.0" encoding="UTF-8"?><!-- 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> -->
@@ -89,6 +87,16 @@
     <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">Allow access to your location</string>
+    <!-- Dialog description that will explain the steps needed to give location permission -->
+    <string name="AttachmentManager_signal_to_send_location">To send your location:</string>
+    <!-- Alert dialog description asking for location permission -->
+    <string name="AttachmentManager_signal_allow_signal_access_location">Allow Molly access to send your location.</string>
+    <!-- Toast text explaining Signal\'s need for location access -->
+    <string name="AttachmentManager_signal_needs_location_access">Molly needs location access to send your location.</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>
     <!-- Alert dialog description to send the recipient a request to activate payments -->
@@ -241,7 +249,7 @@
     <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>
@@ -386,8 +394,16 @@
     <string name="ConversationActivity_your_request_to_join_has_been_sent_to_the_group_admin">Kërkesa juaj për t\'ju bashkuar grupit i është dërguar administratorit të grupit. Do të njoftoheni kur ata të ndërmarrin veprime.</string>
     <string name="ConversationActivity_cancel_request">Anuloje kërkesën</string>
 
-    <string name="ConversationActivity_to_send_audio_messages_allow_signal_access_to_your_microphone">Për të dërguar mesazhe audio, lejo qasjen e Molly-it në mikrofonin tënd.</string>
+    <!-- Dialog title asking users for microphone permission -->
+    <string name="ConversationActivity_allow_access_microphone">Allow access to your microphone</string>
+    <!-- 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>
+    <!-- Toast text explaining Signal\'s need for microphone access -->
+    <string name="ConversationActivity_signal_needs_microphone_access_voice_message">Molly needs microphone access to record a voice message.</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">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>
@@ -411,10 +427,17 @@
     <string name="ConversationActivity_you_will_leave_this_group_and_it_will_be_deleted_from_all_of_your_devices">Do të largohesh nga ky grup dhe do të fshihet nga të gjitha pajisjet e tua.</string>
     <string name="ConversationActivity_delete">Fshije</string>
     <string name="ConversationActivity_delete_and_leave">Fshije dhe dil</string>
-    <string name="ConversationActivity__to_call_s_signal_needs_access_to_your_microphone">Për të telefonuar %1$s, Molly ka nevojë për qasje te mikrofoni juaj</string>
+
+    <!-- Dialog description that will explain the steps needed to give microphone permissions for a voice call -->
+    <string name="ConversationActivity__to_start_call">To start a 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">To start a call, allow Molly access to your microphone.</string>
+    <!-- Toast text explaining Signal\'s need for microphone access for a voice call -->
+    <string name="ConversationActivity_signal_needs_microphone_access_voice_call">Molly needs microphone access to start a call.</string>
 
 
     <string name="ConversationActivity_join">Bashkohu</string>
+    <!-- Button text for an active group call but the call is currently full and unjoinable -->
     <string name="ConversationActivity_full">Plot</string>
 
     <string name="ConversationActivity_error_sending_media">Ka ndodhur një gabim gjatë dërgimit të medias</string>
@@ -613,6 +636,7 @@
     <string name="ConversationListFragment_unarchive">Çarkivoje</string>
     <string name="ConversationListFragment_delete">Fshiji</string>
     <string name="ConversationListFragment_select_all">Përzgjidh të gjitha</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 i përzgjedhur</item>
         <item quantity="other">%1$d të përzgjedhura</item>
@@ -864,6 +888,7 @@
         <item quantity="one">Ftesa u dërgua</item>
         <item quantity="other">%1$d ftesat u dërguan</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">“%1$s” s\\’mund të shtohet automatikisht te ky grup nga ju.\n\nËshtë ftuar të marrë pjesë, dhe s\\’do të shohë ndonjë mesazh grupi, para se të pranojnë ftesën.</string>
     <string name="GroupManagement_invite_multiple_users">Këta përdorues s\\’mund të shtohen automatikisht te ky grup nga ju.\n\n Janë ftuar të marrin pjesë te grupi, dhe s\\’do të shohin ndonjë mesazh grupi, përpara se të pranojnë ftesat.</string>
 
@@ -1044,7 +1069,9 @@
 
     <string name="ManageGroupActivity_edit_name_and_picture">Përpunoni emër dhe foto</string>
     <string name="ManageGroupActivity_legacy_group">Grup i Dikurshëm</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">Ky është një Grup i Dikurshëm. Veçori të tilla, bie fjala, përgjegjës grupi mund të kihen vetëm për Grupe të Rinj.</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">Ky është një Grup i Dikurshëm. Që të përdorni veçori të reja, të tilla si @përmendje dhe përgjegjës,</string>
     <string name="ManageGroupActivity_legacy_group_too_large">Ky Grup i Dikurshëm s\\’mund të përmirësohet si Grup i Ri, ngaqë është shumë i madh. Madhësia maksimum për grupet është %1$d.</string>
     <string name="ManageGroupActivity_upgrade_this_group">përmirësoni këtë grup.</string>
@@ -1271,6 +1298,7 @@
         <item quantity="other">Fshiji</item>
     </plurals>
 
+    <!-- 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 i përzgjedhur (%2$s)</item>
         <item quantity="other">%1$d të përzgjedhur (%2$s)</item>
@@ -1335,17 +1363,13 @@
     <string name="MessageRecord_left_group">E keni lënë grupin.</string>
     <string name="MessageRecord_you_updated_group">E përditësuat grupin.</string>
     <string name="MessageRecord_the_group_was_updated">Grupi u përditësua.</string>
-    <!-- Update message shown when placing an outgoing 1:1 voice/audio call and it\'s answered by the other party -->
+    <!-- Update message shown when placing an outgoing 1:1 voice/audio call -->
     <string name="MessageRecord_outgoing_voice_call">Thirrje zanore dalëse</string>
-    <!-- Update message shown when placing an outgoing 1:1 video call and it\'s answered by the other party -->
+    <!-- Update message shown when placing an outgoing 1:1 video call -->
     <string name="MessageRecord_outgoing_video_call">Thirrje video dalëse</string>
-    <!-- Update message shown when placing an outgoing 1:1 voice/audio call and it\'s not answered by the other party -->
-    <string name="MessageRecord_unanswered_voice_call">Thirrje zanore pa përgjigje</string>
-    <!-- Update message shown when placing an outgoing 1:1 video call and it\'s not answered by the other party -->
-    <string name="MessageRecord_unanswered_video_call">Thirrje video pa përgjigje</string>
-    <!-- Update message shown when receiving an incoming 1:1 voice/audio call and it\'s answered -->
+    <!-- Update message shown when receiving an incoming 1:1 voice/audio call and it\'s answered or ringing -->
     <string name="MessageRecord_incoming_voice_call">Thirrje zanore hyrëse</string>
-    <!-- Update message shown when receiving an incoming 1:1 video call and answered -->
+    <!-- Update message shown when receiving an incoming 1:1 video call and answered or ringing -->
     <string name="MessageRecord_incoming_video_call">Thirrje video hyrëse</string>
     <!-- Update message shown when receiving an incoming 1:1 voice/audio call and not answered -->
     <string name="MessageRecord_missed_voice_call">Thirrje zanore e humbur</string>
@@ -1355,10 +1379,6 @@
     <string name="MessageRecord_missed_voice_call_notification_profile">Thirrje zanore e humbur edhe pse njoftimet janë aktive</string>
     <!-- Update message shown when receiving an incoming video call and declined due to notification profile -->
     <string name="MessageRecord_missed_video_call_notification_profile">Thirrje me video e humbur edhe pse njoftimi i profilit është aktiv</string>
-    <!-- Update message shown when receiving an incoming 1:1 voice/audio call and explicitly declined -->
-    <string name="MessageRecord_you_declined_a_voice_call">Refuzove thirrjen zanore</string>
-    <!-- Update message shown when receiving an incoming 1:1 video call and explicitly declined -->
-    <string name="MessageRecord_you_declined_a_video_call">Refuzove thirrjen video</string>
     <!-- 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 përditësoi grupin.</string>
@@ -1567,28 +1587,53 @@
     <string name="MessageRecord_can_accept_payments">%1$s tani mund të pranojë pagesat</string>
 
     <!-- Group Calling update messages -->
-    <string name="MessageRecord_s_started_a_group_call_s">%1$s nisi një thirrje grupi · %2$s</string>
-    <string name="MessageRecord_you_started_a_group_call_s">Ti fillove një thirrje në grup · %1$s</string>
-    <string name="MessageRecord_s_is_in_the_group_call_s">%1$s gjendet te thirrja e grupit · %2$s</string>
-    <string name="MessageRecord_you_are_in_the_group_call_s1">Gjendeni te thirrja e grupit · %1$s</string>
-    <string name="MessageRecord_s_and_s_are_in_the_group_call_s1">%1$s dhe %2$s gjenden te thirrja e grupit · %3$s</string>
-    <string name="MessageRecord_group_call_s">Thirrje grupi · %1$s</string>
-
-    <string name="MessageRecord_s_started_a_group_call">%1$s nisi një thirrje grupi</string>
-    <string name="MessageRecord_you_started_a_group_call">Nisët një thirrje grupi</string>
-    <string name="MessageRecord_s_is_in_the_group_call">%1$s gjendet te thirrja e grupit</string>
-    <string name="MessageRecord_you_are_in_the_group_call">Gjendeni te thirrja e grupit</string>
-    <string name="MessageRecord_s_and_s_are_in_the_group_call">%1$s dhe %2$s gjenden te thirrja e grupit</string>
-    <string name="MessageRecord_group_call">Thirrje grupi</string>
+    <!-- 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 është në telefonatë · %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">Je në telefonatë · %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 dhe %2$s janë në telefonatë · %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 është në telefonatë</string>
+    <!-- Chat log text for an ongoing group call only the local user has joined -->
+    <string name="MessageRecord_you_are_in_the_call">Je në telefonatë</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 dhe %2$s janë në telefonatë</string>
+    <!-- Chat log text for a group call that ended within the last 5 minutes -->
+    <string name="MessageRecord__the_video_call_has_ended">Thirrja me video ka përfunduar</string>
+    <!-- Chat log text for a group call that ended within the last 5 minutes with a placeholder for formatted time -->
+    <string name="MessageRecord__the_video_call_has_ended_s">Thirrja me video ka përfunduar · %1$s</string>
+    <!-- Chat log text for a group call that ended more than 5 minutes ago and was missed -->
+    <string name="MessageRecord__missed_video_call">Thirrje video e humbur</string>
+    <!-- Chat log text for a group call that ended more than 5 minutes ago and was missed with a placeholder for formatted time -->
+    <string name="MessageRecord__missed_video_call_s">Thirrje video e humbur · %1$s</string>
+    <!-- Chat log text for a group call that ended that the local user did not start -->
+    <string name="MessageRecord__incoming_video_call">Thirrje video hyrëse</string>
+    <!-- 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">Thirrje hyrëse me video · %1$s</string>
+    <!-- Chat log text for a group call that ended that the local user started -->
+    <string name="MessageRecord__outgoing_video_call">Thirrje video dalëse</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">Thirrje dalëse me video · %1$s</string>
+    <!-- Chat log text for an ongoing group call that the local user started -->
+    <string name="MessageRecord__you_started_a_video_call">Ti fillove një thirrje me video</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">Ti fillove një thirrje me video · %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 filloi një thirrje me video</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 filloi një thirrje me video · %2$s</string>
 
     <string name="MessageRecord_you">Ju</string>
 
-    <plurals name="MessageRecord_s_s_and_d_others_are_in_the_group_call_s">
+    <!-- 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, dhe %3$d tjetër gjenden te thirrja e grupit · %4$s</item>
         <item quantity="other">%1$s, %2$s, dhe %3$d të tjerë gjenden te thirrja e grupit · %4$s</item>
     </plurals>
 
-    <plurals name="MessageRecord_s_s_and_d_others_are_in_the_group_call">
+    <!-- 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, dhe %3$d tjetër gjenden te thirrja e grupit</item>
         <item quantity="other">%1$s, %2$s, dhe %3$d të tjerë gjenden te thirrja e grupit</item>
     </plurals>
@@ -2063,6 +2108,7 @@
     <!-- Generic error when the app is unable to request an SMS code for an unknown reason. -->
     <string name="RegistrationActivity_unable_to_request_verification_code">Nuk mund të kërkohet një kod verifikimi. Të lutem, kontrollo lidhjen me rrjetin dhe riprovo.</string>
     <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">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.-->
@@ -2207,7 +2253,7 @@
     <string name="SubmitDebugLogActivity_this_log_will_be_posted_publicly_online_for_contributors">Ky regjistër do të postohet publikisht në internet që ta shohin kontribuesit. Para se ta ngarkoni, mund ta shqyrtoni.</string>
 
     <!-- SupportEmailUtil -->
-  <!-- Removed by excludeNonTranslatables <string name="SupportEmailUtil_support_email" translatable="false">support@molly.im</string> -->
+  <!-- Removed by excludeNonTranslatables <string name="SupportEmailUtil_support_email" translatable="false">support@signal.org</string> -->
     <string name="SupportEmailUtil_filter">Filtër:</string>
     <string name="SupportEmailUtil_device_info">Të dhëna pajisjeje:</string>
     <string name="SupportEmailUtil_android_version">Version Android:</string>
@@ -2709,6 +2755,8 @@
     <string name="ConversationUpdateItem_loading">Po ngarkohet</string>
     <string name="ConversationUpdateItem_learn_more">Mësoni më tepër</string>
     <string name="ConversationUpdateItem_join_call">Hyni në thirrje</string>
+    <!-- Action button label for starting a new call in the current conversation -->
+    <string name="ConversationUpdateItem_call_back">Ktheji Thirrjen</string>
     <string name="ConversationUpdateItem_return_to_call">Kthehuni te thirrja</string>
     <string name="ConversationUpdateItem_call_is_full">Thirrja është plot</string>
     <string name="ConversationUpdateItem_invite_friends">Ftoni shokë</string>
@@ -2773,6 +2821,7 @@
     <string name="safety_number_change_dialog__leave_call">Dilni nga thirrja</string>
     <string name="safety_number_change_dialog__the_following_people_may_have_reinstalled_or_changed_devices">Personat vijues mund të kenë riinstaluar ose ndryshuar pajisjet. Për të siguruar privatësi, verifikoni me ta numrin tuaj të sigurisë.</string>
     <string name="safety_number_change_dialog__view">Shihni</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">Verifikuar më herët</string>
 
     <!-- EnableCallNotificationSettingsDialog__call_notifications_checklist -->
@@ -3086,6 +3135,7 @@
 
     <string name="arrays__default">Parazgjedhje</string>
     <string name="arrays__high">Lartësi</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">Maks.</string>
 
     <!-- plurals.xml -->
@@ -3357,7 +3407,7 @@
     <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ë 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>
@@ -3406,6 +3456,14 @@
     <!-- Storage permission row description -->
     <string name="GrantPermissionsFragment__send_photos_videos_and_files">Dërgo foto, video dhe skedarë nga pajisja jote.</string>
 
+    <!-- PermissionDeniedBottomSheet -->
+    <!-- Sheet describing step 1 on how to give permissions by opening settings -->
+    <string name="PermissionDeniedBottomSheet__1_tap_settings_below">1. Tap “Settings” below</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 Allow the permission</string>
+    <!-- Label for button at the bottom of the sheet which opens the system permission settings -->
+    <string name="PermissionDeniedBottomSheet__settings">Settings</string>
+
     <!-- PaymentsSecuritySetupFragment -->
     <!-- Toolbar title -->
     <string name="PaymentsSecuritySetupFragment__security_setup">Konfigurimi i sigurisë</string>
@@ -3446,6 +3504,7 @@
     <string name="PaymentsDetailsFragment__sent_to_s">Dërguar te %1$s</string>
     <string name="PaymentsDetailsFragment__you_on_s_at_s">Ju, në %1$s më %2$s</string>
     <string name="PaymentsDetailsFragment__s_on_s_at_s">%1$s në %2$s më %3$s</string>
+    <!-- Prefix to a name to indicate who a payment was sent to -->
     <string name="PaymentsDetailsFragment__to">Për</string>
     <string name="PaymentsDetailsFragment__from">Nga</string>
     <string name="PaymentsDetailsFragment__information">Detajet e transaksionit duke përfshirë shumën e pagesës dhe kohën e transaksionit janë pjesë e Regjistrit të MobileCoin.</string>
@@ -3508,6 +3567,7 @@
     <string name="ConfirmPayment__confirm_payment">Ripohoni pagesën</string>
     <string name="ConfirmPayment__network_fee">Tarifë rrjeti</string>
     <string name="ConfirmPayment__estimated_s">Afërsisht %1$s</string>
+    <!-- Prefix to a name to indicate who a payment will be sent to -->
     <string name="ConfirmPayment__to">Për</string>
     <string name="ConfirmPayment__total_amount">Shuma totale</string>
     <string name="ConfirmPayment__balance_s">Depozitë : %1$s</string>
@@ -3658,6 +3718,14 @@
     <string name="conversation_group_options__conversation">Biseda</string>
     <string name="conversation_group_options__broadcast">Transmetim</string>
 
+    <!-- DoubleTapEditEducationSheet -->
+    <!-- Displayed as the title of the education bottom sheet -->
+    <string name="DoubleTapEditEducationSheet__double_tap_edit_title">Double tap to edit</string>
+    <!-- Text on the sheet explaining how double tapping on a message will let them edit it -->
+    <string name="DoubleTapEditEducationSheet__quickly_tap_twice">Quickly tap twice on your messages to edit them. You can edit your messages up to 24hrs after they’ve been sent.</string>
+    <!-- Button label to dismiss sheet -->
+    <string name="DoubleTapEditEducationSheet__got_it">Got it</string>
+
     <!-- text_secure_normal -->
     <string name="text_secure_normal__menu_new_group">Grup i ri</string>
     <string name="text_secure_normal__menu_settings">Parametrat</string>
@@ -4112,6 +4180,7 @@
     <string name="RecipientBottomSheet_copied_to_clipboard">U kopjua në të papastër</string>
 
     <string name="GroupRecipientListItem_admin">Përgjegjës</string>
+    <!-- Button text to approve a user that has requested to join a group -->
     <string name="GroupRecipientListItem_approve_description">Miratoje</string>
     <string name="GroupRecipientListItem_deny_description">Hidhe poshtë</string>
 
@@ -4139,6 +4208,7 @@
 
     <!-- VoiceNoteMediaDescriptionCompatFactory -->
     <string name="VoiceNoteMediaItemFactory__voice_message">Mesazh zanor · %1$s</string>
+    <!-- This is a title in a banner describing the conversation sender to receiver placeholders of the currently playing voice memo. -->
     <string name="VoiceNoteMediaItemFactory__s_to_s">%1$s për %2$s</string>
 
     <!-- StorageUtil -->
@@ -4152,8 +4222,16 @@
     <string name="ReviewCardDialogFragment__review_members">Shqyrtoni anëtarë</string>
     <!-- Title of a screen where the user will be prompted to review a message request matching the name of someone they already know -->
     <string name="ReviewCardDialogFragment__review_request">Shqyrtoni kërkesë</string>
-    <string name="ReviewCardDialogFragment__d_group_members_have_the_same_name">%1$d anëtarë grupi kanë të njëjtin emër, shqyrtoni anëtarët më poshtë dhe zgjidhni kryerjen e një veprimi.</string>
-    <string name="ReviewCardDialogFragment__if_youre_not_sure">Nëse s\\’jeni i sigurt se prej kujt është kërkesa, shqyrtoni kontaktet më poshtë dhe kryeni një veprim.</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="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 -->
+    <plurals name="ReviewCardDialogFragment__if_youre_not_sure">
+        <item quantity="one">If you\'re not sure who the request is from, review the contact below and take action.</item>
+        <item quantity="other">If you\'re not sure who the request is from, review the contacts below and take action.</item>
+    </plurals>
     <string name="ReviewCardDialogFragment__no_other_groups_in_common">S\\’ka grupe të tjerë të përbashkët.</string>
     <string name="ReviewCardDialogFragment__no_groups_in_common">S\\’ka grupe të përbashkët.</string>
     <plurals name="ReviewCardDialogFragment__d_other_groups_in_common">
@@ -4184,11 +4262,20 @@
     <string name="CallParticipantsListUpdatePopupWindow__s_joined">Erdhi %1$s</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_and_s_joined">Erdhën %1$s dhe %2$s</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_s_and_s_joined">Erdhën %1$s, %2$s dhe %3$s</string>
-    <string name="CallParticipantsListUpdatePopupWindow__s_s_and_d_others_joined">Erdhën %1$s, %2$s dhe %3$d të tjerë</string>
+    <!-- Toast message shown in group call when 3 or more people join -->
+    <plurals name="CallParticipantsListUpdatePopupWindow__s_s_and_d_others_joined">
+        <item quantity="one">%1$s, %2$s and %3$d other joined</item>
+        <item quantity="other">%1$s, %2$s and %3$d others joined</item>
+    </plurals>
+    <!-- Toast/popup text shown when someone leaves a group call -->
     <string name="CallParticipantsListUpdatePopupWindow__s_left">%1$s iku</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_and_s_left">%1$s dhe %2$s ikën</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_s_and_s_left">%1$s, %2$s dhe %3$s ikën</string>
-    <string name="CallParticipantsListUpdatePopupWindow__s_s_and_d_others_left">%1$s, %2$s dhe %3$d të tjerë ikën</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 and %3$d other left</item>
+        <item quantity="other">%1$s, %2$s and %3$d others left</item>
+    </plurals>
 
     <string name="CallParticipant__you">Ju</string>
     <string name="CallParticipant__you_on_another_device">Ju (në një tjetër pajisje)</string>
@@ -4558,10 +4645,15 @@
 
     <!-- PrivacySettingsFragment -->
     <string name="PrivacySettingsFragment__blocked">E bllokuar</string>
-    <string name="PrivacySettingsFragment__d_contacts">%1$d kontakte</string>
+    <!-- Settings label that shows the number blocked contacts -->
+    <plurals name="PrivacySettingsFragment__d_contacts">
+        <item quantity="one">%1$d contact</item>
+        <item quantity="other">%1$d contacts</item>
+    </plurals>
     <string name="PrivacySettingsFragment__messaging">Shkëmbim Mesazhesh</string>
     <string name="PrivacySettingsFragment__disappearing_messages">Zhdukje mesazhesh</string>
     <string name="PrivacySettingsFragment__app_security">Siguri aplikacioni</string>
+    <!-- This refers to the multi-tasking overview (recent apps) from the Android operating system.-->
     <string name="PrivacySettingsFragment__block_screenshots_in_the_recents_list_and_inside_the_app">Blloko foto të ekranit te lista e të rejave dhe brenda aplikacionit</string>
     <string name="PrivacySettingsFragment__signal_message_and_calls">Mesazhe dhe thirrje Signal, thirrjet kaloji përherë përmes relesh, dhe dërgues të vulosur</string>
     <string name="PrivacySettingsFragment__default_timer_for_new_changes">Kohëmatës i parazgjedhur për bisedat e reja</string>
@@ -4618,11 +4710,14 @@
     <string name="DataAndStorageSettingsFragment__media_quality">Cilësi media</string>
     <string name="DataAndStorageSettingsFragment__sent_media_quality">Cilësi medie të dërguar</string>
     <string name="DataAndStorageSettingsFragment__sending_high_quality_media_will_use_more_data">Dërgimi i medias në cilësi të lartë do të përdorë më tepër të dhëna.</string>
+    <!-- Setting option that can be selected to default media to be sent as high quality by default -->
     <string name="DataAndStorageSettingsFragment__high">Lartësi</string>
+    <!-- Setting option that can be selected to default media to be sent as standard quality by default -->
     <string name="DataAndStorageSettingsFragment__standard">Standard</string>
     <string name="DataAndStorageSettingsFragment__calls">Thirrje</string>
 
     <!-- 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__use_custom_colors">Përdor ngjyra vetjake</string>
     <string name="ChatColorSelectionFragment__chat_color">Ngjyra e sfondit të bisedës</string>
@@ -4834,6 +4929,7 @@
     <string name="AvatarPickerFragment__take_a_picture">Bëni një foto</string>
     <string name="AvatarPickerFragment__choose_a_photo">Zgjidhni një foto</string>
     <string name="AvatarPickerFragment__photo">Foto</string>
+    <!-- Button label during avatar selection/creation that when tapped lets you generate an avatar from typed in text. -->
     <string name="AvatarPickerFragment__text">Tekst</string>
     <string name="AvatarPickerFragment__save">Ruaje</string>
     <string name="AvatarPickerFragment__clear_avatar">Spastroje avatarin</string>
@@ -4894,7 +4990,7 @@
     <string name="MediaReviewFragment__add_a_message">Shtoni një mesazh</string>
     <string name="MediaReviewFragment__add_a_reply">Shtoni një përgjigje</string>
     <string name="MediaReviewFragment__send_to">Dërguar</string>
-    <string name="MediaReviewFragment__view_once_message">Mesazh për parje vetëm një herë</string>
+    <string name="MediaReviewFragment__view_once_message">Media që mund të shihet vetëm një herë</string>
     <string name="MediaReviewFragment__one_or_more_items_were_too_large">Një ose më tepër objekte qenë shumë të mëdhenj</string>
     <string name="MediaReviewFragment__one_or_more_items_were_invalid">Një ose më tepër objekte qenë të pavlefshëm</string>
     <string name="MediaReviewFragment__too_many_items_selected">Shumë objekte të përzgjedhur</string>
@@ -5487,7 +5583,7 @@
     <string name="StoryViewerFragment__s_s">%1$s %2$s</string>
     <!-- Displayed when viewing a post you sent -->
     <string name="StoryViewerPageFragment__you">Ju</string>
-    <!-- Displayed when viewing a post displayed to a group -->
+    <!-- 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 -->
     <string name="StoryViewerPageFragment__reply">Përgjigju</string>
@@ -6704,5 +6800,26 @@
     <!-- Content description for opening the note editor -->
     <string name="ViewNoteSheet__edit_note">Përpuno shënimin</string>
 
+    <!-- BackupProgressService -->
+    <!-- Notification title shown while backup restore job is running -->
+    <string name="BackupProgressService_title">Rezervimi po ribëhet…</string>
+    <!-- Notification title shown while downloading backup restore data -->
+    <string name="BackupProgressService_title_downloading">Po shkarkohen të dhënat rezervë…</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>
+    <!-- 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 -->
+    <string name="BackupsTypeSettingsFragment__google_pay">Google Pay</string>
+    <!-- Displayed as the user\'s payment method as a label in a preference row -->
+    <string name="BackupsTypeSettingsFragment__bank_transfer">Bank transfer</string>
+    <!-- Displayed as the user\'s payment method as a label in a preference row -->
+    <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>
+
+
     <!-- 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 2e3c8d1224..efbc18faaa 100644
--- a/app/src/main/res/values-sr/strings.xml
+++ b/app/src/main/res/values-sr/strings.xml
@@ -1,6 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- smartling.instruction_comments_enabled = on -->
-<resources>
+<?xml version="1.0" encoding="UTF-8"?><!-- 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> -->
@@ -89,6 +87,16 @@
     <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">Allow access to your location</string>
+    <!-- Dialog description that will explain the steps needed to give location permission -->
+    <string name="AttachmentManager_signal_to_send_location">To send your location:</string>
+    <!-- Alert dialog description asking for location permission -->
+    <string name="AttachmentManager_signal_allow_signal_access_location">Allow Molly access to send your location.</string>
+    <!-- Toast text explaining Signal\'s need for location access -->
+    <string name="AttachmentManager_signal_needs_location_access">Molly needs location access to send your location.</string>
+
     <!-- Alert dialog title to show the recipient has not activated payments -->
     <string name="AttachmentManager__not_activated_payments">%1$s није активирао/ла плаћања </string>
     <!-- Alert dialog description to send the recipient a request to activate payments -->
@@ -241,7 +249,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>
@@ -386,8 +394,16 @@
     <string name="ConversationActivity_your_request_to_join_has_been_sent_to_the_group_admin">Ваш захтев за придруживање је послат администратору групе. Бићете обавештени када администратор предузме мере.</string>
     <string name="ConversationActivity_cancel_request">Откажи захтев</string>
 
-    <string name="ConversationActivity_to_send_audio_messages_allow_signal_access_to_your_microphone">Да бисте послали аудио поруку, дозволите Molly-у приступ за коришћење микрофона.</string>
+    <!-- Dialog title asking users for microphone permission -->
+    <string name="ConversationActivity_allow_access_microphone">Allow access to your microphone</string>
+    <!-- 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>
+    <!-- Toast text explaining Signal\'s need for microphone access -->
+    <string name="ConversationActivity_signal_needs_microphone_access_voice_message">Molly needs microphone access to record a voice message.</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">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>
@@ -411,10 +427,17 @@
     <string name="ConversationActivity_you_will_leave_this_group_and_it_will_be_deleted_from_all_of_your_devices">Напустићете групу и она ће бити избрисана на свим вашим уређајима.</string>
     <string name="ConversationActivity_delete">Избриши</string>
     <string name="ConversationActivity_delete_and_leave">Избриши и напусти</string>
-    <string name="ConversationActivity__to_call_s_signal_needs_access_to_your_microphone">Да бисте позвали контакт %1$s, Molly-у је потребан приступ вашем микрофону</string>
+
+    <!-- Dialog description that will explain the steps needed to give microphone permissions for a voice call -->
+    <string name="ConversationActivity__to_start_call">To start a 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">To start a call, allow Molly access to your microphone.</string>
+    <!-- Toast text explaining Signal\'s need for microphone access for a voice call -->
+    <string name="ConversationActivity_signal_needs_microphone_access_voice_call">Molly needs microphone access to start a call.</string>
 
 
     <string name="ConversationActivity_join">Придружите се</string>
+    <!-- Button text for an active group call but the call is currently full and unjoinable -->
     <string name="ConversationActivity_full">Пуно</string>
 
     <string name="ConversationActivity_error_sending_media">Грешка приликом слања медија</string>
@@ -613,6 +636,7 @@
     <string name="ConversationListFragment_unarchive">Врати из архиве</string>
     <string name="ConversationListFragment_delete">Избриши</string>
     <string name="ConversationListFragment_select_all">Изабери све</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</item>
         <item quantity="other">Изабрано: %1$d</item>
@@ -864,6 +888,7 @@
         <item quantity="one">Позивница је послата</item>
         <item quantity="other">Послатих позивница: %1$d</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">Не можете аутоматски додати корисника „%1$s“ у групу.\n\n Позивница је послата том кориснику и корисник неће видети групне поруке док је не прихвати.</string>
     <string name="GroupManagement_invite_multiple_users">Ове кориснике не можете аутоматски додати у групу.\n\nПозвани су да се придруже групи и неће видети ниједну групну поруку док не прихвате позивницу.</string>
 
@@ -1044,7 +1069,9 @@
 
     <string name="ManageGroupActivity_edit_name_and_picture">Измените име и слику</string>
     <string name="ManageGroupActivity_legacy_group">Стара група</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">Ово је старе група. Функционалности попут администратора групе доступне су само у новим групама.</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">Ово је стара група. Да бисте приступили новим функционалностима попут @помињања и администратора,</string>
     <string name="ManageGroupActivity_legacy_group_too_large">Ова стара група не може да се надогради на нову групу јер је превелика. Максимална величина групе је %1$d.</string>
     <string name="ManageGroupActivity_upgrade_this_group">надоградите ову групу.</string>
@@ -1271,6 +1298,7 @@
         <item quantity="other">Избриши</item>
     </plurals>
 
+    <!-- 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 (%2$s)</item>
         <item quantity="other">Изабрано: %1$d (%2$s)</item>
@@ -1335,17 +1363,13 @@
     <string name="MessageRecord_left_group">Напустили сте групу.</string>
     <string name="MessageRecord_you_updated_group">Ажурирали сте групу.</string>
     <string name="MessageRecord_the_group_was_updated">Група је ажурирана.</string>
-    <!-- Update message shown when placing an outgoing 1:1 voice/audio call and it\'s answered by the other party -->
+    <!-- Update message shown when placing an outgoing 1:1 voice/audio call -->
     <string name="MessageRecord_outgoing_voice_call">Одлазни гласовни позив</string>
-    <!-- Update message shown when placing an outgoing 1:1 video call and it\'s answered by the other party -->
+    <!-- Update message shown when placing an outgoing 1:1 video call -->
     <string name="MessageRecord_outgoing_video_call">Одлазни видео позив</string>
-    <!-- Update message shown when placing an outgoing 1:1 voice/audio call and it\'s not answered by the other party -->
-    <string name="MessageRecord_unanswered_voice_call">Неодговорен гласовни позив</string>
-    <!-- Update message shown when placing an outgoing 1:1 video call and it\'s not answered by the other party -->
-    <string name="MessageRecord_unanswered_video_call">Неодговорен видео позив</string>
-    <!-- Update message shown when receiving an incoming 1:1 voice/audio call and it\'s answered -->
+    <!-- Update message shown when receiving an incoming 1:1 voice/audio call and it\'s answered or ringing -->
     <string name="MessageRecord_incoming_voice_call">Долазни гласовни позив</string>
-    <!-- Update message shown when receiving an incoming 1:1 video call and answered -->
+    <!-- Update message shown when receiving an incoming 1:1 video call and answered or ringing -->
     <string name="MessageRecord_incoming_video_call">Долазни видео позив</string>
     <!-- Update message shown when receiving an incoming 1:1 voice/audio call and not answered -->
     <string name="MessageRecord_missed_voice_call">Пропуштен гласовни позив</string>
@@ -1355,10 +1379,6 @@
     <string name="MessageRecord_missed_voice_call_notification_profile">Пропуштен је гласовни позив док је профил за обавештења био укључен</string>
     <!-- Update message shown when receiving an incoming video call and declined due to notification profile -->
     <string name="MessageRecord_missed_video_call_notification_profile">Пропуштен је гласовни позив док је профил за обавештења био укључен</string>
-    <!-- Update message shown when receiving an incoming 1:1 voice/audio call and explicitly declined -->
-    <string name="MessageRecord_you_declined_a_voice_call">Одбили сте гласовни позив</string>
-    <!-- Update message shown when receiving an incoming 1:1 video call and explicitly declined -->
-    <string name="MessageRecord_you_declined_a_video_call">Одбили сте видео позив</string>
     <!-- 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>
@@ -1567,28 +1587,53 @@
     <string name="MessageRecord_can_accept_payments">%1$s сада може да прихвата плаћања</string>
 
     <!-- Group Calling update messages -->
-    <string name="MessageRecord_s_started_a_group_call_s">%1$s је започео/ла групни позив · %2$s</string>
-    <string name="MessageRecord_you_started_a_group_call_s">Започели сте групни позив · %1$s</string>
-    <string name="MessageRecord_s_is_in_the_group_call_s">%1$s је у групном позиву · %2$s</string>
-    <string name="MessageRecord_you_are_in_the_group_call_s1">Ви сте у групном позиву · %1$s</string>
-    <string name="MessageRecord_s_and_s_are_in_the_group_call_s1">%1$s и %2$s су у групном позиву · %3$s</string>
-    <string name="MessageRecord_group_call_s">Групни позив · %1$s</string>
-
-    <string name="MessageRecord_s_started_a_group_call">%1$s је започео/ла групни позив</string>
-    <string name="MessageRecord_you_started_a_group_call">Покренули сте групни позив</string>
-    <string name="MessageRecord_s_is_in_the_group_call">%1$s је у групном позиву</string>
-    <string name="MessageRecord_you_are_in_the_group_call">Ви сте у групном позиву</string>
-    <string name="MessageRecord_s_and_s_are_in_the_group_call">%1$s и %2$s су у групном позиву</string>
-    <string name="MessageRecord_group_call">Групни позив</string>
+    <!-- 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 је у позиву · %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">Ви сте у позиву · %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 и %2$s су у позиву · %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 је у позиву</string>
+    <!-- Chat log text for an ongoing group call only the local user has joined -->
+    <string name="MessageRecord_you_are_in_the_call">Ви сте у позиву</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 и %2$s су у позиву</string>
+    <!-- Chat log text for a group call that ended within the last 5 minutes -->
+    <string name="MessageRecord__the_video_call_has_ended">Видео-позив је завршен</string>
+    <!-- Chat log text for a group call that ended within the last 5 minutes with a placeholder for formatted time -->
+    <string name="MessageRecord__the_video_call_has_ended_s">Видео-позив је завршен · %1$s</string>
+    <!-- Chat log text for a group call that ended more than 5 minutes ago and was missed -->
+    <string name="MessageRecord__missed_video_call">Пропуштен видео позив</string>
+    <!-- Chat log text for a group call that ended more than 5 minutes ago and was missed with a placeholder for formatted time -->
+    <string name="MessageRecord__missed_video_call_s">пропуштен видео позив од · %1$s</string>
+    <!-- Chat log text for a group call that ended that the local user did not start -->
+    <string name="MessageRecord__incoming_video_call">Долазни видео позив</string>
+    <!-- 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">Долазни видео-позив · %1$s</string>
+    <!-- Chat log text for a group call that ended that the local user started -->
+    <string name="MessageRecord__outgoing_video_call">Одлазни видео позив</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">Одлазни видео-позив · %1$s</string>
+    <!-- Chat log text for an ongoing group call that the local user started -->
+    <string name="MessageRecord__you_started_a_video_call">Започели сте видео-позив</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">Започели сте видео-позив · %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 је започео/ла видео-позив</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 је започео/ла видео-позив · %2$s</string>
 
     <string name="MessageRecord_you">Ви</string>
 
-    <plurals name="MessageRecord_s_s_and_d_others_are_in_the_group_call_s">
+    <!-- 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 и још %3$d особа · %4$s</item>
         <item quantity="other">У групном позиву су %1$s, %2$s и још њих %3$d · %4$s</item>
     </plurals>
 
-    <plurals name="MessageRecord_s_s_and_d_others_are_in_the_group_call">
+    <!-- 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 и још %3$d особа</item>
         <item quantity="other">У групном позиву су %1$s, %2$s и још њих %3$d</item>
     </plurals>
@@ -2063,6 +2108,7 @@
     <!-- Generic error when the app is unable to request an SMS code for an unknown reason. -->
     <string name="RegistrationActivity_unable_to_request_verification_code">Није могуће затражити шифру за верификацију. Проверите да ли сте повезани на интернет и пробајте поново.</string>
     <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">Molly Android – формат броја телефона</string>
     <!--    Small "toast" notification to the user confirming that they have requested a new code via voice call.-->
@@ -2207,7 +2253,7 @@
     <string name="SubmitDebugLogActivity_this_log_will_be_posted_publicly_online_for_contributors">Овај извештај ће бити јавно објављен и видљив сарадницима. Можете га прегледати пре отпремања.</string>
 
     <!-- SupportEmailUtil -->
-  <!-- Removed by excludeNonTranslatables <string name="SupportEmailUtil_support_email" translatable="false">support@molly.im</string> -->
+  <!-- Removed by excludeNonTranslatables <string name="SupportEmailUtil_support_email" translatable="false">support@signal.org</string> -->
     <string name="SupportEmailUtil_filter">Филтер:</string>
     <string name="SupportEmailUtil_device_info">Информације о уређају:</string>
     <string name="SupportEmailUtil_android_version">Верзија Android-а:</string>
@@ -2709,6 +2755,8 @@
     <string name="ConversationUpdateItem_loading">Учитава се</string>
     <string name="ConversationUpdateItem_learn_more">Сазнајте више</string>
     <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_call_is_full">Позив је пун</string>
     <string name="ConversationUpdateItem_invite_friends">Позовите пријатеље</string>
@@ -2773,6 +2821,7 @@
     <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>
 
     <!-- EnableCallNotificationSettingsDialog__call_notifications_checklist -->
@@ -3086,6 +3135,7 @@
 
     <string name="arrays__default">Подразумевано</string>
     <string name="arrays__high">Висок квалитет</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">Максимално</string>
 
     <!-- plurals.xml -->
@@ -3357,7 +3407,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">Можете да користите 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">Плаћања на Molly-у више није доступна. И даље можете да пренесете средства на берзу, али више не можете да шаљете и примате уплате или да уплаћујете средства.</string>
@@ -3406,6 +3456,14 @@
     <!-- Storage permission row description -->
     <string name="GrantPermissionsFragment__send_photos_videos_and_files">Шаљите слике, видео и фајлове са свог уређаја.</string>
 
+    <!-- PermissionDeniedBottomSheet -->
+    <!-- Sheet describing step 1 on how to give permissions by opening settings -->
+    <string name="PermissionDeniedBottomSheet__1_tap_settings_below">1. Tap “Settings” below</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 Allow the permission</string>
+    <!-- Label for button at the bottom of the sheet which opens the system permission settings -->
+    <string name="PermissionDeniedBottomSheet__settings">Settings</string>
+
     <!-- PaymentsSecuritySetupFragment -->
     <!-- Toolbar title -->
     <string name="PaymentsSecuritySetupFragment__security_setup">Сигурносна подешавања</string>
@@ -3446,6 +3504,7 @@
     <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__information">Детаљи трансакције, укључујући износ плаћања и време трансакције, део су књиге MobileCoin-а.</string>
@@ -3508,6 +3567,7 @@
     <string name="ConfirmPayment__confirm_payment">Потврди плаћање</string>
     <string name="ConfirmPayment__network_fee">Мрежна накнада</string>
     <string name="ConfirmPayment__estimated_s">Процењено %1$s</string>
+    <!-- Prefix to a name to indicate who a payment will be sent to -->
     <string name="ConfirmPayment__to">Прималац</string>
     <string name="ConfirmPayment__total_amount">Укупан износ</string>
     <string name="ConfirmPayment__balance_s">Стање: %1$s</string>
@@ -3658,6 +3718,14 @@
     <string name="conversation_group_options__conversation">Ћаскање</string>
     <string name="conversation_group_options__broadcast">Емитовање</string>
 
+    <!-- DoubleTapEditEducationSheet -->
+    <!-- Displayed as the title of the education bottom sheet -->
+    <string name="DoubleTapEditEducationSheet__double_tap_edit_title">Double tap to edit</string>
+    <!-- Text on the sheet explaining how double tapping on a message will let them edit it -->
+    <string name="DoubleTapEditEducationSheet__quickly_tap_twice">Quickly tap twice on your messages to edit them. You can edit your messages up to 24hrs after they’ve been sent.</string>
+    <!-- Button label to dismiss sheet -->
+    <string name="DoubleTapEditEducationSheet__got_it">Got it</string>
+
     <!-- text_secure_normal -->
     <string name="text_secure_normal__menu_new_group">Нова група</string>
     <string name="text_secure_normal__menu_settings">Подешавања</string>
@@ -4112,6 +4180,7 @@
     <string name="RecipientBottomSheet_copied_to_clipboard">Копирано</string>
 
     <string name="GroupRecipientListItem_admin">Администратор</string>
+    <!-- Button text to approve a user that has requested to join a group -->
     <string name="GroupRecipientListItem_approve_description">Одобравам</string>
     <string name="GroupRecipientListItem_deny_description">Одбијам</string>
 
@@ -4139,6 +4208,7 @@
 
     <!-- VoiceNoteMediaDescriptionCompatFactory -->
     <string name="VoiceNoteMediaItemFactory__voice_message">Гласовна порука · %1$s</string>
+    <!-- This is a title in a banner describing the conversation sender to receiver placeholders of the currently playing voice memo. -->
     <string name="VoiceNoteMediaItemFactory__s_to_s">%1$s за: %2$s</string>
 
     <!-- StorageUtil -->
@@ -4152,8 +4222,16 @@
     <string name="ReviewCardDialogFragment__review_members">Прегледајте чланове</string>
     <!-- Title of a screen where the user will be prompted to review a message request matching the name of someone they already know -->
     <string name="ReviewCardDialogFragment__review_request">Прегледајте захтев</string>
-    <string name="ReviewCardDialogFragment__d_group_members_have_the_same_name">Њих %1$d у групи имају слична имена. Прегледајте те чланове у наставку и предузмите мере.</string>
-    <string name="ReviewCardDialogFragment__if_youre_not_sure">Ако нисте сигурни од кога потиче захтев, прегледајте контакте у наставку и предузмите мере.</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="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 -->
+    <plurals name="ReviewCardDialogFragment__if_youre_not_sure">
+        <item quantity="one">If you\'re not sure who the request is from, review the contact below and take action.</item>
+        <item quantity="other">If you\'re not sure who the request is from, review the contacts below and take action.</item>
+    </plurals>
     <string name="ReviewCardDialogFragment__no_other_groups_in_common">Немате других заједничких група.</string>
     <string name="ReviewCardDialogFragment__no_groups_in_common">Немате заједничких група.</string>
     <plurals name="ReviewCardDialogFragment__d_other_groups_in_common">
@@ -4184,11 +4262,20 @@
     <string name="CallParticipantsListUpdatePopupWindow__s_joined">%1$s се придружио/ла</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_and_s_joined">%1$s и %2$s су се придружили</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_s_and_s_joined">%1$s, %2$s и %3$s су се придружили</string>
-    <string name="CallParticipantsListUpdatePopupWindow__s_s_and_d_others_joined">%1$s, %2$s и још њих %3$d су се придружили</string>
+    <!-- Toast message shown in group call when 3 or more people join -->
+    <plurals name="CallParticipantsListUpdatePopupWindow__s_s_and_d_others_joined">
+        <item quantity="one">%1$s, %2$s and %3$d other joined</item>
+        <item quantity="other">%1$s, %2$s and %3$d others joined</item>
+    </plurals>
+    <!-- Toast/popup text shown when someone leaves a group call -->
     <string name="CallParticipantsListUpdatePopupWindow__s_left">%1$s је напустио/ла групу</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_and_s_left">%1$s и %2$s су напустили групу</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_s_and_s_left">%1$s, %2$s и %3$s су напустили групу</string>
-    <string name="CallParticipantsListUpdatePopupWindow__s_s_and_d_others_left">%1$s, %2$s и још њих %3$d су напустили групу</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 and %3$d other left</item>
+        <item quantity="other">%1$s, %2$s and %3$d others left</item>
+    </plurals>
 
     <string name="CallParticipant__you">Ви</string>
     <string name="CallParticipant__you_on_another_device">Ви (на другом уређају)</string>
@@ -4558,10 +4645,15 @@
 
     <!-- PrivacySettingsFragment -->
     <string name="PrivacySettingsFragment__blocked">Корисник је блокиран</string>
-    <string name="PrivacySettingsFragment__d_contacts">Контаката: %1$d</string>
+    <!-- Settings label that shows the number blocked contacts -->
+    <plurals name="PrivacySettingsFragment__d_contacts">
+        <item quantity="one">%1$d contact</item>
+        <item quantity="other">%1$d contacts</item>
+    </plurals>
     <string name="PrivacySettingsFragment__messaging">Поруке</string>
     <string name="PrivacySettingsFragment__disappearing_messages">Нестајуће поруке</string>
     <string name="PrivacySettingsFragment__app_security">Безбедност апликације</string>
+    <!-- This refers to the multi-tasking overview (recent apps) from the Android operating system.-->
     <string name="PrivacySettingsFragment__block_screenshots_in_the_recents_list_and_inside_the_app">Блокирајте снимке екрана у листи недавних апликација и унутар апликације</string>
     <string name="PrivacySettingsFragment__signal_message_and_calls">Поруке и позиви преко Signal-а, увек преузмеравај позиве, запечаћени пошиљалац</string>
     <string name="PrivacySettingsFragment__default_timer_for_new_changes">Подразумевани тајмер за нова ћаскања</string>
@@ -4618,11 +4710,14 @@
     <string name="DataAndStorageSettingsFragment__media_quality">Квалитет медија</string>
     <string name="DataAndStorageSettingsFragment__sent_media_quality">Квалитет послатог медија</string>
     <string name="DataAndStorageSettingsFragment__sending_high_quality_media_will_use_more_data">Слање висококвалитетних медија ће користити више података.</string>
+    <!-- Setting option that can be selected to default media to be sent as high quality by default -->
     <string name="DataAndStorageSettingsFragment__high">Висок квалитет</string>
+    <!-- Setting option that can be selected to default media to be sent as standard quality by default -->
     <string name="DataAndStorageSettingsFragment__standard">Стандардни квалитет</string>
     <string name="DataAndStorageSettingsFragment__calls">Позиви</string>
 
     <!-- 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__use_custom_colors">Користите прилагођене боје</string>
     <string name="ChatColorSelectionFragment__chat_color">Боја ћаскања</string>
@@ -4834,6 +4929,7 @@
     <string name="AvatarPickerFragment__take_a_picture">Снимите фотографију</string>
     <string name="AvatarPickerFragment__choose_a_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>
     <string name="AvatarPickerFragment__clear_avatar">Уклони аватар</string>
@@ -4894,7 +4990,7 @@
     <string name="MediaReviewFragment__add_a_message">Напишите поруку</string>
     <string name="MediaReviewFragment__add_a_reply">Напишите одговор</string>
     <string name="MediaReviewFragment__send_to">Пошаљи кориснику</string>
-    <string name="MediaReviewFragment__view_once_message">Једнократна порука</string>
+    <string name="MediaReviewFragment__view_once_message">Једнократни медиј</string>
     <string name="MediaReviewFragment__one_or_more_items_were_too_large">Једна или више ставки су превелике</string>
     <string name="MediaReviewFragment__one_or_more_items_were_invalid">Једна или више ставки су неважеће</string>
     <string name="MediaReviewFragment__too_many_items_selected">Изабрано је превише ставки</string>
@@ -5487,7 +5583,7 @@
     <string name="StoryViewerFragment__s_s">%1$s %2$s</string>
     <!-- Displayed when viewing a post you sent -->
     <string name="StoryViewerPageFragment__you">Ви</string>
-    <!-- Displayed when viewing a post displayed to a group -->
+    <!-- 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 -->
     <string name="StoryViewerPageFragment__reply">Одговорите</string>
@@ -6704,5 +6800,26 @@
     <!-- Content description for opening the note editor -->
     <string name="ViewNoteSheet__edit_note">Измени белешку</string>
 
+    <!-- BackupProgressService -->
+    <!-- Notification title shown while backup restore job is running -->
+    <string name="BackupProgressService_title">Враћање резервне копије…</string>
+    <!-- Notification title shown while downloading backup restore data -->
+    <string name="BackupProgressService_title_downloading">Преузимање података резервне копије…</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>
+    <!-- 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 -->
+    <string name="BackupsTypeSettingsFragment__google_pay">Google Pay</string>
+    <!-- Displayed as the user\'s payment method as a label in a preference row -->
+    <string name="BackupsTypeSettingsFragment__bank_transfer">Bank transfer</string>
+    <!-- Displayed as the user\'s payment method as a label in a preference row -->
+    <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>
+
+
     <!-- 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 3af4e2531a..5ebb1fd708 100644
--- a/app/src/main/res/values-sv/strings.xml
+++ b/app/src/main/res/values-sv/strings.xml
@@ -1,6 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- smartling.instruction_comments_enabled = on -->
-<resources>
+<?xml version="1.0" encoding="UTF-8"?><!-- 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> -->
@@ -89,6 +87,16 @@
     <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">Allow access to your location</string>
+    <!-- Dialog description that will explain the steps needed to give location permission -->
+    <string name="AttachmentManager_signal_to_send_location">To send your location:</string>
+    <!-- Alert dialog description asking for location permission -->
+    <string name="AttachmentManager_signal_allow_signal_access_location">Allow Molly access to send your location.</string>
+    <!-- Toast text explaining Signal\'s need for location access -->
+    <string name="AttachmentManager_signal_needs_location_access">Molly needs location access to send your location.</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>
     <!-- Alert dialog description to send the recipient a request to activate payments -->
@@ -241,7 +249,7 @@
     <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>
@@ -386,8 +394,16 @@
     <string name="ConversationActivity_your_request_to_join_has_been_sent_to_the_group_admin">Din förfrågan om att gå med har skickats till gruppadministratören. Du får ett meddelande när administratören vidtar åtgärder.</string>
     <string name="ConversationActivity_cancel_request">Avbryt förfrågan</string>
 
-    <string name="ConversationActivity_to_send_audio_messages_allow_signal_access_to_your_microphone">För att skicka ljudmeddelanden, tillåt att Molly får åtkomst till din mikrofon.</string>
+    <!-- Dialog title asking users for microphone permission -->
+    <string name="ConversationActivity_allow_access_microphone">Allow access to your microphone</string>
+    <!-- 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>
+    <!-- Toast text explaining Signal\'s need for microphone access -->
+    <string name="ConversationActivity_signal_needs_microphone_access_voice_message">Molly needs microphone access to record a voice message.</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">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>
@@ -411,10 +427,17 @@
     <string name="ConversationActivity_you_will_leave_this_group_and_it_will_be_deleted_from_all_of_your_devices">Du lämnar denna grupp och den tas bort från alla dina enheter.</string>
     <string name="ConversationActivity_delete">Ta bort</string>
     <string name="ConversationActivity_delete_and_leave">Ta bort och lämna</string>
-    <string name="ConversationActivity__to_call_s_signal_needs_access_to_your_microphone">För att ringa %1$s behöver Molly åtkomst till din mikrofon</string>
+
+    <!-- Dialog description that will explain the steps needed to give microphone permissions for a voice call -->
+    <string name="ConversationActivity__to_start_call">To start a 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">To start a call, allow Molly access to your microphone.</string>
+    <!-- Toast text explaining Signal\'s need for microphone access for a voice call -->
+    <string name="ConversationActivity_signal_needs_microphone_access_voice_call">Molly needs microphone access to start a call.</string>
 
 
     <string name="ConversationActivity_join">Gå med</string>
+    <!-- Button text for an active group call but the call is currently full and unjoinable -->
     <string name="ConversationActivity_full">Fullt</string>
 
     <string name="ConversationActivity_error_sending_media">Fel vid sändning av media</string>
@@ -613,6 +636,7 @@
     <string name="ConversationListFragment_unarchive">Avarkivera</string>
     <string name="ConversationListFragment_delete">Ta bort</string>
     <string name="ConversationListFragment_select_all">Markera alla</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 vald</item>
         <item quantity="other">%1$d valda</item>
@@ -864,6 +888,7 @@
         <item quantity="one">Inbjudan skickad</item>
         <item quantity="other">%1$d inbjudningar skickade</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">\"%1$s\" kan inte läggas till automatiskt till denna grupp av dig.\n\nPersonen har blivit inbjuden att gå med och kommer inte att se några gruppmeddelanden förrän personen accepterar.</string>
     <string name="GroupManagement_invite_multiple_users">Dessa användare kan inte automatiskt läggas till i denna grupp.\n\nDe har blivit inbjudna att gå med i gruppen och kommer inte att se några gruppmeddelanden förrän de accepterar.</string>
 
@@ -1044,7 +1069,9 @@
 
     <string name="ManageGroupActivity_edit_name_and_picture">Ändra namn och bild</string>
     <string name="ManageGroupActivity_legacy_group">Äldre grupp</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">Detta är en Äldre grupp. Funktioner som gruppadministratörer är endast tillgängliga för Nya grupper.</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">Detta är en Äldre grupp. För att komma åt nya funktioner som @omnämnanden och administratörer,</string>
     <string name="ManageGroupActivity_legacy_group_too_large">Denna Äldre gruppen kan inte uppgraderas till en Ny grupp eftersom den är för stor. Den största gruppstorleken är %1$d.</string>
     <string name="ManageGroupActivity_upgrade_this_group">uppgradera denna grupp.</string>
@@ -1271,6 +1298,7 @@
         <item quantity="other">Ta bort</item>
     </plurals>
 
+    <!-- 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 vald (%2$s)</item>
         <item quantity="other">%1$d valda (%2$s)</item>
@@ -1335,17 +1363,13 @@
     <string name="MessageRecord_left_group">Du har lämnat gruppen.</string>
     <string name="MessageRecord_you_updated_group">Du uppdaterade gruppen.</string>
     <string name="MessageRecord_the_group_was_updated">Gruppen uppdaterades.</string>
-    <!-- Update message shown when placing an outgoing 1:1 voice/audio call and it\'s answered by the other party -->
+    <!-- Update message shown when placing an outgoing 1:1 voice/audio call -->
     <string name="MessageRecord_outgoing_voice_call">Utgående röstsamtal</string>
-    <!-- Update message shown when placing an outgoing 1:1 video call and it\'s answered by the other party -->
+    <!-- Update message shown when placing an outgoing 1:1 video call -->
     <string name="MessageRecord_outgoing_video_call">Utgående videosamtal</string>
-    <!-- Update message shown when placing an outgoing 1:1 voice/audio call and it\'s not answered by the other party -->
-    <string name="MessageRecord_unanswered_voice_call">Obesvarat röstsamtal</string>
-    <!-- Update message shown when placing an outgoing 1:1 video call and it\'s not answered by the other party -->
-    <string name="MessageRecord_unanswered_video_call">Obesvarat videosamtal</string>
-    <!-- Update message shown when receiving an incoming 1:1 voice/audio call and it\'s answered -->
+    <!-- Update message shown when receiving an incoming 1:1 voice/audio call and it\'s answered or ringing -->
     <string name="MessageRecord_incoming_voice_call">Inkommande röstsamtal</string>
-    <!-- Update message shown when receiving an incoming 1:1 video call and answered -->
+    <!-- Update message shown when receiving an incoming 1:1 video call and answered or ringing -->
     <string name="MessageRecord_incoming_video_call">Inkommande videosamtal</string>
     <!-- Update message shown when receiving an incoming 1:1 voice/audio call and not answered -->
     <string name="MessageRecord_missed_voice_call">Missat röstsamtal</string>
@@ -1355,10 +1379,6 @@
     <string name="MessageRecord_missed_voice_call_notification_profile">Missat röstsamtal medan aviseringsprofilen var aktiverad</string>
     <!-- Update message shown when receiving an incoming video call and declined due to notification profile -->
     <string name="MessageRecord_missed_video_call_notification_profile">Missat videosamtal medan aviseringsprofilen var aktiverad</string>
-    <!-- Update message shown when receiving an incoming 1:1 voice/audio call and explicitly declined -->
-    <string name="MessageRecord_you_declined_a_voice_call">Du avböjde ett röstsamtal</string>
-    <!-- Update message shown when receiving an incoming 1:1 video call and explicitly declined -->
-    <string name="MessageRecord_you_declined_a_video_call">Du avböjde ett videosamtal</string>
     <!-- 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 uppdaterade gruppen.</string>
@@ -1567,28 +1587,53 @@
     <string name="MessageRecord_can_accept_payments">%1$s kan nu ta emot betalningar</string>
 
     <!-- Group Calling update messages -->
-    <string name="MessageRecord_s_started_a_group_call_s">%1$s startade ett gruppsamtal · %2$s</string>
-    <string name="MessageRecord_you_started_a_group_call_s">Du startade ett gruppsamtal · %1$s</string>
-    <string name="MessageRecord_s_is_in_the_group_call_s">%1$s är i gruppsamtalet · %2$s</string>
-    <string name="MessageRecord_you_are_in_the_group_call_s1">Du är i gruppsamtalet · %1$s</string>
-    <string name="MessageRecord_s_and_s_are_in_the_group_call_s1">%1$s och %2$s är i gruppsamtalet · %3$s</string>
-    <string name="MessageRecord_group_call_s">Gruppsamtal · %1$s</string>
-
-    <string name="MessageRecord_s_started_a_group_call">%1$s startade ett gruppsamtal</string>
-    <string name="MessageRecord_you_started_a_group_call">Du startade ett gruppsamtal</string>
-    <string name="MessageRecord_s_is_in_the_group_call">%1$s är i gruppsamtalet</string>
-    <string name="MessageRecord_you_are_in_the_group_call">Du är i gruppsamtalet</string>
-    <string name="MessageRecord_s_and_s_are_in_the_group_call">%1$s och %2$s är i gruppsamtalet</string>
-    <string name="MessageRecord_group_call">Gruppsamtal</string>
+    <!-- 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 är i samtalet · %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">Du är i samtalet · %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 och %2$s är i samtalet · %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 är i samtalet</string>
+    <!-- Chat log text for an ongoing group call only the local user has joined -->
+    <string name="MessageRecord_you_are_in_the_call">Du är i samtalet</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 och %2$s är i samtalet</string>
+    <!-- Chat log text for a group call that ended within the last 5 minutes -->
+    <string name="MessageRecord__the_video_call_has_ended">Videosamtalet har avslutats</string>
+    <!-- Chat log text for a group call that ended within the last 5 minutes with a placeholder for formatted time -->
+    <string name="MessageRecord__the_video_call_has_ended_s">Videosamtalet har avslutats · %1$s</string>
+    <!-- Chat log text for a group call that ended more than 5 minutes ago and was missed -->
+    <string name="MessageRecord__missed_video_call">Missat videosamtal</string>
+    <!-- Chat log text for a group call that ended more than 5 minutes ago and was missed with a placeholder for formatted time -->
+    <string name="MessageRecord__missed_video_call_s">Missat videosamtal · %1$s</string>
+    <!-- Chat log text for a group call that ended that the local user did not start -->
+    <string name="MessageRecord__incoming_video_call">Inkommande videosamtal</string>
+    <!-- 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">Inkommande videosamtal · %1$s</string>
+    <!-- Chat log text for a group call that ended that the local user started -->
+    <string name="MessageRecord__outgoing_video_call">Utgående videosamtal</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">Utgående videosamtal · %1$s</string>
+    <!-- Chat log text for an ongoing group call that the local user started -->
+    <string name="MessageRecord__you_started_a_video_call">Du startade ett videosamtal</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">Du startade ett videosamtal · %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 startade ett videosamtal</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 startade ett videosamtal · %2$s</string>
 
     <string name="MessageRecord_you">Du</string>
 
-    <plurals name="MessageRecord_s_s_and_d_others_are_in_the_group_call_s">
+    <!-- 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 och %3$d andra är i gruppsamtalet · %4$s</item>
         <item quantity="other">%1$s, %2$s och %3$d andra är i gruppsamtalet · %4$s</item>
     </plurals>
 
-    <plurals name="MessageRecord_s_s_and_d_others_are_in_the_group_call">
+    <!-- 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 och %3$d andra är i gruppsamtalet</item>
         <item quantity="other">%1$s, %2$s och %3$d andra är i gruppsamtalet</item>
     </plurals>
@@ -2063,6 +2108,7 @@
     <!-- Generic error when the app is unable to request an SMS code for an unknown reason. -->
     <string name="RegistrationActivity_unable_to_request_verification_code">Det gick inte att begära en verifieringskod. Kontrollera din nätverksanslutning och försök igen.</string>
     <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">Molly Android - Telefonnummerformat</string>
     <!--    Small "toast" notification to the user confirming that they have requested a new code via voice call.-->
@@ -2207,7 +2253,7 @@
     <string name="SubmitDebugLogActivity_this_log_will_be_posted_publicly_online_for_contributors">Denna logg publiceras på nätet för bidragsgivarna att se. Du kan granska den innan du laddar upp den.</string>
 
     <!-- SupportEmailUtil -->
-  <!-- Removed by excludeNonTranslatables <string name="SupportEmailUtil_support_email" translatable="false">support@molly.im</string> -->
+  <!-- Removed by excludeNonTranslatables <string name="SupportEmailUtil_support_email" translatable="false">support@signal.org</string> -->
     <string name="SupportEmailUtil_filter">Filter:</string>
     <string name="SupportEmailUtil_device_info">Enhetsinformation:</string>
     <string name="SupportEmailUtil_android_version">Android version:</string>
@@ -2709,6 +2755,8 @@
     <string name="ConversationUpdateItem_loading">Läser in</string>
     <string name="ConversationUpdateItem_learn_more">Läs mer</string>
     <string name="ConversationUpdateItem_join_call">Gå med i samtalet</string>
+    <!-- Action button label for starting a new call in the current conversation -->
+    <string name="ConversationUpdateItem_call_back">Ring tillbaka</string>
     <string name="ConversationUpdateItem_return_to_call">Återgå till samtal</string>
     <string name="ConversationUpdateItem_call_is_full">Samtalet är fullt</string>
     <string name="ConversationUpdateItem_invite_friends">Bjud in vänner</string>
@@ -2773,6 +2821,7 @@
     <string name="safety_number_change_dialog__leave_call">Lämna samtalet</string>
     <string name="safety_number_change_dialog__the_following_people_may_have_reinstalled_or_changed_devices">Följande personer kan ha installerat om eller bytt enheter. Verifiera ditt säkerhetsnummer med dem för att säkerställa integriteten.</string>
     <string name="safety_number_change_dialog__view">Visa</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">Tidigare verifierade</string>
 
     <!-- EnableCallNotificationSettingsDialog__call_notifications_checklist -->
@@ -3086,6 +3135,7 @@
 
     <string name="arrays__default">Standard</string>
     <string name="arrays__high">Hög</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">Max</string>
 
     <!-- plurals.xml -->
@@ -3357,7 +3407,7 @@
     <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 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>
@@ -3406,6 +3456,14 @@
     <!-- Storage permission row description -->
     <string name="GrantPermissionsFragment__send_photos_videos_and_files">Skicka foton, videor och filer från din enhet.</string>
 
+    <!-- PermissionDeniedBottomSheet -->
+    <!-- Sheet describing step 1 on how to give permissions by opening settings -->
+    <string name="PermissionDeniedBottomSheet__1_tap_settings_below">1. Tap “Settings” below</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 Allow the permission</string>
+    <!-- Label for button at the bottom of the sheet which opens the system permission settings -->
+    <string name="PermissionDeniedBottomSheet__settings">Settings</string>
+
     <!-- PaymentsSecuritySetupFragment -->
     <!-- Toolbar title -->
     <string name="PaymentsSecuritySetupFragment__security_setup">Säkerhetsinställning</string>
@@ -3446,6 +3504,7 @@
     <string name="PaymentsDetailsFragment__sent_to_s">Skickad till %1$s</string>
     <string name="PaymentsDetailsFragment__you_on_s_at_s">Du på %1$s i %2$s</string>
     <string name="PaymentsDetailsFragment__s_on_s_at_s">%1$s på %2$s i %3$s</string>
+    <!-- Prefix to a name to indicate who a payment was sent to -->
     <string name="PaymentsDetailsFragment__to">Till</string>
     <string name="PaymentsDetailsFragment__from">Från</string>
     <string name="PaymentsDetailsFragment__information">Transaktionsdetaljer inklusive betalningsbelopp och transaktionstid är en del av MobileCoin Ledger.</string>
@@ -3508,6 +3567,7 @@
     <string name="ConfirmPayment__confirm_payment">Bekräfta betalning</string>
     <string name="ConfirmPayment__network_fee">Nätverksavgift</string>
     <string name="ConfirmPayment__estimated_s">Beräknad %1$s</string>
+    <!-- Prefix to a name to indicate who a payment will be sent to -->
     <string name="ConfirmPayment__to">Till</string>
     <string name="ConfirmPayment__total_amount">Totalt belopp</string>
     <string name="ConfirmPayment__balance_s">Saldo: %1$s</string>
@@ -3658,6 +3718,14 @@
     <string name="conversation_group_options__conversation">Chatt</string>
     <string name="conversation_group_options__broadcast">Sändning</string>
 
+    <!-- DoubleTapEditEducationSheet -->
+    <!-- Displayed as the title of the education bottom sheet -->
+    <string name="DoubleTapEditEducationSheet__double_tap_edit_title">Double tap to edit</string>
+    <!-- Text on the sheet explaining how double tapping on a message will let them edit it -->
+    <string name="DoubleTapEditEducationSheet__quickly_tap_twice">Quickly tap twice on your messages to edit them. You can edit your messages up to 24hrs after they’ve been sent.</string>
+    <!-- Button label to dismiss sheet -->
+    <string name="DoubleTapEditEducationSheet__got_it">Got it</string>
+
     <!-- text_secure_normal -->
     <string name="text_secure_normal__menu_new_group">Ny grupp</string>
     <string name="text_secure_normal__menu_settings">Inställningar</string>
@@ -4112,6 +4180,7 @@
     <string name="RecipientBottomSheet_copied_to_clipboard">Kopierade till urklipp</string>
 
     <string name="GroupRecipientListItem_admin">Administratör</string>
+    <!-- Button text to approve a user that has requested to join a group -->
     <string name="GroupRecipientListItem_approve_description">Godkänn</string>
     <string name="GroupRecipientListItem_deny_description">Avfärda</string>
 
@@ -4139,6 +4208,7 @@
 
     <!-- VoiceNoteMediaDescriptionCompatFactory -->
     <string name="VoiceNoteMediaItemFactory__voice_message">Röstmeddelande · %1$s</string>
+    <!-- This is a title in a banner describing the conversation sender to receiver placeholders of the currently playing voice memo. -->
     <string name="VoiceNoteMediaItemFactory__s_to_s">%1$s till %2$s</string>
 
     <!-- StorageUtil -->
@@ -4152,8 +4222,16 @@
     <string name="ReviewCardDialogFragment__review_members">Granska medlemmar</string>
     <!-- Title of a screen where the user will be prompted to review a message request matching the name of someone they already know -->
     <string name="ReviewCardDialogFragment__review_request">Granska förfrågan</string>
-    <string name="ReviewCardDialogFragment__d_group_members_have_the_same_name">%1$d gruppmedlemmar har samma namn, granska medlemmarna nedan och välj att vidta åtgärder.</string>
-    <string name="ReviewCardDialogFragment__if_youre_not_sure">Om du inte är säker på vem förfrågan kommer från, granska kontakterna nedan och vidta åtgärder.</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="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 -->
+    <plurals name="ReviewCardDialogFragment__if_youre_not_sure">
+        <item quantity="one">If you\'re not sure who the request is from, review the contact below and take action.</item>
+        <item quantity="other">If you\'re not sure who the request is from, review the contacts below and take action.</item>
+    </plurals>
     <string name="ReviewCardDialogFragment__no_other_groups_in_common">Inga andra grupper gemensamt.</string>
     <string name="ReviewCardDialogFragment__no_groups_in_common">Inga grupper gemensamt.</string>
     <plurals name="ReviewCardDialogFragment__d_other_groups_in_common">
@@ -4184,11 +4262,20 @@
     <string name="CallParticipantsListUpdatePopupWindow__s_joined">%1$s gick med</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_and_s_joined">%1$s och %2$s gick med</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_s_and_s_joined">%1$s, %2$s och %3$s gick med</string>
-    <string name="CallParticipantsListUpdatePopupWindow__s_s_and_d_others_joined">%1$s, %2$s och %3$d andra gick med</string>
+    <!-- Toast message shown in group call when 3 or more people join -->
+    <plurals name="CallParticipantsListUpdatePopupWindow__s_s_and_d_others_joined">
+        <item quantity="one">%1$s, %2$s and %3$d other joined</item>
+        <item quantity="other">%1$s, %2$s and %3$d others joined</item>
+    </plurals>
+    <!-- Toast/popup text shown when someone leaves a group call -->
     <string name="CallParticipantsListUpdatePopupWindow__s_left">%1$s lämnade</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_and_s_left">%1$s och %2$s lämnade</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_s_and_s_left">%1$s, %2$s och %3$s lämnade</string>
-    <string name="CallParticipantsListUpdatePopupWindow__s_s_and_d_others_left">%1$s, %2$s och %3$d andra lämnade</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 and %3$d other left</item>
+        <item quantity="other">%1$s, %2$s and %3$d others left</item>
+    </plurals>
 
     <string name="CallParticipant__you">Du</string>
     <string name="CallParticipant__you_on_another_device">Du (på en annan enhet)</string>
@@ -4558,10 +4645,15 @@
 
     <!-- PrivacySettingsFragment -->
     <string name="PrivacySettingsFragment__blocked">Blockerade</string>
-    <string name="PrivacySettingsFragment__d_contacts">%1$d kontakter</string>
+    <!-- Settings label that shows the number blocked contacts -->
+    <plurals name="PrivacySettingsFragment__d_contacts">
+        <item quantity="one">%1$d contact</item>
+        <item quantity="other">%1$d contacts</item>
+    </plurals>
     <string name="PrivacySettingsFragment__messaging">Meddelanden</string>
     <string name="PrivacySettingsFragment__disappearing_messages">Försvinnande meddelanden</string>
     <string name="PrivacySettingsFragment__app_security">Appsäkerhet</string>
+    <!-- This refers to the multi-tasking overview (recent apps) from the Android operating system.-->
     <string name="PrivacySettingsFragment__block_screenshots_in_the_recents_list_and_inside_the_app">Blockera skärmdumpar i senaste-listan och appen</string>
     <string name="PrivacySettingsFragment__signal_message_and_calls">Signal-meddelanden och -samtal, vidarebefordra samtal och dold avsändare</string>
     <string name="PrivacySettingsFragment__default_timer_for_new_changes">Standard tidsgräns för nya chattar</string>
@@ -4618,11 +4710,14 @@
     <string name="DataAndStorageSettingsFragment__media_quality">Mediekvalitet</string>
     <string name="DataAndStorageSettingsFragment__sent_media_quality">Skickade mediekvalitet</string>
     <string name="DataAndStorageSettingsFragment__sending_high_quality_media_will_use_more_data">Om du skickar högkvalitativa medier kommer du att använda mera data.</string>
+    <!-- Setting option that can be selected to default media to be sent as high quality by default -->
     <string name="DataAndStorageSettingsFragment__high">Hög</string>
+    <!-- Setting option that can be selected to default media to be sent as standard quality by default -->
     <string name="DataAndStorageSettingsFragment__standard">Standard</string>
     <string name="DataAndStorageSettingsFragment__calls">Samtal</string>
 
     <!-- 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__use_custom_colors">Använd anpassade färger</string>
     <string name="ChatColorSelectionFragment__chat_color">Chattfärg</string>
@@ -4834,6 +4929,7 @@
     <string name="AvatarPickerFragment__take_a_picture">Ta en bild</string>
     <string name="AvatarPickerFragment__choose_a_photo">Välj ett foto</string>
     <string name="AvatarPickerFragment__photo">Foto</string>
+    <!-- Button label during avatar selection/creation that when tapped lets you generate an avatar from typed in text. -->
     <string name="AvatarPickerFragment__text">Text</string>
     <string name="AvatarPickerFragment__save">Spara</string>
     <string name="AvatarPickerFragment__clear_avatar">Ta bort avatar</string>
@@ -4894,7 +4990,7 @@
     <string name="MediaReviewFragment__add_a_message">Lägg till ett meddelande</string>
     <string name="MediaReviewFragment__add_a_reply">Lägg till ett svar</string>
     <string name="MediaReviewFragment__send_to">Skicka till</string>
-    <string name="MediaReviewFragment__view_once_message">Visa engångsmeddelande</string>
+    <string name="MediaReviewFragment__view_once_message">Tillfällig mediefil</string>
     <string name="MediaReviewFragment__one_or_more_items_were_too_large">Ett eller flera objekt var för stora</string>
     <string name="MediaReviewFragment__one_or_more_items_were_invalid">Ett eller flera objekt var ogiltiga</string>
     <string name="MediaReviewFragment__too_many_items_selected">För många objekt valda</string>
@@ -5487,7 +5583,7 @@
     <string name="StoryViewerFragment__s_s">%1$s %2$s</string>
     <!-- Displayed when viewing a post you sent -->
     <string name="StoryViewerPageFragment__you">Du</string>
-    <!-- Displayed when viewing a post displayed to a group -->
+    <!-- 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 till %2$s</string>
     <!-- Displayed when viewing a post from another user with no replies -->
     <string name="StoryViewerPageFragment__reply">Svara</string>
@@ -6704,5 +6800,26 @@
     <!-- Content description for opening the note editor -->
     <string name="ViewNoteSheet__edit_note">Redigera anteckning</string>
 
+    <!-- BackupProgressService -->
+    <!-- Notification title shown while backup restore job is running -->
+    <string name="BackupProgressService_title">Återställer säkerhetskopia …</string>
+    <!-- Notification title shown while downloading backup restore data -->
+    <string name="BackupProgressService_title_downloading">Laddar ner säkerhetskopieringsdata …</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>
+    <!-- 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 -->
+    <string name="BackupsTypeSettingsFragment__google_pay">Google Pay</string>
+    <!-- Displayed as the user\'s payment method as a label in a preference row -->
+    <string name="BackupsTypeSettingsFragment__bank_transfer">Bank transfer</string>
+    <!-- Displayed as the user\'s payment method as a label in a preference row -->
+    <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>
+
+
     <!-- 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 b7e853b04f..3f773791ab 100644
--- a/app/src/main/res/values-sw/strings.xml
+++ b/app/src/main/res/values-sw/strings.xml
@@ -1,6 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- smartling.instruction_comments_enabled = on -->
-<resources>
+<?xml version="1.0" encoding="UTF-8"?><!-- 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> -->
@@ -89,6 +87,16 @@
     <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">Allow access to your location</string>
+    <!-- Dialog description that will explain the steps needed to give location permission -->
+    <string name="AttachmentManager_signal_to_send_location">To send your location:</string>
+    <!-- Alert dialog description asking for location permission -->
+    <string name="AttachmentManager_signal_allow_signal_access_location">Allow Molly access to send your location.</string>
+    <!-- Toast text explaining Signal\'s need for location access -->
+    <string name="AttachmentManager_signal_needs_location_access">Molly needs location access to send your location.</string>
+
     <!-- Alert dialog title to show the recipient has not activated payments -->
     <string name="AttachmentManager__not_activated_payments">%1$s hajaamilisha Malipo </string>
     <!-- Alert dialog description to send the recipient a request to activate payments -->
@@ -241,7 +249,7 @@
     <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>
@@ -386,8 +394,16 @@
     <string name="ConversationActivity_your_request_to_join_has_been_sent_to_the_group_admin">Ombi lako la kujiunga limetumwa kwa msimamizi wa kikundi. Utaarifiwa atakapochukua hatua.</string>
     <string name="ConversationActivity_cancel_request">Ghairi Ombi</string>
 
-    <string name="ConversationActivity_to_send_audio_messages_allow_signal_access_to_your_microphone">Kutuma jumbe za sauti, ruhusu ufikiaji wa Molly kwenye kipaza sauti chako.</string>
+    <!-- Dialog title asking users for microphone permission -->
+    <string name="ConversationActivity_allow_access_microphone">Allow access to your microphone</string>
+    <!-- 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>
+    <!-- Toast text explaining Signal\'s need for microphone access -->
+    <string name="ConversationActivity_signal_needs_microphone_access_voice_message">Molly needs microphone access to record a voice message.</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">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>
@@ -411,10 +427,17 @@
     <string name="ConversationActivity_you_will_leave_this_group_and_it_will_be_deleted_from_all_of_your_devices">Utaondoka kundi hili, na litafutwa kutoka kwa vifaa vyako vyote.</string>
     <string name="ConversationActivity_delete">Futa</string>
     <string name="ConversationActivity_delete_and_leave">Futa na uondoke</string>
-    <string name="ConversationActivity__to_call_s_signal_needs_access_to_your_microphone">Ili kumpigia %1$s simu, Molly inahitaji kufikia maikrofoni yako</string>
+
+    <!-- Dialog description that will explain the steps needed to give microphone permissions for a voice call -->
+    <string name="ConversationActivity__to_start_call">To start a 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">To start a call, allow Molly access to your microphone.</string>
+    <!-- Toast text explaining Signal\'s need for microphone access for a voice call -->
+    <string name="ConversationActivity_signal_needs_microphone_access_voice_call">Molly needs microphone access to start a call.</string>
 
 
     <string name="ConversationActivity_join">Jiunge</string>
+    <!-- Button text for an active group call but the call is currently full and unjoinable -->
     <string name="ConversationActivity_full">Imejaa</string>
 
     <string name="ConversationActivity_error_sending_media">Hitilafu imetokea wakati wa kutuma media</string>
@@ -613,6 +636,7 @@
     <string name="ConversationListFragment_unarchive">Toa hifadhini</string>
     <string name="ConversationListFragment_delete">Futa</string>
     <string name="ConversationListFragment_select_all">Chagua zote</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 iliyochaguliwa</item>
         <item quantity="other">%1$diliyochaguliwa</item>
@@ -864,6 +888,7 @@
         <item quantity="one">Mialiko imetumwa</item>
         <item quantity="other">Mialiko %1$d imetumwa</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">\"%1$s\" hawezi kuongezwa na wewe kiotomatiki kwenye kikundi hiki.\n\nAmealikwa kujiunga, na hataona ujumbe wowote wa kikundi mpaka atakapokubali.</string>
     <string name="GroupManagement_invite_multiple_users">Watumiaji hawa hawawezi kuongezwa na wewe kiotomatiki kwenye kikundi hiki.\n\nWamealikwa kujiunga na kikundi, na hawataona ujumbe wowote wa kikundi mpaka watakapokubali.</string>
 
@@ -1044,7 +1069,9 @@
 
     <string name="ManageGroupActivity_edit_name_and_picture">Badilisha jina na picha</string>
     <string name="ManageGroupActivity_legacy_group">Kikundi Kizee</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">Hiki ni Kikundi Kizee. Vipengele kama vile wasimamizi wa vikundi vinapatikana tu kwa Vikundi Vipya.</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">Hiki ni Kikundi Kizee. Ili upate huduma mpya kama @kutajwa na kuteua wasimamizi,</string>
     <string name="ManageGroupActivity_legacy_group_too_large">Kikundi hiki cha Urithi hakiwezi kupandishwa hadhi kuwa Kikundi kipya kwa sababu ni kubwa mno. Ukubwa wa juu wa kikundi ni %1$d.</string>
     <string name="ManageGroupActivity_upgrade_this_group">boresha kikundi hiki.</string>
@@ -1271,6 +1298,7 @@
         <item quantity="other">Futa</item>
     </plurals>
 
+    <!-- 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 amemchagua (%2$s)</item>
         <item quantity="other">%1$dimechaguliwa (%2$s)</item>
@@ -1335,17 +1363,13 @@
     <string name="MessageRecord_left_group">Umeondoka kwenye kundi.</string>
     <string name="MessageRecord_you_updated_group">Umesasisha kikundi</string>
     <string name="MessageRecord_the_group_was_updated">Kikundi kimesasishwa.</string>
-    <!-- Update message shown when placing an outgoing 1:1 voice/audio call and it\'s answered by the other party -->
+    <!-- Update message shown when placing an outgoing 1:1 voice/audio call -->
     <string name="MessageRecord_outgoing_voice_call">Simu ya kawaida uliyopiga</string>
-    <!-- Update message shown when placing an outgoing 1:1 video call and it\'s answered by the other party -->
+    <!-- Update message shown when placing an outgoing 1:1 video call -->
     <string name="MessageRecord_outgoing_video_call">Simu ya video uliyopiga</string>
-    <!-- Update message shown when placing an outgoing 1:1 voice/audio call and it\'s not answered by the other party -->
-    <string name="MessageRecord_unanswered_voice_call">Simu ya kawaida isiyopokelewa</string>
-    <!-- Update message shown when placing an outgoing 1:1 video call and it\'s not answered by the other party -->
-    <string name="MessageRecord_unanswered_video_call">Simu ya video isiyopokelewa</string>
-    <!-- Update message shown when receiving an incoming 1:1 voice/audio call and it\'s answered -->
+    <!-- Update message shown when receiving an incoming 1:1 voice/audio call and it\'s answered or ringing -->
     <string name="MessageRecord_incoming_voice_call">Simu ya kawaida inayopigwa</string>
-    <!-- Update message shown when receiving an incoming 1:1 video call and answered -->
+    <!-- Update message shown when receiving an incoming 1:1 video call and answered or ringing -->
     <string name="MessageRecord_incoming_video_call">Simu ya video inayopigwa</string>
     <!-- Update message shown when receiving an incoming 1:1 voice/audio call and not answered -->
     <string name="MessageRecord_missed_voice_call">Simu ya kawaida fifi</string>
@@ -1355,10 +1379,6 @@
     <string name="MessageRecord_missed_voice_call_notification_profile">Simu ya sauti ambayo haijapokelewa wakati wasifu wa arifa ulipowashwa</string>
     <!-- Update message shown when receiving an incoming video call and declined due to notification profile -->
     <string name="MessageRecord_missed_video_call_notification_profile">Simu ya video ambayo haijapokelewa wakati wasifu wa arifa ulipokuwa umewashwa</string>
-    <!-- Update message shown when receiving an incoming 1:1 voice/audio call and explicitly declined -->
-    <string name="MessageRecord_you_declined_a_voice_call">Umekataa simu ya kawaida</string>
-    <!-- Update message shown when receiving an incoming 1:1 video call and explicitly declined -->
-    <string name="MessageRecord_you_declined_a_video_call">Umekataa simu ya video</string>
     <!-- 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%1$s amesasisha kikundi</string>
@@ -1567,28 +1587,53 @@
     <string name="MessageRecord_can_accept_payments">%1$s sasa anaweza kupokea Malipo</string>
 
     <!-- Group Calling update messages -->
-    <string name="MessageRecord_s_started_a_group_call_s">%1$s ameanzisha mazungumzo ya simu ya kikundi · %2$s</string>
-    <string name="MessageRecord_you_started_a_group_call_s">Umeanzisha simu ya kikundi · %1$s</string>
-    <string name="MessageRecord_s_is_in_the_group_call_s">%1$s yuko kwenye mazungumzo ya simu ya kikundi · %2$s</string>
-    <string name="MessageRecord_you_are_in_the_group_call_s1">Uko kwenye mazungumzo ya simu ya kikundi · %1$s</string>
-    <string name="MessageRecord_s_and_s_are_in_the_group_call_s1">%1$s na %2$s wako kwenye mazungumzo ya simu ya kikundi · %3$s</string>
-    <string name="MessageRecord_group_call_s">Mazungumzo ya simu ya kikundi · %1$s</string>
-
-    <string name="MessageRecord_s_started_a_group_call">%1$s ameanzisha mazungumzo ya simu ya kikundi</string>
-    <string name="MessageRecord_you_started_a_group_call">Umeanzisha mazungumzo ya simu ya kikundi</string>
-    <string name="MessageRecord_s_is_in_the_group_call">%1$s yuko kwenye mazungumzo ya simu ya kikundi</string>
-    <string name="MessageRecord_you_are_in_the_group_call">Uko kwenye mazungumzo ya simu ya kikundi</string>
-    <string name="MessageRecord_s_and_s_are_in_the_group_call">%1$s na %2$s wako kwenye mazungumzo ya simu ya kikundi</string>
-    <string name="MessageRecord_group_call">Mazungumzo ya simu ya kikundi</string>
+    <!-- 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 ako kwenye mazungumzo· %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">Uko kwenye mazungumzo · %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 na %2$s wako kwenye mazungumzo · %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 ako kwenye mazungumzo</string>
+    <!-- Chat log text for an ongoing group call only the local user has joined -->
+    <string name="MessageRecord_you_are_in_the_call">Uko kwenye mazungumzo</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 na %2$s wako kwenye mazungumzo</string>
+    <!-- Chat log text for a group call that ended within the last 5 minutes -->
+    <string name="MessageRecord__the_video_call_has_ended">Simu ya video imekwisha</string>
+    <!-- Chat log text for a group call that ended within the last 5 minutes with a placeholder for formatted time -->
+    <string name="MessageRecord__the_video_call_has_ended_s">Simu ya video imekwisha · %1$s</string>
+    <!-- Chat log text for a group call that ended more than 5 minutes ago and was missed -->
+    <string name="MessageRecord__missed_video_call">Simu ya video fifi</string>
+    <!-- Chat log text for a group call that ended more than 5 minutes ago and was missed with a placeholder for formatted time -->
+    <string name="MessageRecord__missed_video_call_s">Umekosa simu ya video · %1$s</string>
+    <!-- Chat log text for a group call that ended that the local user did not start -->
+    <string name="MessageRecord__incoming_video_call">Simu ya video inayopigwa</string>
+    <!-- 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">Simu ya video inayoingia · %1$s</string>
+    <!-- Chat log text for a group call that ended that the local user started -->
+    <string name="MessageRecord__outgoing_video_call">Simu ya video uliyopiga</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">Simu ya video inayotoka · %1$s</string>
+    <!-- Chat log text for an ongoing group call that the local user started -->
+    <string name="MessageRecord__you_started_a_video_call">Umepiga simu ya video</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">Umepiga simu ya video · %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 amepiga simu ya video</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 amepiga simu ya video · %2$s</string>
 
     <string name="MessageRecord_you">Wewe</string>
 
-    <plurals name="MessageRecord_s_s_and_d_others_are_in_the_group_call_s">
+    <!-- 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 na%3$d mwingine yuko kwenye mazungumzo ya simu ya kikundi · %4$s</item>
         <item quantity="other">%1$s, %2$s na %3$dwako kwenye mazungumzo ya simu ya kikundi · %4$s</item>
     </plurals>
 
-    <plurals name="MessageRecord_s_s_and_d_others_are_in_the_group_call">
+    <!-- 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,na %3$d mwingine yuko kwenye mazungumzo ya simu ya kikundi</item>
         <item quantity="other">%1$s, %2$s na %3$d wengine wako kwenye mazungumzo ya simu ya kikundi</item>
     </plurals>
@@ -2063,6 +2108,7 @@
     <!-- Generic error when the app is unable to request an SMS code for an unknown reason. -->
     <string name="RegistrationActivity_unable_to_request_verification_code">Inashindwa kuomba msimbo wa uthibitisho. Tafadhali angalia muunganisho wa mtandao wako kisha ujaribu tena.</string>
     <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">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.-->
@@ -2207,7 +2253,7 @@
     <string name="SubmitDebugLogActivity_this_log_will_be_posted_publicly_online_for_contributors">Kumbukumbu hii itachapishwa hadharani mtandaoni ili wachangiaji waitazame. Unaweza kuichunguza kabla ya kuipakia.</string>
 
     <!-- SupportEmailUtil -->
-  <!-- Removed by excludeNonTranslatables <string name="SupportEmailUtil_support_email" translatable="false">support@molly.im</string> -->
+  <!-- Removed by excludeNonTranslatables <string name="SupportEmailUtil_support_email" translatable="false">support@signal.org</string> -->
     <string name="SupportEmailUtil_filter">Kichujio:</string>
     <string name="SupportEmailUtil_device_info">Maelezo ya kifaa:</string>
     <string name="SupportEmailUtil_android_version">Toleo la Android:</string>
@@ -2709,6 +2755,8 @@
     <string name="ConversationUpdateItem_loading">Inapakia</string>
     <string name="ConversationUpdateItem_learn_more">Jifunze zaidi</string>
     <string name="ConversationUpdateItem_join_call">Jiunge na mazungumzo ya simu</string>
+    <!-- Action button label for starting a new call in the current conversation -->
+    <string name="ConversationUpdateItem_call_back">Rudisha Simu</string>
     <string name="ConversationUpdateItem_return_to_call">Rudi kwenye mazungumzo ya simu</string>
     <string name="ConversationUpdateItem_call_is_full">Mazungumzo ya simu yamejaa</string>
     <string name="ConversationUpdateItem_invite_friends">Alika marafiki</string>
@@ -2773,6 +2821,7 @@
     <string name="safety_number_change_dialog__leave_call">Ondoka kwenye mazungumzo ya simu</string>
     <string name="safety_number_change_dialog__the_following_people_may_have_reinstalled_or_changed_devices">Huenda watu wafuatao wamesakinisha upya programu zao au kubadilisha vifaa. Thibitisha nambari yako ya usalama unayotumia kwao ili kuhakikisha unalinda faragha yako.</string>
     <string name="safety_number_change_dialog__view">Tazama</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">Iliyothibitishwa awali</string>
 
     <!-- EnableCallNotificationSettingsDialog__call_notifications_checklist -->
@@ -3086,6 +3135,7 @@
 
     <string name="arrays__default">Chaguo msingi</string>
     <string name="arrays__high">Juu</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">Upeo</string>
 
     <!-- plurals.xml -->
@@ -3357,7 +3407,7 @@
     <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 Molly hayapatikani tena. Bado unaweza kuhamishia fedha kwenye ubadilishanaji lakini huwezi kutuma na kupokea malipo au kuongeza pesa.</string>
@@ -3406,6 +3456,14 @@
     <!-- Storage permission row description -->
     <string name="GrantPermissionsFragment__send_photos_videos_and_files">Tuma picha, video na faili kutoka kwenye kifaa chako.</string>
 
+    <!-- PermissionDeniedBottomSheet -->
+    <!-- Sheet describing step 1 on how to give permissions by opening settings -->
+    <string name="PermissionDeniedBottomSheet__1_tap_settings_below">1. Tap “Settings” below</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 Allow the permission</string>
+    <!-- Label for button at the bottom of the sheet which opens the system permission settings -->
+    <string name="PermissionDeniedBottomSheet__settings">Settings</string>
+
     <!-- PaymentsSecuritySetupFragment -->
     <!-- Toolbar title -->
     <string name="PaymentsSecuritySetupFragment__security_setup">Mfumo wa usalama</string>
@@ -3446,6 +3504,7 @@
     <string name="PaymentsDetailsFragment__sent_to_s">Yametumwa kwa %1$s</string>
     <string name="PaymentsDetailsFragment__you_on_s_at_s">Wewe tarehe %1$s saa %2$s</string>
     <string name="PaymentsDetailsFragment__s_on_s_at_s">%1$s tarehe %2$s saa %3$s</string>
+    <!-- Prefix to a name to indicate who a payment was sent to -->
     <string name="PaymentsDetailsFragment__to">Kwa</string>
     <string name="PaymentsDetailsFragment__from">Kutoka kwa</string>
     <string name="PaymentsDetailsFragment__information">Maelezo ya muamala, ikiwa ni pamoja na kiwango cha malipo na wakati wa muamala ni sehemu ya Leja ya MobileCoin.</string>
@@ -3508,6 +3567,7 @@
     <string name="ConfirmPayment__confirm_payment">Thibitisha malipo</string>
     <string name="ConfirmPayment__network_fee">Ada ya mtandao</string>
     <string name="ConfirmPayment__estimated_s">Kadirio la %1$s</string>
+    <!-- Prefix to a name to indicate who a payment will be sent to -->
     <string name="ConfirmPayment__to">Kwa</string>
     <string name="ConfirmPayment__total_amount">Kiasi jumla</string>
     <string name="ConfirmPayment__balance_s">Salio: %1$s</string>
@@ -3658,6 +3718,14 @@
     <string name="conversation_group_options__conversation">Gumzo</string>
     <string name="conversation_group_options__broadcast">Tangaza</string>
 
+    <!-- DoubleTapEditEducationSheet -->
+    <!-- Displayed as the title of the education bottom sheet -->
+    <string name="DoubleTapEditEducationSheet__double_tap_edit_title">Double tap to edit</string>
+    <!-- Text on the sheet explaining how double tapping on a message will let them edit it -->
+    <string name="DoubleTapEditEducationSheet__quickly_tap_twice">Quickly tap twice on your messages to edit them. You can edit your messages up to 24hrs after they’ve been sent.</string>
+    <!-- Button label to dismiss sheet -->
+    <string name="DoubleTapEditEducationSheet__got_it">Got it</string>
+
     <!-- text_secure_normal -->
     <string name="text_secure_normal__menu_new_group">Kundi jipya</string>
     <string name="text_secure_normal__menu_settings">Mipangilio</string>
@@ -4112,6 +4180,7 @@
     <string name="RecipientBottomSheet_copied_to_clipboard">Imenakiliwa kwenye bodi ya kunakili</string>
 
     <string name="GroupRecipientListItem_admin">Msimamizi</string>
+    <!-- Button text to approve a user that has requested to join a group -->
     <string name="GroupRecipientListItem_approve_description">Idhinisha</string>
     <string name="GroupRecipientListItem_deny_description">Kataa</string>
 
@@ -4139,6 +4208,7 @@
 
     <!-- VoiceNoteMediaDescriptionCompatFactory -->
     <string name="VoiceNoteMediaItemFactory__voice_message">Ujumbe wa sauti · %1$s</string>
+    <!-- This is a title in a banner describing the conversation sender to receiver placeholders of the currently playing voice memo. -->
     <string name="VoiceNoteMediaItemFactory__s_to_s">%1$shadi %2$s</string>
 
     <!-- StorageUtil -->
@@ -4152,8 +4222,16 @@
     <string name="ReviewCardDialogFragment__review_members">Kagua wanachama</string>
     <!-- Title of a screen where the user will be prompted to review a message request matching the name of someone they already know -->
     <string name="ReviewCardDialogFragment__review_request">Kagua ombi</string>
-    <string name="ReviewCardDialogFragment__d_group_members_have_the_same_name">Washiriki %1$d wa kikundi wana majina yanayofanana, wakague wanachama hapa chini na uchague kuchukua hatua.</string>
-    <string name="ReviewCardDialogFragment__if_youre_not_sure">Ikiwa hujui ombi hili limetoka kwa nani, kagua waasiliani walio hapa chini na uchukue hatua.</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="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 -->
+    <plurals name="ReviewCardDialogFragment__if_youre_not_sure">
+        <item quantity="one">If you\'re not sure who the request is from, review the contact below and take action.</item>
+        <item quantity="other">If you\'re not sure who the request is from, review the contacts below and take action.</item>
+    </plurals>
     <string name="ReviewCardDialogFragment__no_other_groups_in_common">Hakuna vikundi vingine mnavyoshiriki pamoja.</string>
     <string name="ReviewCardDialogFragment__no_groups_in_common">Hakuna vikundi mnavyoshiriki pamoja.</string>
     <plurals name="ReviewCardDialogFragment__d_other_groups_in_common">
@@ -4184,11 +4262,20 @@
     <string name="CallParticipantsListUpdatePopupWindow__s_joined">%1$s amejiunga</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_and_s_joined">%1$s na %2$s amejiunga</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_s_and_s_joined">%1$s, %2$s na %3$s wamejiunga</string>
-    <string name="CallParticipantsListUpdatePopupWindow__s_s_and_d_others_joined">%1$s, %2$s na wengine %3$d wamejiunga</string>
+    <!-- Toast message shown in group call when 3 or more people join -->
+    <plurals name="CallParticipantsListUpdatePopupWindow__s_s_and_d_others_joined">
+        <item quantity="one">%1$s, %2$s and %3$d other joined</item>
+        <item quantity="other">%1$s, %2$s and %3$d others joined</item>
+    </plurals>
+    <!-- Toast/popup text shown when someone leaves a group call -->
     <string name="CallParticipantsListUpdatePopupWindow__s_left">%1$s ameondoka</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_and_s_left">%1$s na %2$s wameondoka</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_s_and_s_left">%1$s, %2$s na %3$s wameondoka</string>
-    <string name="CallParticipantsListUpdatePopupWindow__s_s_and_d_others_left">%1$s, %2$s na wengine %3$d wameondoka</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 and %3$d other left</item>
+        <item quantity="other">%1$s, %2$s and %3$d others left</item>
+    </plurals>
 
     <string name="CallParticipant__you">Wewe</string>
     <string name="CallParticipant__you_on_another_device">Wewe (kwenye kifaa kingine)</string>
@@ -4558,10 +4645,15 @@
 
     <!-- PrivacySettingsFragment -->
     <string name="PrivacySettingsFragment__blocked">Zuiliwa</string>
-    <string name="PrivacySettingsFragment__d_contacts">Waasiliani %1$d</string>
+    <!-- Settings label that shows the number blocked contacts -->
+    <plurals name="PrivacySettingsFragment__d_contacts">
+        <item quantity="one">%1$d contact</item>
+        <item quantity="other">%1$d contacts</item>
+    </plurals>
     <string name="PrivacySettingsFragment__messaging">Kutuma ujumbe</string>
     <string name="PrivacySettingsFragment__disappearing_messages">Jumbe zinazotoweka</string>
     <string name="PrivacySettingsFragment__app_security">Usalama wa programu</string>
+    <!-- This refers to the multi-tasking overview (recent apps) from the Android operating system.-->
     <string name="PrivacySettingsFragment__block_screenshots_in_the_recents_list_and_inside_the_app">Zuia screenshots katika orodha ya rekodi na ndani ya programu</string>
     <string name="PrivacySettingsFragment__signal_message_and_calls">Ujumbe na simu za Signal, elekeza simu kila wakati, na kutumia huduma ya kuficha ujumbe</string>
     <string name="PrivacySettingsFragment__default_timer_for_new_changes">Kipima muda chaguo-msingi cha gumzo mpya</string>
@@ -4618,11 +4710,14 @@
     <string name="DataAndStorageSettingsFragment__media_quality">Ubora wa Media</string>
     <string name="DataAndStorageSettingsFragment__sent_media_quality">Ubora wa media iliyotumwa</string>
     <string name="DataAndStorageSettingsFragment__sending_high_quality_media_will_use_more_data">Kutuma media za ubora wa juu kutatumia data zaidi.</string>
+    <!-- Setting option that can be selected to default media to be sent as high quality by default -->
     <string name="DataAndStorageSettingsFragment__high">Juu</string>
+    <!-- Setting option that can be selected to default media to be sent as standard quality by default -->
     <string name="DataAndStorageSettingsFragment__standard">Kiwango</string>
     <string name="DataAndStorageSettingsFragment__calls">Simu</string>
 
     <!-- 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__use_custom_colors">Tumia rangi maalum</string>
     <string name="ChatColorSelectionFragment__chat_color">Rangi ya gumzo</string>
@@ -4834,6 +4929,7 @@
     <string name="AvatarPickerFragment__take_a_picture">Piga picha</string>
     <string name="AvatarPickerFragment__choose_a_photo">Chagua picha</string>
     <string name="AvatarPickerFragment__photo">Picha</string>
+    <!-- Button label during avatar selection/creation that when tapped lets you generate an avatar from typed in text. -->
     <string name="AvatarPickerFragment__text">Maandishi</string>
     <string name="AvatarPickerFragment__save">Hifadhi</string>
     <string name="AvatarPickerFragment__clear_avatar">Futa umbo</string>
@@ -4894,7 +4990,7 @@
     <string name="MediaReviewFragment__add_a_message">Ongeza ujumbe</string>
     <string name="MediaReviewFragment__add_a_reply">Ongeza jibu</string>
     <string name="MediaReviewFragment__send_to">Tuma kwa</string>
-    <string name="MediaReviewFragment__view_once_message">Ujumbe wa kuangaliwa mara moja</string>
+    <string name="MediaReviewFragment__view_once_message">Tazama mara moja</string>
     <string name="MediaReviewFragment__one_or_more_items_were_too_large">Kitu kimoja au zaidi vilikuwa vikubwa sana</string>
     <string name="MediaReviewFragment__one_or_more_items_were_invalid">Kitu kimoja au zaidi vilikuwa batili</string>
     <string name="MediaReviewFragment__too_many_items_selected">Vitu vingi zaidi vimechaguliwa</string>
@@ -5487,7 +5583,7 @@
     <string name="StoryViewerFragment__s_s">%1$s %2$s</string>
     <!-- Displayed when viewing a post you sent -->
     <string name="StoryViewerPageFragment__you">Wewe</string>
-    <!-- Displayed when viewing a post displayed to a group -->
+    <!-- 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$shadi %2$s</string>
     <!-- Displayed when viewing a post from another user with no replies -->
     <string name="StoryViewerPageFragment__reply">Jibu</string>
@@ -6704,5 +6800,26 @@
     <!-- Content description for opening the note editor -->
     <string name="ViewNoteSheet__edit_note">Hariri kidokezo</string>
 
+    <!-- BackupProgressService -->
+    <!-- Notification title shown while backup restore job is running -->
+    <string name="BackupProgressService_title">Inarejesha chelezo…</string>
+    <!-- Notification title shown while downloading backup restore data -->
+    <string name="BackupProgressService_title_downloading">Inapakua data chelezo…</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>
+    <!-- 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 -->
+    <string name="BackupsTypeSettingsFragment__google_pay">Google Pay</string>
+    <!-- Displayed as the user\'s payment method as a label in a preference row -->
+    <string name="BackupsTypeSettingsFragment__bank_transfer">Bank transfer</string>
+    <!-- Displayed as the user\'s payment method as a label in a preference row -->
+    <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>
+
+
     <!-- 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 22edb7e63a..d8abb48a15 100644
--- a/app/src/main/res/values-ta/strings.xml
+++ b/app/src/main/res/values-ta/strings.xml
@@ -1,6 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- smartling.instruction_comments_enabled = on -->
-<resources>
+<?xml version="1.0" encoding="UTF-8"?><!-- 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> -->
@@ -89,6 +87,16 @@
     <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">Allow access to your location</string>
+    <!-- Dialog description that will explain the steps needed to give location permission -->
+    <string name="AttachmentManager_signal_to_send_location">To send your location:</string>
+    <!-- Alert dialog description asking for location permission -->
+    <string name="AttachmentManager_signal_allow_signal_access_location">Allow Molly access to send your location.</string>
+    <!-- Toast text explaining Signal\'s need for location access -->
+    <string name="AttachmentManager_signal_needs_location_access">Molly needs location access to send your location.</string>
+
     <!-- Alert dialog title to show the recipient has not activated payments -->
     <string name="AttachmentManager__not_activated_payments">%1$s கட்டணங்களைச் செயல்படுத்தவில்லை </string>
     <!-- Alert dialog description to send the recipient a request to activate payments -->
@@ -386,8 +394,16 @@
     <string name="ConversationActivity_your_request_to_join_has_been_sent_to_the_group_admin">குழுவில் சேர உங்கள் கோரிக்கை குழு நிர்வாகிக்கு அனுப்பப்பட்டுள்ளது. அவர்கள் நடவடிக்கை எடுக்கும்போது உங்களுக்கு அறிவிக்கப்படும்.</string>
     <string name="ConversationActivity_cancel_request">கோரிக்கையை ரத்துசெய்</string>
 
-    <string name="ConversationActivity_to_send_audio_messages_allow_signal_access_to_your_microphone">ஆடியோ செய்திகளை அனுப்ப, உங்கள் மைக்ரோஃபோனுக்கு Molly அணுகலை அனுமதிக்கவும்.</string>
+    <!-- Dialog title asking users for microphone permission -->
+    <string name="ConversationActivity_allow_access_microphone">Allow access to your microphone</string>
+    <!-- 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>
+    <!-- Toast text explaining Signal\'s need for microphone access -->
+    <string name="ConversationActivity_signal_needs_microphone_access_voice_message">Molly needs microphone access to record a voice message.</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">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>
@@ -411,10 +427,17 @@
     <string name="ConversationActivity_you_will_leave_this_group_and_it_will_be_deleted_from_all_of_your_devices">நீங்கள் இந்த குழுவை விட்டு வெளியேறும், மற்றும் இது எல்லாவற்றிலிருந்தும் நீக்கப்படும் உங்கள் சாதனங்கள்.</string>
     <string name="ConversationActivity_delete">நீக்கு</string>
     <string name="ConversationActivity_delete_and_leave">நீக்கி வெளியேறுக</string>
-    <string name="ConversationActivity__to_call_s_signal_needs_access_to_your_microphone">%1$sஐ அழைக்க, சிக்னலுக்கு உங்கள் மைக்ரோஃபோனுக்கு அனுமதி தேவை microphone access and permission for Molly</string>
+
+    <!-- Dialog description that will explain the steps needed to give microphone permissions for a voice call -->
+    <string name="ConversationActivity__to_start_call">To start a 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">To start a call, allow Molly access to your microphone.</string>
+    <!-- Toast text explaining Signal\'s need for microphone access for a voice call -->
+    <string name="ConversationActivity_signal_needs_microphone_access_voice_call">Molly needs microphone access to start a call.</string>
 
 
     <string name="ConversationActivity_join">சேரவும்</string>
+    <!-- Button text for an active group call but the call is currently full and unjoinable -->
     <string name="ConversationActivity_full">நிரம்பியது</string>
 
     <string name="ConversationActivity_error_sending_media">மீடியா அனுப்புவதில் பிழை</string>
@@ -613,6 +636,7 @@
     <string name="ConversationListFragment_unarchive">வெளிப்படுத்து</string>
     <string name="ConversationListFragment_delete">நீக்கு</string>
     <string name="ConversationListFragment_select_all">எல்லாம்</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 தேர்ந்தெடுக்கப்பட்டது</item>
         <item quantity="other">%1$d தேர்ந்தெடுக்கப்பட்டது</item>
@@ -864,6 +888,7 @@
         <item quantity="one">அழைப்பிதழ் அனுப்பப்பட்டது</item>
         <item quantity="other">%1$d அழைப்பிதழ்கள் அனுப்பப்பட்டன</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">“%1$s” ஐ தானாக இந்த குழுவில் சேர்க்க முடியாது. குழுவில் சேர அவர்கள் அழைக்கப்பட்டுள்ளனர். எந்தவொரு குழு செய்திகளையும் அவர்கள் ஏற்றுக்கொள்ளும் வரை பார்க்க மாட்டார்கள்.</string>
     <string name="GroupManagement_invite_multiple_users">இந்த பயனர்களை இந்த குழுவில் தானாக உங்களால் சேர்க்க முடியாது. குழுவில் சேர அவர்கள் அழைக்கப்பட்டுள்ளனர், அவர்கள் ஏற்றுக்கொள்ளும் வரை எந்த குழு செய்திகளையும் பார்க்க மாட்டார்கள்.</string>
 
@@ -1044,7 +1069,9 @@
 
     <string name="ManageGroupActivity_edit_name_and_picture">பெயர் மற்றும் படத்தைத் திருத்தவும்</string>
     <string name="ManageGroupActivity_legacy_group">பழைய மரபு குழு</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">இது ஒரு மரபு குழு. குழு நிர்வாகிகள் போன்ற அம்சங்கள் புதிய குழுக்களுக்கு மட்டுமே கிடைக்கும்.</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">இது ஒரு மரபு குழு. @குறிப்புகள் மற்றும் நிர்வாகிகள் போன்ற புதிய அம்சங்களை அணுக,</string>
     <string name="ManageGroupActivity_legacy_group_too_large">இந்த மரபு குழுவை புதிய குழுவாக மேம்படுத்த முடியாது, ஏனெனில் அது அளவு மிகப் பெரியது. அதிகபட்ச குழு அளவு%1$d.</string>
     <string name="ManageGroupActivity_upgrade_this_group">இந்த குழுவை மேம்படுத்தவும்.</string>
@@ -1271,6 +1298,7 @@
         <item quantity="other">நீக்கு</item>
     </plurals>
 
+    <!-- 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 தேர்ந்தெடுக்கப்பட்டது (%2$s)</item>
         <item quantity="other">%1$d தேர்ந்தெடுக்கப்பட்டது (%2$s)</item>
@@ -1335,17 +1363,13 @@
     <string name="MessageRecord_left_group">நீங்கள் குழுவை விட்டு விலகினீர்கள்.</string>
     <string name="MessageRecord_you_updated_group">நீங்கள் குழுவைப் புதுப்பித்தீர்கள்.</string>
     <string name="MessageRecord_the_group_was_updated">குழு புதுப்பிக்கப்பட்டது.</string>
-    <!-- Update message shown when placing an outgoing 1:1 voice/audio call and it\'s answered by the other party -->
+    <!-- Update message shown when placing an outgoing 1:1 voice/audio call -->
     <string name="MessageRecord_outgoing_voice_call">வெளிச்செல்லும் குரல் அழைப்பு</string>
-    <!-- Update message shown when placing an outgoing 1:1 video call and it\'s answered by the other party -->
+    <!-- Update message shown when placing an outgoing 1:1 video call -->
     <string name="MessageRecord_outgoing_video_call">வெளிச்செல்லும் வீடியோ அழைப்பு</string>
-    <!-- Update message shown when placing an outgoing 1:1 voice/audio call and it\'s not answered by the other party -->
-    <string name="MessageRecord_unanswered_voice_call">பதிலளிக்கப்படாத குரல் அழைப்பு</string>
-    <!-- Update message shown when placing an outgoing 1:1 video call and it\'s not answered by the other party -->
-    <string name="MessageRecord_unanswered_video_call">பதிலளிக்கப்படாத வீடியோ அழைப்பு</string>
-    <!-- Update message shown when receiving an incoming 1:1 voice/audio call and it\'s answered -->
+    <!-- Update message shown when receiving an incoming 1:1 voice/audio call and it\'s answered or ringing -->
     <string name="MessageRecord_incoming_voice_call">உள்வரும் குரல் அழைப்பு</string>
-    <!-- Update message shown when receiving an incoming 1:1 video call and answered -->
+    <!-- Update message shown when receiving an incoming 1:1 video call and answered or ringing -->
     <string name="MessageRecord_incoming_video_call">உள்வரும் வீடியோ அழைப்பு</string>
     <!-- Update message shown when receiving an incoming 1:1 voice/audio call and not answered -->
     <string name="MessageRecord_missed_voice_call">தவறவிட்ட குரல் அழைப்பு</string>
@@ -1355,10 +1379,6 @@
     <string name="MessageRecord_missed_voice_call_notification_profile">அறிவிப்பு புரொஃபைல் இயக்கப்பட்டிருக்கும்போது தவறவிட்ட குரல் அழைப்பு</string>
     <!-- Update message shown when receiving an incoming video call and declined due to notification profile -->
     <string name="MessageRecord_missed_video_call_notification_profile">அறிவிப்பு புரொஃபைல் இயக்கப்பட்டிருக்கும் போது தவறவிட்ட வீடியோ அழைப்பு</string>
-    <!-- Update message shown when receiving an incoming 1:1 voice/audio call and explicitly declined -->
-    <string name="MessageRecord_you_declined_a_voice_call">குரல் அழைப்பை மறுத்துவிட்டீர்கள்</string>
-    <!-- Update message shown when receiving an incoming 1:1 video call and explicitly declined -->
-    <string name="MessageRecord_you_declined_a_video_call">வீடியோ அழைப்பை மறுத்துவிட்டீர்கள்</string>
     <!-- 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>
@@ -1567,28 +1587,53 @@
     <string name="MessageRecord_can_accept_payments">%1$s இப்போது கட்டணங்களை ஏற்க முடியும்</string>
 
     <!-- Group Calling update messages -->
-    <string name="MessageRecord_s_started_a_group_call_s">%1$sகுழு அழைப்பைத் தொடங்கினார்%2$s</string>
-    <string name="MessageRecord_you_started_a_group_call_s">குழு அழைப்பைத் தொடங்கியுள்ளீர்கள் · %1$s</string>
-    <string name="MessageRecord_s_is_in_the_group_call_s">%1$s குழு அழைப்பில் உள்ளார் %2$s</string>
-    <string name="MessageRecord_you_are_in_the_group_call_s1">நீங்கள் குழு அழைப்பில் இருக்கிறீர்கள். %1$s</string>
-    <string name="MessageRecord_s_and_s_are_in_the_group_call_s1">%1$s மற்றும் %2$s குழு அழைப்பில் உள்ளனர் %3$s</string>
-    <string name="MessageRecord_group_call_s">குழு அழைப்பு . %1$s</string>
-
-    <string name="MessageRecord_s_started_a_group_call">%1$s குழு அழைப்பைத் தொடங்கினார்</string>
-    <string name="MessageRecord_you_started_a_group_call">நீங்கள் ஒரு தொடங்கினீர்கள் குழு அழைப்பு</string>
-    <string name="MessageRecord_s_is_in_the_group_call">%1$s குழு அழைப்பில் இருக்கிறார்</string>
-    <string name="MessageRecord_you_are_in_the_group_call">நீங்கள் குழு அழைப்பில் இருக்கிறீர்கள்</string>
-    <string name="MessageRecord_s_and_s_are_in_the_group_call">%1$s மற்றும் %2$s குழு அழைப்பில் உள்ளனர்</string>
-    <string name="MessageRecord_group_call">குழு அழைப்பு</string>
+    <!-- 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 என்பவர் %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">நீங்கள் %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 மற்றும் %2$s ஆகியோ %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 அழைப்பில் உள்ளார்</string>
+    <!-- Chat log text for an ongoing group call only the local user has joined -->
+    <string name="MessageRecord_you_are_in_the_call">நீங்கள் அழைப்பில் உள்ளீர்கள்</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 மற்றும் %2$s ஆகியோர் அழைப்பில் உள்ளனர்</string>
+    <!-- Chat log text for a group call that ended within the last 5 minutes -->
+    <string name="MessageRecord__the_video_call_has_ended">வீடியோ அழைப்பு முடிந்தது</string>
+    <!-- Chat log text for a group call that ended within the last 5 minutes with a placeholder for formatted time -->
+    <string name="MessageRecord__the_video_call_has_ended_s">வீடியோ அழைப்பு %1$s முடிந்தது</string>
+    <!-- Chat log text for a group call that ended more than 5 minutes ago and was missed -->
+    <string name="MessageRecord__missed_video_call">தவறவிட்ட வீடியோ அழைப்பு</string>
+    <!-- Chat log text for a group call that ended more than 5 minutes ago and was missed with a placeholder for formatted time -->
+    <string name="MessageRecord__missed_video_call_s">தவறவிட்ட வீடியோ அழைப்பு . %1$s</string>
+    <!-- Chat log text for a group call that ended that the local user did not start -->
+    <string name="MessageRecord__incoming_video_call">உள்வரும் வீடியோ அழைப்பு</string>
+    <!-- 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">%1$s நேரத்தில் இன்கமிங் வீடியோ அழைப்பு</string>
+    <!-- Chat log text for a group call that ended that the local user started -->
+    <string name="MessageRecord__outgoing_video_call">வெளிச்செல்லும் வீடியோ அழைப்பு</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">%1$s நேரத்தில் அவுட்கோயிங் வீடியோ அழைப்பு</string>
+    <!-- Chat log text for an ongoing group call that the local user started -->
+    <string name="MessageRecord__you_started_a_video_call">நீங்கள் ஒரு வீடியோ அழைப்பைத் தொடங்கியுள்ளீர்கள்</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">நீங்கள் %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 என்பவர் ஒரு வீடியோ அழைப்பைத் தொடங்கினார்</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 என்பவர் %2$s நேரத்தில் ஒரு வீடியோ அழைப்பைத் தொடங்கினார்</string>
 
     <string name="MessageRecord_you">நீங்கள்</string>
 
-    <plurals name="MessageRecord_s_s_and_d_others_are_in_the_group_call_s">
+    <!-- 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,. மற்றும் கூடுதலாக%3$d குழு உறுப்பினர் அழைப்பில் உள்ளனர் %4$s</item>
         <item quantity="other">%1$s, %2$s மற்றும் கூடுதலாக%3$d குழு உறுப்பினர்கள் அழைப்பில் உள்ளனர் %4$s</item>
     </plurals>
 
-    <plurals name="MessageRecord_s_s_and_d_others_are_in_the_group_call">
+    <!-- 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, மற்றும் %3$dகூடுதலாக குழு உறுப்பினர்கள் அழைப்பில் உள்ளனர்</item>
         <item quantity="other">%1$s, %2$s, மற்றும் கூடுதலாக %3$d குழு உறுப்பினர்கள் அழைப்பில் உள்ளனர்</item>
     </plurals>
@@ -2063,6 +2108,7 @@
     <!-- Generic error when the app is unable to request an SMS code for an unknown reason. -->
     <string name="RegistrationActivity_unable_to_request_verification_code">சரிபார்ப்புக் குறியீட்டைக் கோர முடியவில்லை. உங்கள் நெட்வொர்க் இணைப்பைச் சரிபார்த்து, மீண்டும் முயலவும்.</string>
     <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">சிக்னல் ஆண்ட்ராய்டு - தொலைபேசி எண் வடிவம்</string>
     <!--    Small "toast" notification to the user confirming that they have requested a new code via voice call.-->
@@ -2207,7 +2253,7 @@
     <string name="SubmitDebugLogActivity_this_log_will_be_posted_publicly_online_for_contributors">இது பதிவு பொதுவில் வெளியிடப்படும் நிகழ்நிலைபங்களிப்பாளர்கள் பார்க்க. பதிவேற்றுவதற்கு முன் அதை நீங்கள் ஆராயலாம்.</string>
 
     <!-- SupportEmailUtil -->
-  <!-- Removed by excludeNonTranslatables <string name="SupportEmailUtil_support_email" translatable="false">support@molly.im</string> -->
+  <!-- Removed by excludeNonTranslatables <string name="SupportEmailUtil_support_email" translatable="false">support@signal.org</string> -->
     <string name="SupportEmailUtil_filter">வடிகட்டி:</string>
     <string name="SupportEmailUtil_device_info">Device info: சாதனத் தகவல்:</string>
     <string name="SupportEmailUtil_android_version">Android version: Android பதிப்பு:</string>
@@ -2709,6 +2755,8 @@
     <string name="ConversationUpdateItem_loading">ஏற்றுதல்</string>
     <string name="ConversationUpdateItem_learn_more">மேலும் அறிக</string>
     <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_call_is_full">அழைப்பு நிரம்பியுள்ளது</string>
     <string name="ConversationUpdateItem_invite_friends">நண்பர்களை அழை</string>
@@ -2773,6 +2821,7 @@
     <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>
 
     <!-- EnableCallNotificationSettingsDialog__call_notifications_checklist -->
@@ -3086,6 +3135,7 @@
 
     <string name="arrays__default">இயல்புநிலை</string>
     <string name="arrays__high">உயர்</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">மேக்ஸ்</string>
 
     <!-- plurals.xml -->
@@ -3357,7 +3407,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">கொடுப்பனவுகள் Molly இருக்கிறது இல்லைநீண்ட நேரம் கிடைக்கும். நீங்கள் இன்னும் முடியும்பரிமாற்றம் நிதி ஒரு பரிமாற்றம் ஆனால் உன்னால் முடியும் இல்லை நீண்டது அனுப்பு மற்றும் பணம் பெறுதல் அல்லது கூட்டு நிதி.</string>
@@ -3406,6 +3456,14 @@
     <!-- Storage permission row description -->
     <string name="GrantPermissionsFragment__send_photos_videos_and_files">உங்கள் டிவைஸில் இருந்து புகைப்படங்கள், வீடியோக்கள் மற்றும் கோப்புகளை அனுப்பலாம்.</string>
 
+    <!-- PermissionDeniedBottomSheet -->
+    <!-- Sheet describing step 1 on how to give permissions by opening settings -->
+    <string name="PermissionDeniedBottomSheet__1_tap_settings_below">1. Tap “Settings” below</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 Allow the permission</string>
+    <!-- Label for button at the bottom of the sheet which opens the system permission settings -->
+    <string name="PermissionDeniedBottomSheet__settings">Settings</string>
+
     <!-- PaymentsSecuritySetupFragment -->
     <!-- Toolbar title -->
     <string name="PaymentsSecuritySetupFragment__security_setup">பாதுகாப்பு அமைப்பு</string>
@@ -3446,6 +3504,7 @@
     <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__information">கட்டணத் தொகை மற்றும் பரிவர்த்தனை நேரம் உள்ளிட்ட பரிவர்த்தனை விவரங்கள் MobileCoin லெட்ஜரின் பகுதியாகும்.</string>
@@ -3508,6 +3567,7 @@
     <string name="ConfirmPayment__confirm_payment">கட்டணத்தை உறுதிப்படுத்தவும்</string>
     <string name="ConfirmPayment__network_fee">பிணைய கட்டணம்</string>
     <string name="ConfirmPayment__estimated_s">மதிப்பிடப்பட்டுள்ளது %1$s</string>
+    <!-- Prefix to a name to indicate who a payment will be sent to -->
     <string name="ConfirmPayment__to">செய்ய</string>
     <string name="ConfirmPayment__total_amount">மொத்தத் தொகை</string>
     <string name="ConfirmPayment__balance_s">இருப்பு: %1$s</string>
@@ -3658,6 +3718,14 @@
     <string name="conversation_group_options__conversation">சாட்</string>
     <string name="conversation_group_options__broadcast">ஒளிபரப்பு</string>
 
+    <!-- DoubleTapEditEducationSheet -->
+    <!-- Displayed as the title of the education bottom sheet -->
+    <string name="DoubleTapEditEducationSheet__double_tap_edit_title">Double tap to edit</string>
+    <!-- Text on the sheet explaining how double tapping on a message will let them edit it -->
+    <string name="DoubleTapEditEducationSheet__quickly_tap_twice">Quickly tap twice on your messages to edit them. You can edit your messages up to 24hrs after they’ve been sent.</string>
+    <!-- Button label to dismiss sheet -->
+    <string name="DoubleTapEditEducationSheet__got_it">Got it</string>
+
     <!-- text_secure_normal -->
     <string name="text_secure_normal__menu_new_group">புதிய குழு</string>
     <string name="text_secure_normal__menu_settings">அமைப்புகள்</string>
@@ -4112,6 +4180,7 @@
     <string name="RecipientBottomSheet_copied_to_clipboard">கிளிப்போர்டுக்கு நகலெடுக்கப்பட்டது</string>
 
     <string name="GroupRecipientListItem_admin">நிர்வாகி</string>
+    <!-- Button text to approve a user that has requested to join a group -->
     <string name="GroupRecipientListItem_approve_description">ஒப்புதல்</string>
     <string name="GroupRecipientListItem_deny_description">மறுக்க</string>
 
@@ -4139,6 +4208,7 @@
 
     <!-- VoiceNoteMediaDescriptionCompatFactory -->
     <string name="VoiceNoteMediaItemFactory__voice_message">குரல் செய்தி:%1$s</string>
+    <!-- This is a title in a banner describing the conversation sender to receiver placeholders of the currently playing voice memo. -->
     <string name="VoiceNoteMediaItemFactory__s_to_s">%1$s to %2$s</string>
 
     <!-- StorageUtil -->
@@ -4152,8 +4222,16 @@
     <string name="ReviewCardDialogFragment__review_members">மதிப்பாய்வு கோரிக்கை</string>
     <!-- Title of a screen where the user will be prompted to review a message request matching the name of someone they already know -->
     <string name="ReviewCardDialogFragment__review_request">மதிப்பாய்வு கோரிக்கை</string>
-    <string name="ReviewCardDialogFragment__d_group_members_have_the_same_name">%1$dகுழு உறுப்பினர்களுக்கு ஒரே பெயர் உள்ளது, கீழே உள்ள உறுப்பினர்களை மதிப்பாய்வு செய்து நடவடிக்கை எடுக்க முடிவு செய்யுங்கள்</string>
-    <string name="ReviewCardDialogFragment__if_youre_not_sure">உங்களுக்கு யார் கோரிக்கையை அனுப்பினார்கள் என்பது உங்களுக்குத் தெரியாவிட்டால், கீழே உள்ள தொடர்புகளை மதிப்பாய்வு செய்து நடவடிக்கை எடுக்கவும்.</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="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 -->
+    <plurals name="ReviewCardDialogFragment__if_youre_not_sure">
+        <item quantity="one">If you\'re not sure who the request is from, review the contact below and take action.</item>
+        <item quantity="other">If you\'re not sure who the request is from, review the contacts below and take action.</item>
+    </plurals>
     <string name="ReviewCardDialogFragment__no_other_groups_in_common">பொதுவான குழுக்கள் இல்லை</string>
     <string name="ReviewCardDialogFragment__no_groups_in_common">பொதுவான குழுக்கள் இல்லை</string>
     <plurals name="ReviewCardDialogFragment__d_other_groups_in_common">
@@ -4184,11 +4262,20 @@
     <string name="CallParticipantsListUpdatePopupWindow__s_joined">%1$s சேர்ந்தார்</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_and_s_joined">%1$s மற்றும் %2$sசேர்ந்தார்</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_s_and_s_joined">%1$s, %2$s மற்றும் %3$s சேர்ந்தார்</string>
-    <string name="CallParticipantsListUpdatePopupWindow__s_s_and_d_others_joined">%1$s, %2$s and %3$dஅதிக உறுப்பினர்கள் இணைந்தனர்</string>
+    <!-- Toast message shown in group call when 3 or more people join -->
+    <plurals name="CallParticipantsListUpdatePopupWindow__s_s_and_d_others_joined">
+        <item quantity="one">%1$s, %2$s and %3$d other joined</item>
+        <item quantity="other">%1$s, %2$s and %3$d others joined</item>
+    </plurals>
+    <!-- Toast/popup text shown when someone leaves a group call -->
     <string name="CallParticipantsListUpdatePopupWindow__s_left">%1$s வெளியேறினர்</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_and_s_left">%1$s மற்றும் %2$s வெளியேறினர்</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_s_and_s_left">%1$s, %2$s மற்றும் %3$sவெளியேறினர்</string>
-    <string name="CallParticipantsListUpdatePopupWindow__s_s_and_d_others_left">%1$s, %2$s and மேலும்%3$d வெளியேறினர்</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 and %3$d other left</item>
+        <item quantity="other">%1$s, %2$s and %3$d others left</item>
+    </plurals>
 
     <string name="CallParticipant__you">நீங்கள்</string>
     <string name="CallParticipant__you_on_another_device">நீங்கள் (மற்றொரு சாதனத்தில்)</string>
@@ -4558,10 +4645,15 @@
 
     <!-- PrivacySettingsFragment -->
     <string name="PrivacySettingsFragment__blocked">தடைசெய்யப்பட்டார்</string>
-    <string name="PrivacySettingsFragment__d_contacts">%1$d contacts</string>
+    <!-- Settings label that shows the number blocked contacts -->
+    <plurals name="PrivacySettingsFragment__d_contacts">
+        <item quantity="one">%1$d contact</item>
+        <item quantity="other">%1$d contacts</item>
+    </plurals>
     <string name="PrivacySettingsFragment__messaging">செய்தி அனுப்புதல்</string>
     <string name="PrivacySettingsFragment__disappearing_messages">காணாமல் போகும் செய்திகள்</string>
     <string name="PrivacySettingsFragment__app_security">பயன்பாட்டு பாதுகாப்பு</string>
+    <!-- This refers to the multi-tasking overview (recent apps) from the Android operating system.-->
     <string name="PrivacySettingsFragment__block_screenshots_in_the_recents_list_and_inside_the_app">சமீபத்தியவை பட்டியல் மற்றும் செயலிக்கு உள்ளே ஸ்கிரீன்ஷாட் எடுப்பதைத் தடுக்கவும்</string>
     <string name="PrivacySettingsFragment__signal_message_and_calls">Signal செய்திகள் மற்றும் அழைப்புகள், எப்போதும் ரிலே அழைப்புகள் மற்றும் சீல் அனுப்பியவர்</string>
     <string name="PrivacySettingsFragment__default_timer_for_new_changes">புதிய சாட்களுக்கு இயல்புநிலை டைமர்</string>
@@ -4618,11 +4710,14 @@
     <string name="DataAndStorageSettingsFragment__media_quality">மீடியா தரம்</string>
     <string name="DataAndStorageSettingsFragment__sent_media_quality">அனுப்பிய மீடியா தரம்</string>
     <string name="DataAndStorageSettingsFragment__sending_high_quality_media_will_use_more_data">உயர்தரத்தை அனுப்புகிறது ஊடகம் அதிக தரவைப் பயன்படுத்தும்.</string>
+    <!-- Setting option that can be selected to default media to be sent as high quality by default -->
     <string name="DataAndStorageSettingsFragment__high">உயர்</string>
+    <!-- Setting option that can be selected to default media to be sent as standard quality by default -->
     <string name="DataAndStorageSettingsFragment__standard">தரநிலை</string>
     <string name="DataAndStorageSettingsFragment__calls">அழைப்புகள்</string>
 
     <!-- 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__use_custom_colors">தனிப்பயன் நிறங்களை பயன்படுத்தவும்</string>
     <string name="ChatColorSelectionFragment__chat_color">சாட் கலர்</string>
@@ -4834,6 +4929,7 @@
     <string name="AvatarPickerFragment__take_a_picture">படம் எடுக்கவும்</string>
     <string name="AvatarPickerFragment__choose_a_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>
     <string name="AvatarPickerFragment__clear_avatar">அவதார் அழி</string>
@@ -4894,7 +4990,7 @@
     <string name="MediaReviewFragment__add_a_message">கூட்டு ஒரு செய்தி</string>
     <string name="MediaReviewFragment__add_a_reply">ஒரு பதிலைச் சேர்க்கவும்</string>
     <string name="MediaReviewFragment__send_to">இவருக்கு அனுப்பு</string>
-    <string name="MediaReviewFragment__view_once_message">ஒருமுறை பார்க்கும் செய்தி</string>
+    <string name="MediaReviewFragment__view_once_message">ஒரு முறை பார்க்கக்கூடிய மீடியா</string>
     <string name="MediaReviewFragment__one_or_more_items_were_too_large">ஒன்று அல்லது அதற்கு மேற்பட்ட பொருட்கள் மிகப் பெரியதாக இருந்தன</string>
     <string name="MediaReviewFragment__one_or_more_items_were_invalid">ஒன்று அல்லது அதற்கு மேற்பட்ட பொருட்கள் செல்லாதவை</string>
     <string name="MediaReviewFragment__too_many_items_selected">பல பொருட்கள் தேர்ந்தெடுக்கப்பட்டுள்ளன</string>
@@ -5487,7 +5583,7 @@
     <string name="StoryViewerFragment__s_s">%1$s %2$s</string>
     <!-- Displayed when viewing a post you sent -->
     <string name="StoryViewerPageFragment__you">நீங்கள்</string>
-    <!-- Displayed when viewing a post displayed to a group -->
+    <!-- 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 to %2$s</string>
     <!-- Displayed when viewing a post from another user with no replies -->
     <string name="StoryViewerPageFragment__reply">பதில்</string>
@@ -6704,5 +6800,26 @@
     <!-- Content description for opening the note editor -->
     <string name="ViewNoteSheet__edit_note">குறிப்பைத் திருத்து</string>
 
+    <!-- BackupProgressService -->
+    <!-- Notification title shown while backup restore job is running -->
+    <string name="BackupProgressService_title">காப்புப்பிரதியை மீட்டெடுக்கிறது…</string>
+    <!-- Notification title shown while downloading backup restore data -->
+    <string name="BackupProgressService_title_downloading">காப்புப்பிரதி தரவைப் பதிவிறக்குகிறது…</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>
+    <!-- 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 -->
+    <string name="BackupsTypeSettingsFragment__google_pay">Google Pay</string>
+    <!-- Displayed as the user\'s payment method as a label in a preference row -->
+    <string name="BackupsTypeSettingsFragment__bank_transfer">Bank transfer</string>
+    <!-- Displayed as the user\'s payment method as a label in a preference row -->
+    <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>
+
+
     <!-- 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 ef56dbaf42..ddb76c6d87 100644
--- a/app/src/main/res/values-te/strings.xml
+++ b/app/src/main/res/values-te/strings.xml
@@ -1,6 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- smartling.instruction_comments_enabled = on -->
-<resources>
+<?xml version="1.0" encoding="UTF-8"?><!-- 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> -->
@@ -89,6 +87,16 @@
     <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">Allow access to your location</string>
+    <!-- Dialog description that will explain the steps needed to give location permission -->
+    <string name="AttachmentManager_signal_to_send_location">To send your location:</string>
+    <!-- Alert dialog description asking for location permission -->
+    <string name="AttachmentManager_signal_allow_signal_access_location">Allow Molly access to send your location.</string>
+    <!-- Toast text explaining Signal\'s need for location access -->
+    <string name="AttachmentManager_signal_needs_location_access">Molly needs location access to send your location.</string>
+
     <!-- Alert dialog title to show the recipient has not activated payments -->
     <string name="AttachmentManager__not_activated_payments">%1$s చెల్లింపులను యాక్టివేట్ చేయలేదు </string>
     <!-- Alert dialog description to send the recipient a request to activate payments -->
@@ -241,7 +249,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>
@@ -386,8 +394,16 @@
     <string name="ConversationActivity_your_request_to_join_has_been_sent_to_the_group_admin">గ్రూప్‌లో చేరడానికి మీ అభ్యర్థన నిర్వాహకుడికి పంపబడింది. వారు చర్య తీసుకున్నప్పుడు మీకు తెలియజేయబడుతుంది.</string>
     <string name="ConversationActivity_cancel_request">అభ్యర్ధన రద్దు చేయి</string>
 
-    <string name="ConversationActivity_to_send_audio_messages_allow_signal_access_to_your_microphone">ఆడియో సందేశాలను పంపడానికి, మీ మైక్రోఫోన్‌కు Molly ప్రాప్తిని అనుమతించండి.</string>
+    <!-- Dialog title asking users for microphone permission -->
+    <string name="ConversationActivity_allow_access_microphone">Allow access to your microphone</string>
+    <!-- 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>
+    <!-- Toast text explaining Signal\'s need for microphone access -->
+    <string name="ConversationActivity_signal_needs_microphone_access_voice_message">Molly needs microphone access to record a voice message.</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">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>
@@ -411,10 +427,17 @@
     <string name="ConversationActivity_you_will_leave_this_group_and_it_will_be_deleted_from_all_of_your_devices">మీరు ఈ గ్రూప్‌ను వదిలి వెళతారు మరియు ఇది మీ పరికరాలు అన్నింటి నుండి తొలగించబడుతుంది.</string>
     <string name="ConversationActivity_delete">తొలగించండి</string>
     <string name="ConversationActivity_delete_and_leave">తొలగించండి మరియు వదిలివేయండి</string>
-    <string name="ConversationActivity__to_call_s_signal_needs_access_to_your_microphone">%1$s కి కాల్ చేయడానికి, Molly కు మీ మైక్రోఫోన్‌ ప్రాప్యత అవసరం</string>
+
+    <!-- Dialog description that will explain the steps needed to give microphone permissions for a voice call -->
+    <string name="ConversationActivity__to_start_call">To start a 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">To start a call, allow Molly access to your microphone.</string>
+    <!-- Toast text explaining Signal\'s need for microphone access for a voice call -->
+    <string name="ConversationActivity_signal_needs_microphone_access_voice_call">Molly needs microphone access to start a call.</string>
 
 
     <string name="ConversationActivity_join">చేరండి</string>
+    <!-- Button text for an active group call but the call is currently full and unjoinable -->
     <string name="ConversationActivity_full">సంపూర్ణమైన</string>
 
     <string name="ConversationActivity_error_sending_media">మీడియాను పంపడంలో లోపం చోటుచేసుకుంది</string>
@@ -613,6 +636,7 @@
     <string name="ConversationListFragment_unarchive">అన్ఆర్కైవ్</string>
     <string name="ConversationListFragment_delete">తొలగించండి</string>
     <string name="ConversationListFragment_select_all">అన్నిటిని ఎంచుకోండి</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ఎంచుకోబడింది</item>
         <item quantity="other">%1$d ఎంచుకోబడింది</item>
@@ -864,6 +888,7 @@
         <item quantity="one">ఆహ్వానం పంపబడింది</item>
         <item quantity="other">%1$d ఆహ్వానాలు పంపబడ్డాయి</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">“%1$s” ను మీరు స్వయంచాలకంగా ఈ గుంపుకు చేర్చలేరు. \n\n చేరడానికి వారిని ఆహ్వానించారు మరియు వారు అంగీకరించే వరకు ఏ సమూహ సందేశాలను చూడలేరు.</string>
     <string name="GroupManagement_invite_multiple_users">ఈ వినియోగదారులను మీరు స్వయంచాలకంగా ఈ గుంపుకు చేర్చలేరు. \n\\ n గుంపులో చేరమని వారిని ఆహ్వానించారు మరియు వారు అంగీకరించే వరకు ఏ సమూహ సందేశాలను చూడలేరు.</string>
 
@@ -1044,7 +1069,9 @@
 
     <string name="ManageGroupActivity_edit_name_and_picture">పేరు మరియు చిత్రం సవరించండి</string>
     <string name="ManageGroupActivity_legacy_group">లెగసీ సమూహం</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">ఇది లెగసీ సమూహం . సమూహ నిర్వాహకులు వంటి లక్షణాలు క్రొత్త సమూహాలకు మాత్రమే అందుబాటులో ఉంటాయి.</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">ఇది లెగసీ గ్రూప్. @ ప్రస్తావనలు మరియు నిర్వాహకులు వంటి క్రొత్త లక్షణాలను ప్రాప్యత చేయడానికి,</string>
     <string name="ManageGroupActivity_legacy_group_too_large">ఈ లెగసీ గ్రూప్ క్రొత్త సమూహానికి అప్‌గ్రేడ్ చేయబడదు ఎందుకంటే ఇది చాలా పెద్దది. గరిష్ట సమూహ పరిమాణం %1$d.</string>
     <string name="ManageGroupActivity_upgrade_this_group">ఈ సమూహాన్ని అప్‌గ్రేడ్ చేయండి</string>
@@ -1271,6 +1298,7 @@
         <item quantity="other">తొలగించండి</item>
     </plurals>
 
+    <!-- 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 ఎంచుకున్నారు (%2$s)</item>
         <item quantity="other">%1$d ఎంచుకున్నారు (%2$s)</item>
@@ -1335,17 +1363,13 @@
     <string name="MessageRecord_left_group">మీరు సమూహం నుండి వైదొలిగారు</string>
     <string name="MessageRecord_you_updated_group">మీరు ఈ సమూహాన్ని నవీకరించారు.</string>
     <string name="MessageRecord_the_group_was_updated">సమూహం నవీకరించబడింది.</string>
-    <!-- Update message shown when placing an outgoing 1:1 voice/audio call and it\'s answered by the other party -->
+    <!-- Update message shown when placing an outgoing 1:1 voice/audio call -->
     <string name="MessageRecord_outgoing_voice_call">అవుట్‌గోయింగ్ వాయిస్ కాల్</string>
-    <!-- Update message shown when placing an outgoing 1:1 video call and it\'s answered by the other party -->
+    <!-- Update message shown when placing an outgoing 1:1 video call -->
     <string name="MessageRecord_outgoing_video_call">అవుట్‌గోయింగ్ వీడియో కాల్</string>
-    <!-- Update message shown when placing an outgoing 1:1 voice/audio call and it\'s not answered by the other party -->
-    <string name="MessageRecord_unanswered_voice_call">సమాధానం ఇవ్వని వాయిస్ కాల్</string>
-    <!-- Update message shown when placing an outgoing 1:1 video call and it\'s not answered by the other party -->
-    <string name="MessageRecord_unanswered_video_call">సమాధానం ఇవ్వని వీడియో కాల్</string>
-    <!-- Update message shown when receiving an incoming 1:1 voice/audio call and it\'s answered -->
+    <!-- Update message shown when receiving an incoming 1:1 voice/audio call and it\'s answered or ringing -->
     <string name="MessageRecord_incoming_voice_call">ఇన్‌కమింగ్ వాయిస్ కాల్</string>
-    <!-- Update message shown when receiving an incoming 1:1 video call and answered -->
+    <!-- Update message shown when receiving an incoming 1:1 video call and answered or ringing -->
     <string name="MessageRecord_incoming_video_call">ఇన్‌కమింగ్ వీడియో కాల్</string>
     <!-- Update message shown when receiving an incoming 1:1 voice/audio call and not answered -->
     <string name="MessageRecord_missed_voice_call">మిస్డ్ వాయిస్ కాల్</string>
@@ -1355,10 +1379,6 @@
     <string name="MessageRecord_missed_voice_call_notification_profile">నోటిఫికేషన్ ప్రొఫైల్ ఆన్‌లో ఉన్నప్పుడు మిస్ అయిన స్వర కాల్</string>
     <!-- Update message shown when receiving an incoming video call and declined due to notification profile -->
     <string name="MessageRecord_missed_video_call_notification_profile">నోటిఫికేషన్ ప్రొఫైల్ ఆన్‌లో ఉన్నప్పుడు మిస్ అయిన వీడియో కాల్</string>
-    <!-- Update message shown when receiving an incoming 1:1 voice/audio call and explicitly declined -->
-    <string name="MessageRecord_you_declined_a_voice_call">మీరు ఒక వాయిస్ కాల్‌ను నిరాకరించారు</string>
-    <!-- Update message shown when receiving an incoming 1:1 video call and explicitly declined -->
-    <string name="MessageRecord_you_declined_a_video_call">మీరు ఒక వీడియో కాల్‌ను నిరాకరించారు</string>
     <!-- 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>
@@ -1567,28 +1587,53 @@
     <string name="MessageRecord_can_accept_payments">%1$s ఇప్పుడు చెల్లింపులను అంగీకరించవచ్చు.</string>
 
     <!-- Group Calling update messages -->
-    <string name="MessageRecord_s_started_a_group_call_s">%1$s సమూహ కాల్ ప్రారంభించారు. %2$s</string>
-    <string name="MessageRecord_you_started_a_group_call_s">మీరు గ్రూప్ కాల్ ప్రారంభించారు · %1$s</string>
-    <string name="MessageRecord_s_is_in_the_group_call_s">%1$s సమూహ కాల్‌లో ఉన్నారు · %2$s</string>
-    <string name="MessageRecord_you_are_in_the_group_call_s1">మీరు గ్రూప్ కాల్‌లో ఉన్నారు. %1$s</string>
-    <string name="MessageRecord_s_and_s_are_in_the_group_call_s1">%1$s మరియు %2$s గ్రూప్ కాల్‌లో ఉన్నారు · %3$s</string>
-    <string name="MessageRecord_group_call_s">సమూహ కాల్ · %1$s</string>
-
-    <string name="MessageRecord_s_started_a_group_call">%1$s సమూహ కాల్ ప్రారంభించారు</string>
-    <string name="MessageRecord_you_started_a_group_call">మీరు సమూహ కాల్ ప్రారంభించారు</string>
-    <string name="MessageRecord_s_is_in_the_group_call">%1$s సమూహ కాల్‌లో ఉన్నారు</string>
-    <string name="MessageRecord_you_are_in_the_group_call">మీరు గ్రూప్ కాల్‌లో ఉన్నారు</string>
-    <string name="MessageRecord_s_and_s_are_in_the_group_call">%1$s మరియు %2$s గ్రూప్ కాల్‌లో ఉన్నారు</string>
-    <string name="MessageRecord_group_call">సమూహ కాల్</string>
+    <!-- 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 కాల్‌లో ఉన్నారు · %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">మీరు కాల్‌లో ఉన్నారు · %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 మరియు %2$s కాల్‌లో ఉన్నారు · %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 కాల్‌లో ఉన్నారు</string>
+    <!-- Chat log text for an ongoing group call only the local user has joined -->
+    <string name="MessageRecord_you_are_in_the_call">మీరు కాల్‌లో ఉన్నారు</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 మరియు %2$s కాల్‌లో ఉన్నారు</string>
+    <!-- Chat log text for a group call that ended within the last 5 minutes -->
+    <string name="MessageRecord__the_video_call_has_ended">వీడియో కాల్ ముగిసింది</string>
+    <!-- Chat log text for a group call that ended within the last 5 minutes with a placeholder for formatted time -->
+    <string name="MessageRecord__the_video_call_has_ended_s">వీడియో కాల్ ముగిసింది · %1$s</string>
+    <!-- Chat log text for a group call that ended more than 5 minutes ago and was missed -->
+    <string name="MessageRecord__missed_video_call">మిస్డ్ వీడియో కాల్</string>
+    <!-- Chat log text for a group call that ended more than 5 minutes ago and was missed with a placeholder for formatted time -->
+    <string name="MessageRecord__missed_video_call_s">తప్పిన వీడియో కాల్ . %1$s</string>
+    <!-- Chat log text for a group call that ended that the local user did not start -->
+    <string name="MessageRecord__incoming_video_call">ఇన్‌కమింగ్ వీడియో కాల్</string>
+    <!-- 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">ఇన్‌కమింగ్ వీడియో కాల్ · %1$s</string>
+    <!-- Chat log text for a group call that ended that the local user started -->
+    <string name="MessageRecord__outgoing_video_call">అవుట్‌గోయింగ్ వీడియో కాల్</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">అవుట్‌గోయింగ్ వీడియో కాల్ · %1$s</string>
+    <!-- Chat log text for an ongoing group call that the local user started -->
+    <string name="MessageRecord__you_started_a_video_call">మీరు వీడియో కాల్ ప్రారంభించారు</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">మీరు వీడియో కాల్ ప్రారంభించారు · %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 వీడియో కాల్ ప్రారంభించారు</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 వీడియో కాల్ ప్రారంభించారు · %2$s</string>
 
     <string name="MessageRecord_you">మీరు</string>
 
-    <plurals name="MessageRecord_s_s_and_d_others_are_in_the_group_call_s">
+    <!-- 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 మరియు %3$d ఇతర ఈ కాల్‌లో ఉన్నారు · %4$s</item>
         <item quantity="other">%1$s, %2$s, మరియు %3$d ఇతరులు ఈ సమూహ కాల్‌లో ఉన్నారు · %4$s</item>
     </plurals>
 
-    <plurals name="MessageRecord_s_s_and_d_others_are_in_the_group_call">
+    <!-- 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 మరియు %3$d ఇతర ఈ సమూహ కాల్‌లో ఉన్నారు</item>
         <item quantity="other">%1$s, %2$s, మరియు %3$d ఇతరులు ఈ సమూహ కాల్‌లో ఉన్నారు</item>
     </plurals>
@@ -2063,6 +2108,7 @@
     <!-- Generic error when the app is unable to request an SMS code for an unknown reason. -->
     <string name="RegistrationActivity_unable_to_request_verification_code">ధృవీకరణ కోడ్‌ను అభ్యర్ధించలేకపోయింది. దయచేసి నెట్‌వర్క్ కనెక్షన్ తనిఖీ చేసి, మళ్ళీ ప్రయత్నించండి.</string>
     <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">Molly Android - ఫోన్ నెంబర్ ఫార్మెట్</string>
     <!--    Small "toast" notification to the user confirming that they have requested a new code via voice call.-->
@@ -2207,7 +2253,7 @@
     <string name="SubmitDebugLogActivity_this_log_will_be_posted_publicly_online_for_contributors">కంట్రిబ్యూటర్‌లు వీక్షించడానికి ఈ లాగ్ పబ్లిక్‌గా ఆన్‌లైన్‌లో పోస్ట్ చేయబడుతుంది. అప్‌లోడ్ చేయడానికి ముందు మీరు దానిని పరీక్షించవచ్చు.</string>
 
     <!-- SupportEmailUtil -->
-  <!-- Removed by excludeNonTranslatables <string name="SupportEmailUtil_support_email" translatable="false">support@molly.im</string> -->
+  <!-- Removed by excludeNonTranslatables <string name="SupportEmailUtil_support_email" translatable="false">support@signal.org</string> -->
     <string name="SupportEmailUtil_filter">ఫిల్టర్:</string>
     <string name="SupportEmailUtil_device_info">పరికర సమాచారం:</string>
     <string name="SupportEmailUtil_android_version">ఆండ్రాయిడ్ వెర్షన్:</string>
@@ -2709,6 +2755,8 @@
     <string name="ConversationUpdateItem_loading">లోడ్</string>
     <string name="ConversationUpdateItem_learn_more">ఇంకా నేర్చుకో</string>
     <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_call_is_full">కాల్ నిండింది</string>
     <string name="ConversationUpdateItem_invite_friends">స్నేహితులను ఆహ్వానించండి</string>
@@ -2773,6 +2821,7 @@
     <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>
 
     <!-- EnableCallNotificationSettingsDialog__call_notifications_checklist -->
@@ -3086,6 +3135,7 @@
 
     <string name="arrays__default">అప్రమేయం</string>
     <string name="arrays__high">అధికం</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">గరిష్టం</string>
 
     <!-- plurals.xml -->
@@ -3357,7 +3407,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 వాలెట్ కోసం అన్ని చెల్లింపులు వినియోగ నిబంధనలకు లోబడి ఉంటాయి. మీరు కొన్ని సమస్యలను ఎదుర్కోవచ్చు మరియు మీరు కోల్పోయే చెల్లింపులు లేదా బ్యాలెన్స్‌లను తిరిగి పొందలేరు. </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">Molly లో చెల్లింపులు ఇకపై అందుబాటులో లేవు. మీరు ఇప్పటికీ నిధులను ఎక్స్ఛేంజికి బదిలీ చేయవచ్చు, కానీ మీరు ఇకపై చెల్లింపులను పంపలేరు మరియు స్వీకరించలేరు లేదా నిధులను జోడించలేరు.</string>
@@ -3406,6 +3456,14 @@
     <!-- Storage permission row description -->
     <string name="GrantPermissionsFragment__send_photos_videos_and_files">మీ పరికరం నుండి ఫోటోలు, వీడియోలు మరియు ఫైళ్ళను పంపండి.</string>
 
+    <!-- PermissionDeniedBottomSheet -->
+    <!-- Sheet describing step 1 on how to give permissions by opening settings -->
+    <string name="PermissionDeniedBottomSheet__1_tap_settings_below">1. Tap “Settings” below</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 Allow the permission</string>
+    <!-- Label for button at the bottom of the sheet which opens the system permission settings -->
+    <string name="PermissionDeniedBottomSheet__settings">Settings</string>
+
     <!-- PaymentsSecuritySetupFragment -->
     <!-- Toolbar title -->
     <string name="PaymentsSecuritySetupFragment__security_setup">భద్రతా సెటప్</string>
@@ -3446,6 +3504,7 @@
     <string name="PaymentsDetailsFragment__sent_to_s">%1$sకు పంపబడింది</string>
     <string name="PaymentsDetailsFragment__you_on_s_at_s">మీరు %2$s వద్ద %1$sపై ఉన్నారు</string>
     <string name="PaymentsDetailsFragment__s_on_s_at_s">%1$s %3$s వద్ద %2$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__information">చెల్లింపు మొత్తం మరియు లావాదేవీ సమయంతో సహా లావాదేవీ వివరాలు MobileCoin లెడ్జర్‌లో భాగం.</string>
@@ -3508,6 +3567,7 @@
     <string name="ConfirmPayment__confirm_payment">పేమెంట్‌ని ధృవీకరించండి</string>
     <string name="ConfirmPayment__network_fee">నెట్‌వర్క్ ఫీజు</string>
     <string name="ConfirmPayment__estimated_s">అంచనా వేయబడింది %1$s</string>
+    <!-- Prefix to a name to indicate who a payment will be sent to -->
     <string name="ConfirmPayment__to">ఎవరికి</string>
     <string name="ConfirmPayment__total_amount">మొత్తం అమౌంట్</string>
     <string name="ConfirmPayment__balance_s">బ్యాలెన్స్: %1$s</string>
@@ -3658,6 +3718,14 @@
     <string name="conversation_group_options__conversation">చాట్</string>
     <string name="conversation_group_options__broadcast">ప్రసారం</string>
 
+    <!-- DoubleTapEditEducationSheet -->
+    <!-- Displayed as the title of the education bottom sheet -->
+    <string name="DoubleTapEditEducationSheet__double_tap_edit_title">Double tap to edit</string>
+    <!-- Text on the sheet explaining how double tapping on a message will let them edit it -->
+    <string name="DoubleTapEditEducationSheet__quickly_tap_twice">Quickly tap twice on your messages to edit them. You can edit your messages up to 24hrs after they’ve been sent.</string>
+    <!-- Button label to dismiss sheet -->
+    <string name="DoubleTapEditEducationSheet__got_it">Got it</string>
+
     <!-- text_secure_normal -->
     <string name="text_secure_normal__menu_new_group">కొత్త సమూహం</string>
     <string name="text_secure_normal__menu_settings">అమరికలు</string>
@@ -4112,6 +4180,7 @@
     <string name="RecipientBottomSheet_copied_to_clipboard">క్లిప్బోర్డ్కు కాపీ చేయబడింది</string>
 
     <string name="GroupRecipientListItem_admin">అడ్మిన్</string>
+    <!-- Button text to approve a user that has requested to join a group -->
     <string name="GroupRecipientListItem_approve_description">ఆమోదించడానికి</string>
     <string name="GroupRecipientListItem_deny_description">తిరస్కరించండి</string>
 
@@ -4139,6 +4208,7 @@
 
     <!-- VoiceNoteMediaDescriptionCompatFactory -->
     <string name="VoiceNoteMediaItemFactory__voice_message">వాయిస్ సందేశం · %1$s</string>
+    <!-- This is a title in a banner describing the conversation sender to receiver placeholders of the currently playing voice memo. -->
     <string name="VoiceNoteMediaItemFactory__s_to_s">%1$sకు%2$s</string>
 
     <!-- StorageUtil -->
@@ -4152,8 +4222,16 @@
     <string name="ReviewCardDialogFragment__review_members">సభ్యులను సమీక్షించండి</string>
     <!-- Title of a screen where the user will be prompted to review a message request matching the name of someone they already know -->
     <string name="ReviewCardDialogFragment__review_request">అభ్యర్థనను సమీక్షించండి</string>
-    <string name="ReviewCardDialogFragment__d_group_members_have_the_same_name">%1$d మంది సమూహ సభ్యులకు ఒకే పేరు ఉంది, దిగువ సభ్యులను సమీక్షించండి మరియు చర్య తీసుకోవడానికి ఎంచుకోండి.</string>
-    <string name="ReviewCardDialogFragment__if_youre_not_sure">అభ్యర్థన ఎవరో మీకు తెలియకపోతే, దిగువ పరిచయాలను సమీక్షించి చర్య తీసుకోండి.</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="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 -->
+    <plurals name="ReviewCardDialogFragment__if_youre_not_sure">
+        <item quantity="one">If you\'re not sure who the request is from, review the contact below and take action.</item>
+        <item quantity="other">If you\'re not sure who the request is from, review the contacts below and take action.</item>
+    </plurals>
     <string name="ReviewCardDialogFragment__no_other_groups_in_common">ఉమ్మడిగా ఇతర సమూహాలు లేవు.</string>
     <string name="ReviewCardDialogFragment__no_groups_in_common">సాధారణమైన సమూహాలు లేవు</string>
     <plurals name="ReviewCardDialogFragment__d_other_groups_in_common">
@@ -4184,11 +4262,20 @@
     <string name="CallParticipantsListUpdatePopupWindow__s_joined">%1$s చేరారు</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_and_s_joined">%1$s మరియు %2$s చేరారు</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_s_and_s_joined">%1$s,%2$s మరియు %3$s చేరారు</string>
-    <string name="CallParticipantsListUpdatePopupWindow__s_s_and_d_others_joined">%1$s, %2$s, మరో %3$d మంది చేరారు</string>
+    <!-- Toast message shown in group call when 3 or more people join -->
+    <plurals name="CallParticipantsListUpdatePopupWindow__s_s_and_d_others_joined">
+        <item quantity="one">%1$s, %2$s and %3$d other joined</item>
+        <item quantity="other">%1$s, %2$s and %3$d others joined</item>
+    </plurals>
+    <!-- Toast/popup text shown when someone leaves a group call -->
     <string name="CallParticipantsListUpdatePopupWindow__s_left">%1$s వెళ్ళిపోయారు</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_and_s_left">%1$s మరియు %2$s వెళ్ళిపోయారు</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_s_and_s_left">%1$s, %2$s మరియు %3$s వెళ్ళిపోయారు</string>
-    <string name="CallParticipantsListUpdatePopupWindow__s_s_and_d_others_left">%1$s, %2$s మరియు %3$d ఇతరులు వెళ్ళిపోయారు</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 and %3$d other left</item>
+        <item quantity="other">%1$s, %2$s and %3$d others left</item>
+    </plurals>
 
     <string name="CallParticipant__you">మీరు</string>
     <string name="CallParticipant__you_on_another_device">మీరు (మరొక పరికరంలో)</string>
@@ -4558,10 +4645,15 @@
 
     <!-- PrivacySettingsFragment -->
     <string name="PrivacySettingsFragment__blocked">బ్లాక్ చేయబడింది</string>
-    <string name="PrivacySettingsFragment__d_contacts">%1$d కాంటాక్ట్‌లు</string>
+    <!-- Settings label that shows the number blocked contacts -->
+    <plurals name="PrivacySettingsFragment__d_contacts">
+        <item quantity="one">%1$d contact</item>
+        <item quantity="other">%1$d contacts</item>
+    </plurals>
     <string name="PrivacySettingsFragment__messaging">సందేశం</string>
     <string name="PrivacySettingsFragment__disappearing_messages">అదృశ్యమవుతున్న సందేశాలు</string>
     <string name="PrivacySettingsFragment__app_security">యాప్ సెక్యూరిటీ</string>
+    <!-- This refers to the multi-tasking overview (recent apps) from the Android operating system.-->
     <string name="PrivacySettingsFragment__block_screenshots_in_the_recents_list_and_inside_the_app">ఇటీవలి జాబితాలో మరియు యాప్ లోపల స్క్రీన్‌షాట్‌లను బ్లాక్ చేయండి</string>
     <string name="PrivacySettingsFragment__signal_message_and_calls">Signal సందేశాలు మరియు కాల్స్, ఎల్లప్పుడూ రిలే కాల్స్, మరియు సీల్ చేయబడ్డ సెండర్</string>
     <string name="PrivacySettingsFragment__default_timer_for_new_changes">కొత్త చాట్‌ల కొరకు డిఫాల్ట్ టైమర్</string>
@@ -4618,11 +4710,14 @@
     <string name="DataAndStorageSettingsFragment__media_quality">మీడియా నాణ్యత</string>
     <string name="DataAndStorageSettingsFragment__sent_media_quality">పంపిన మీడియా నాణ్యత</string>
     <string name="DataAndStorageSettingsFragment__sending_high_quality_media_will_use_more_data">అధిక నాణ్యత కలిగిన మీడియాను పంపడం వల్ల మరింత డేటా ఉపయోగించబడుతుంది.</string>
+    <!-- Setting option that can be selected to default media to be sent as high quality by default -->
     <string name="DataAndStorageSettingsFragment__high">అధికం</string>
+    <!-- Setting option that can be selected to default media to be sent as standard quality by default -->
     <string name="DataAndStorageSettingsFragment__standard">ప్రామాణికం</string>
     <string name="DataAndStorageSettingsFragment__calls">కాల్స్</string>
 
     <!-- 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__use_custom_colors">కస్టమ్ రంగులను ఉపయోగించండి</string>
     <string name="ChatColorSelectionFragment__chat_color">చాట్ రంగు</string>
@@ -4834,6 +4929,7 @@
     <string name="AvatarPickerFragment__take_a_picture">చిత్రాన్ని తీసుకోండి</string>
     <string name="AvatarPickerFragment__choose_a_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>
     <string name="AvatarPickerFragment__clear_avatar">అవతార్ తీసివేయండి</string>
@@ -4894,7 +4990,7 @@
     <string name="MediaReviewFragment__add_a_message">ఒక సందేశాన్ని జోడించండి</string>
     <string name="MediaReviewFragment__add_a_reply">ప్రత్యుత్తరమును జోడించండి</string>
     <string name="MediaReviewFragment__send_to">వీరికి పంపండి</string>
-    <string name="MediaReviewFragment__view_once_message">సందేశాన్ని ఒక్కసారి చూడండి</string>
+    <string name="MediaReviewFragment__view_once_message">ఒక్కసారి వీక్షించదగిన మీడియా</string>
     <string name="MediaReviewFragment__one_or_more_items_were_too_large">ఒకటి లేదా అంతకంటే ఎక్కువ ఐటమ్‌లు చాలా పొడవుగా ఉన్నాయి</string>
     <string name="MediaReviewFragment__one_or_more_items_were_invalid">ఒకటి లేదా అంతకంటే ఎక్కువ ఐటమ్‌లు చెల్లుబాటు కావు.</string>
     <string name="MediaReviewFragment__too_many_items_selected">చాలా ఎక్కువగా ఐటమ్‌లు ఎంచుకోబడ్డాయి</string>
@@ -5487,7 +5583,7 @@
     <string name="StoryViewerFragment__s_s">%1$s %2$s</string>
     <!-- Displayed when viewing a post you sent -->
     <string name="StoryViewerPageFragment__you">మీరు</string>
-    <!-- Displayed when viewing a post displayed to a group -->
+    <!-- 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 -->
     <string name="StoryViewerPageFragment__reply">స్పంధించు</string>
@@ -6704,5 +6800,26 @@
     <!-- Content description for opening the note editor -->
     <string name="ViewNoteSheet__edit_note">గమనిక సవరించండి</string>
 
+    <!-- BackupProgressService -->
+    <!-- Notification title shown while backup restore job is running -->
+    <string name="BackupProgressService_title">బ్యాకప్ పునరుద్ధరించబడుతోంది…</string>
+    <!-- Notification title shown while downloading backup restore data -->
+    <string name="BackupProgressService_title_downloading">బ్యాకప్ డేటాను డౌన్‌లోడ్ చేస్తోంది…</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>
+    <!-- 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 -->
+    <string name="BackupsTypeSettingsFragment__google_pay">Google Pay</string>
+    <!-- Displayed as the user\'s payment method as a label in a preference row -->
+    <string name="BackupsTypeSettingsFragment__bank_transfer">Bank transfer</string>
+    <!-- Displayed as the user\'s payment method as a label in a preference row -->
+    <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>
+
+
     <!-- 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 34ad182db9..a2b3f04a6d 100644
--- a/app/src/main/res/values-th/strings.xml
+++ b/app/src/main/res/values-th/strings.xml
@@ -1,6 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- smartling.instruction_comments_enabled = on -->
-<resources>
+<?xml version="1.0" encoding="UTF-8"?><!-- 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> -->
@@ -89,6 +87,16 @@
     <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">Allow access to your location</string>
+    <!-- Dialog description that will explain the steps needed to give location permission -->
+    <string name="AttachmentManager_signal_to_send_location">To send your location:</string>
+    <!-- Alert dialog description asking for location permission -->
+    <string name="AttachmentManager_signal_allow_signal_access_location">Allow Molly access to send your location.</string>
+    <!-- Toast text explaining Signal\'s need for location access -->
+    <string name="AttachmentManager_signal_needs_location_access">Molly needs location access to send your location.</string>
+
     <!-- Alert dialog title to show the recipient has not activated payments -->
     <string name="AttachmentManager__not_activated_payments">%1$s ยังไม่ได้เปิดใช้การชำระเงิน </string>
     <!-- Alert dialog description to send the recipient a request to activate payments -->
@@ -240,7 +248,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>
@@ -383,8 +391,16 @@
     <string name="ConversationActivity_your_request_to_join_has_been_sent_to_the_group_admin">คำขอเข้ากลุ่มของคุณถูกส่งไปยังผู้ดูแลกลุ่มแล้ว คุณจะได้รับแจ้งเมื่อผู้ดูแลดำเนินการ</string>
     <string name="ConversationActivity_cancel_request">ยกเลิกคำขอ</string>
 
-    <string name="ConversationActivity_to_send_audio_messages_allow_signal_access_to_your_microphone">เพื่อจะส่งข้อความเสียง คุณต้องอนุญาตให้ Molly เข้าถึงไมโครโฟน</string>
+    <!-- Dialog title asking users for microphone permission -->
+    <string name="ConversationActivity_allow_access_microphone">Allow access to your microphone</string>
+    <!-- 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>
+    <!-- Toast text explaining Signal\'s need for microphone access -->
+    <string name="ConversationActivity_signal_needs_microphone_access_voice_message">Molly needs microphone access to record a voice message.</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 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>
@@ -408,10 +424,17 @@
     <string name="ConversationActivity_you_will_leave_this_group_and_it_will_be_deleted_from_all_of_your_devices">คุณจะออกจากกลุ่มนี้และระบบจะลบกลุ่มออกจากอุปกรณ์ทุกเครื่องของคุณ</string>
     <string name="ConversationActivity_delete">ลบ</string>
     <string name="ConversationActivity_delete_and_leave">ลบและออก</string>
-    <string name="ConversationActivity__to_call_s_signal_needs_access_to_your_microphone">เพื่อจะโทรหา %1$s Molly จำเป็นต้องเข้าถึงไมโครโฟนของคุณ</string>
+
+    <!-- Dialog description that will explain the steps needed to give microphone permissions for a voice call -->
+    <string name="ConversationActivity__to_start_call">To start a 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">To start a call, allow Molly access to your microphone.</string>
+    <!-- Toast text explaining Signal\'s need for microphone access for a voice call -->
+    <string name="ConversationActivity_signal_needs_microphone_access_voice_call">Molly needs microphone access to start a call.</string>
 
 
     <string name="ConversationActivity_join">เข้าร่วม</string>
+    <!-- Button text for an active group call but the call is currently full and unjoinable -->
     <string name="ConversationActivity_full">เต็ม</string>
 
     <string name="ConversationActivity_error_sending_media">เกิดข้อผิดพลาดในการส่งสื่อ</string>
@@ -597,6 +620,7 @@
     <string name="ConversationListFragment_unarchive">ยกเลิกเก็บถาวร</string>
     <string name="ConversationListFragment_delete">ลบ</string>
     <string name="ConversationListFragment_select_all">เลือกทั้งหมด</string>
+    <!-- Screen title shown when selecting multiple items from a list like conversation threads or call logs. -->
     <plurals name="ConversationListFragment_s_selected">
         <item quantity="other">เลือกไว้ %1$d</item>
     </plurals>
@@ -845,6 +869,7 @@
     <plurals name="GroupManagement_invitation_sent">
         <item quantity="other">ส่ง %1$d คำเชิญแล้ว</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">คุณไม่สามารถเพิ่ม %1$s เข้ากลุ่มนี้โดยอัตโนมัติ \n\nพวกเขาได้ถูกเชิญให้เข้ากลุ่มและจะไม่เห็นข้อความในกลุ่มจนกว่าพวกเขาจะตอบรับ</string>
     <string name="GroupManagement_invite_multiple_users">คุณไม่สามารถเพิ่มผู้ใช้เหล่านี้เข้ากลุ่มนี้โดยอัตโนมัติ \n\nพวกเขาได้ถูกเชิญให้เข้ากลุ่มและจะไม่เห็นข้อความในกลุ่มจนกว่าพวกเขาจะตอบรับ</string>
 
@@ -1009,7 +1034,9 @@
 
     <string name="ManageGroupActivity_edit_name_and_picture">แก้ไขชื่อและภาพ</string>
     <string name="ManageGroupActivity_legacy_group">กลุ่มแบบเก่า</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">นี่คือกลุ่มแบบเก่า ความสามารถเช่น ระบบผู้ดูแลกลุ่ม จะใช้ได้เฉพาะในกลุ่มแบบใหม่</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">นี่คือกลุ่มแบบเก่า เพื่อเข้าถึงความสามารถใหม่ เช่นการ @กล่าวถึง และระบบผู้ดูแลกลุ่ม</string>
     <string name="ManageGroupActivity_legacy_group_too_large">กลุ่มแบบเก่านี้ไม่สามารถปรับรุ่นให้เป็นกลุ่มแบบใหม่ได้ เพราะมีขนาดใหญ่เกินไป ขนาดกลุ่มที่ใหญ่ที่สุดคือ %1$d</string>
     <string name="ManageGroupActivity_upgrade_this_group">ปรับรุ่นกลุ่มนี้</string>
@@ -1227,6 +1254,7 @@
         <item quantity="other">ลบ</item>
     </plurals>
 
+    <!-- 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="other">เลือกไว้ %1$d (%2$s)</item>
     </plurals>
@@ -1290,17 +1318,13 @@
     <string name="MessageRecord_left_group">คุณได้ออกจากกลุ่ม</string>
     <string name="MessageRecord_you_updated_group">คุณได้ปรับปรุงกลุ่ม</string>
     <string name="MessageRecord_the_group_was_updated">กลุ่มถูกปรับปรุงแล้ว</string>
-    <!-- Update message shown when placing an outgoing 1:1 voice/audio call and it\'s answered by the other party -->
+    <!-- Update message shown when placing an outgoing 1:1 voice/audio call -->
     <string name="MessageRecord_outgoing_voice_call">การโทรด้วยเสียงขาออก</string>
-    <!-- Update message shown when placing an outgoing 1:1 video call and it\'s answered by the other party -->
+    <!-- Update message shown when placing an outgoing 1:1 video call -->
     <string name="MessageRecord_outgoing_video_call">วิดีโอคอลขาออก</string>
-    <!-- Update message shown when placing an outgoing 1:1 voice/audio call and it\'s not answered by the other party -->
-    <string name="MessageRecord_unanswered_voice_call">การโทรด้วยเสียงที่ปลายสายไม่ได้รับ</string>
-    <!-- Update message shown when placing an outgoing 1:1 video call and it\'s not answered by the other party -->
-    <string name="MessageRecord_unanswered_video_call">วิดีโอคอลที่ปลายสายไม่ได้รับ</string>
-    <!-- Update message shown when receiving an incoming 1:1 voice/audio call and it\'s answered -->
+    <!-- Update message shown when receiving an incoming 1:1 voice/audio call and it\'s answered or ringing -->
     <string name="MessageRecord_incoming_voice_call">การโทรด้วยเสียงขาเข้า</string>
-    <!-- Update message shown when receiving an incoming 1:1 video call and answered -->
+    <!-- Update message shown when receiving an incoming 1:1 video call and answered or ringing -->
     <string name="MessageRecord_incoming_video_call">วิดีโอคอลขาเข้า</string>
     <!-- Update message shown when receiving an incoming 1:1 voice/audio call and not answered -->
     <string name="MessageRecord_missed_voice_call">การโทรด้วยเสียงที่ไม่ได้รับ</string>
@@ -1310,10 +1334,6 @@
     <string name="MessageRecord_missed_voice_call_notification_profile">สายโทรเสียงที่ไม่ได้รับระหว่างใช้โปรไฟล์การแจ้งเตือน</string>
     <!-- Update message shown when receiving an incoming video call and declined due to notification profile -->
     <string name="MessageRecord_missed_video_call_notification_profile">วิดีโอคอลที่ไม่ได้รับระหว่างใช้โปรไฟล์การแจ้งเตือน</string>
-    <!-- Update message shown when receiving an incoming 1:1 voice/audio call and explicitly declined -->
-    <string name="MessageRecord_you_declined_a_voice_call">คุณปฏิเสธการโทรด้วยเสียง</string>
-    <!-- Update message shown when receiving an incoming 1:1 video call and explicitly declined -->
-    <string name="MessageRecord_you_declined_a_video_call">คุณปฏิเสธวิดีโอคอล</string>
     <!-- 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>
@@ -1514,27 +1534,52 @@
     <string name="MessageRecord_can_accept_payments">%1$s สามารถรับการชำระเงินได้แล้ว</string>
 
     <!-- Group Calling update messages -->
-    <string name="MessageRecord_s_started_a_group_call_s">%1$s ได้เริ่มการโทรแบบกลุ่ม %2$s</string>
-    <string name="MessageRecord_you_started_a_group_call_s">คุณเริ่มการโทรกลุ่ม · %1$s</string>
-    <string name="MessageRecord_s_is_in_the_group_call_s">%1$s อยู่ในการโทรแบบกลุ่ม %2$s</string>
-    <string name="MessageRecord_you_are_in_the_group_call_s1">คุณอยู่ในการโทรแบบกลุ่ม %1$s</string>
-    <string name="MessageRecord_s_and_s_are_in_the_group_call_s1">%1$s และ %2$s ได้อยู่ในการโทรแบบกลุ่ม %3$s</string>
-    <string name="MessageRecord_group_call_s">โทรกลุ่ม · %1$s</string>
-
-    <string name="MessageRecord_s_started_a_group_call">%1$s ได้เริ่มการโทรแบบกลุ่ม</string>
-    <string name="MessageRecord_you_started_a_group_call">คุณได้เริ่มโทรแบบกลุ่ม</string>
-    <string name="MessageRecord_s_is_in_the_group_call">%1$s อยู่ในการโทรแบบกลุ่ม</string>
-    <string name="MessageRecord_you_are_in_the_group_call">คุณอยู่ในการโทรแบบกลุ่ม</string>
-    <string name="MessageRecord_s_and_s_are_in_the_group_call">%1$s และ %2$s ได้อยู่ในการโทรแบบกลุ่ม</string>
-    <string name="MessageRecord_group_call">โทรกลุ่ม</string>
+    <!-- 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 อยู่ในสาย · %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">คุณอยู่ในสาย · %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 และ %2$s อยู่ในสาย · %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 อยู่ในสาย</string>
+    <!-- Chat log text for an ongoing group call only the local user has joined -->
+    <string name="MessageRecord_you_are_in_the_call">คุณอยู่ในสาย</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 และ %2$s อยู่ในสาย</string>
+    <!-- Chat log text for a group call that ended within the last 5 minutes -->
+    <string name="MessageRecord__the_video_call_has_ended">วิดีโอคอลสิ้นสุดแล้ว</string>
+    <!-- Chat log text for a group call that ended within the last 5 minutes with a placeholder for formatted time -->
+    <string name="MessageRecord__the_video_call_has_ended_s">วิดีโอคอลสิ้นสุดแล้ว · %1$s</string>
+    <!-- Chat log text for a group call that ended more than 5 minutes ago and was missed -->
+    <string name="MessageRecord__missed_video_call">วิดีโอคอลที่ไม่ได้รับ</string>
+    <!-- Chat log text for a group call that ended more than 5 minutes ago and was missed with a placeholder for formatted time -->
+    <string name="MessageRecord__missed_video_call_s">โทรวิดีโอที่พลาด · %1$s</string>
+    <!-- Chat log text for a group call that ended that the local user did not start -->
+    <string name="MessageRecord__incoming_video_call">วิดีโอคอลขาเข้า</string>
+    <!-- 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">สายวิดีโอคอลเรียกเข้า · %1$s</string>
+    <!-- Chat log text for a group call that ended that the local user started -->
+    <string name="MessageRecord__outgoing_video_call">วิดีโอคอลขาออก</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">สายวิดีโอคอลโทรออก · %1$s</string>
+    <!-- Chat log text for an ongoing group call that the local user started -->
+    <string name="MessageRecord__you_started_a_video_call">คุณเริ่มวิดีโอคอล</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">คุณเริ่มวิดีโอคอล · %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 เริ่มวิดีโอคอล</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 เริ่มวิดีโอคอล · %2$s</string>
 
     <string name="MessageRecord_you">คุณ</string>
 
-    <plurals name="MessageRecord_s_s_and_d_others_are_in_the_group_call_s">
+    <!-- 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="other">%1$s %2$s และ %3$d รวมถึงคนอื่นๆ อยู่ในการโทรแบบกลุ่ม %4$s</item>
     </plurals>
 
-    <plurals name="MessageRecord_s_s_and_d_others_are_in_the_group_call">
+    <!-- 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="other">%1$s %2$s และ %3$d รวมถึงคนอื่นๆ อยู่ในการโทรแบบกลุ่ม</item>
     </plurals>
 
@@ -1984,6 +2029,7 @@
     <!-- Generic error when the app is unable to request an SMS code for an unknown reason. -->
     <string name="RegistrationActivity_unable_to_request_verification_code">ไม่สามารถขอรหัสยืนยันได้ โปรดตรวจสอบการเชื่อมต่อเครือข่ายและลองอีกครั้ง</string>
     <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">Molly Android - ฟอร์แมทหมายเลขโทรศัพท์</string>
     <!--    Small "toast" notification to the user confirming that they have requested a new code via voice call.-->
@@ -2127,7 +2173,7 @@
     <string name="SubmitDebugLogActivity_this_log_will_be_posted_publicly_online_for_contributors">บันทึกนี้จะถูกโพสต์แบบสาธารณะทางออนไลน์เพื่อให้ผู้สนับสนุนสามารถดูได้ คุณอาจจะตรวจสอบก่อนที่จะอัปโหลด</string>
 
     <!-- SupportEmailUtil -->
-  <!-- Removed by excludeNonTranslatables <string name="SupportEmailUtil_support_email" translatable="false">support@molly.im</string> -->
+  <!-- Removed by excludeNonTranslatables <string name="SupportEmailUtil_support_email" translatable="false">support@signal.org</string> -->
     <string name="SupportEmailUtil_filter">ตัวกรอง:</string>
     <string name="SupportEmailUtil_device_info">ข้อมูลอุปกรณ์:</string>
     <string name="SupportEmailUtil_android_version">รุ่นแอนดรอยด์:</string>
@@ -2622,6 +2668,8 @@
     <string name="ConversationUpdateItem_loading">กำลังโหลด</string>
     <string name="ConversationUpdateItem_learn_more">เรียนรู้เพิ่มเติม</string>
     <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_call_is_full">ห้องเต็ม</string>
     <string name="ConversationUpdateItem_invite_friends">เชิญเพื่อน</string>
@@ -2686,6 +2734,7 @@
     <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>
 
     <!-- EnableCallNotificationSettingsDialog__call_notifications_checklist -->
@@ -2992,6 +3041,7 @@
 
     <string name="arrays__default">ค่าเริ่มต้น</string>
     <string name="arrays__high">สูง</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">สูงสุด</string>
 
     <!-- plurals.xml -->
@@ -3260,7 +3310,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">คุณสามารถใช้ 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">ไม่สามารถชำระเงินใน Molly ได้อีกต่อไป คุณยังสามารถโอนเงินไปยังตลาดหลักทรัพย์ได้ แต่คุณจะไม่สามารถส่งและรับการชำระเงินหรือเพิ่มเงินได้อีก</string>
@@ -3309,6 +3359,14 @@
     <!-- Storage permission row description -->
     <string name="GrantPermissionsFragment__send_photos_videos_and_files">ส่งรูปภาพ วิดีโอ และไฟล์ต่างๆ จากอุปกรณ์ของคุณ</string>
 
+    <!-- PermissionDeniedBottomSheet -->
+    <!-- Sheet describing step 1 on how to give permissions by opening settings -->
+    <string name="PermissionDeniedBottomSheet__1_tap_settings_below">1. Tap “Settings” below</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 Allow the permission</string>
+    <!-- Label for button at the bottom of the sheet which opens the system permission settings -->
+    <string name="PermissionDeniedBottomSheet__settings">Settings</string>
+
     <!-- PaymentsSecuritySetupFragment -->
     <!-- Toolbar title -->
     <string name="PaymentsSecuritySetupFragment__security_setup">การตั้งค่าความปลอดภัย</string>
@@ -3349,6 +3407,7 @@
     <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__information">รายละเอียดธุรกรรม รวมถึงจำนวนเงินและเวลาของธุรกรรมเป็นส่วนหนึ่งของ MobileCoin Ledger</string>
@@ -3411,6 +3470,7 @@
     <string name="ConfirmPayment__confirm_payment">ยืนยันการจ่ายเงิน</string>
     <string name="ConfirmPayment__network_fee">ค่าธรรมเนียมเครือข่าย</string>
     <string name="ConfirmPayment__estimated_s">ประมาณ %1$s</string>
+    <!-- Prefix to a name to indicate who a payment will be sent to -->
     <string name="ConfirmPayment__to">ถึง</string>
     <string name="ConfirmPayment__total_amount">จำนวนรวม</string>
     <string name="ConfirmPayment__balance_s">ยอด: %1$s</string>
@@ -3559,6 +3619,14 @@
     <string name="conversation_group_options__conversation">แชท</string>
     <string name="conversation_group_options__broadcast">เผยแพร่</string>
 
+    <!-- DoubleTapEditEducationSheet -->
+    <!-- Displayed as the title of the education bottom sheet -->
+    <string name="DoubleTapEditEducationSheet__double_tap_edit_title">Double tap to edit</string>
+    <!-- Text on the sheet explaining how double tapping on a message will let them edit it -->
+    <string name="DoubleTapEditEducationSheet__quickly_tap_twice">Quickly tap twice on your messages to edit them. You can edit your messages up to 24hrs after they’ve been sent.</string>
+    <!-- Button label to dismiss sheet -->
+    <string name="DoubleTapEditEducationSheet__got_it">Got it</string>
+
     <!-- text_secure_normal -->
     <string name="text_secure_normal__menu_new_group">กลุ่มใหม่</string>
     <string name="text_secure_normal__menu_settings">การตั้งค่า</string>
@@ -4006,6 +4074,7 @@
     <string name="RecipientBottomSheet_copied_to_clipboard">คัดลอกไปคลิปบอร์ดแล้ว</string>
 
     <string name="GroupRecipientListItem_admin">ผู้ดูแล</string>
+    <!-- Button text to approve a user that has requested to join a group -->
     <string name="GroupRecipientListItem_approve_description">อนุมัติ</string>
     <string name="GroupRecipientListItem_deny_description">ปฏิเสธ</string>
 
@@ -4033,6 +4102,7 @@
 
     <!-- VoiceNoteMediaDescriptionCompatFactory -->
     <string name="VoiceNoteMediaItemFactory__voice_message">ข้อความเสียง %1$s</string>
+    <!-- This is a title in a banner describing the conversation sender to receiver placeholders of the currently playing voice memo. -->
     <string name="VoiceNoteMediaItemFactory__s_to_s">%1$s ถึง %2$s</string>
 
     <!-- StorageUtil -->
@@ -4046,8 +4116,14 @@
     <string name="ReviewCardDialogFragment__review_members">พิจารณาสมาชิก</string>
     <!-- Title of a screen where the user will be prompted to review a message request matching the name of someone they already know -->
     <string name="ReviewCardDialogFragment__review_request">พิจารณาคำขอ</string>
-    <string name="ReviewCardDialogFragment__d_group_members_have_the_same_name">สมาชิกในกลุ่ม %1$d คน มีชื่อเหมือนกัน พิจารณาสมาชิกด้านล่างแล้วเลือกตัดสินใจ</string>
-    <string name="ReviewCardDialogFragment__if_youre_not_sure">หากคุณไม่มั่นใจว่าคำขอมาจากใคร คุณสามารถพิจารณาได้จากรายชื่อผู้ติดต่อด้านล่างแล้วเลือกตัดสินใจ</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="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 -->
+    <plurals name="ReviewCardDialogFragment__if_youre_not_sure">
+        <item quantity="other">If you\'re not sure who the request is from, review the contacts below and take action.</item>
+    </plurals>
     <string name="ReviewCardDialogFragment__no_other_groups_in_common">ไม่มีกลุ่มอื่นร่วมกัน</string>
     <string name="ReviewCardDialogFragment__no_groups_in_common">ไม่มีกลุ่มร่วมกัน</string>
     <plurals name="ReviewCardDialogFragment__d_other_groups_in_common">
@@ -4076,11 +4152,18 @@
     <string name="CallParticipantsListUpdatePopupWindow__s_joined">%1$s ได้เข้าร่วมกลุ่ม</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_and_s_joined">%1$s และ %2$s ได้เข้าร่วมกลุ่ม</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_s_and_s_joined">%1$s %2$s และ %3$s ได้เข้าร่วมกลุ่ม</string>
-    <string name="CallParticipantsListUpdatePopupWindow__s_s_and_d_others_joined">%1$s %2$s และอีก %3$d คน ได้เข้าร่วมกลุ่ม</string>
+    <!-- Toast message shown in group call when 3 or more people join -->
+    <plurals name="CallParticipantsListUpdatePopupWindow__s_s_and_d_others_joined">
+        <item quantity="other">%1$s, %2$s and %3$d others joined</item>
+    </plurals>
+    <!-- Toast/popup text shown when someone leaves a group call -->
     <string name="CallParticipantsListUpdatePopupWindow__s_left">%1$s ออกจากกลุ่ม</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_and_s_left">%1$s และ %2$s ออกจากกลุ่ม</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_s_and_s_left">%1$s %2$s และ %3$s ได้ออกจากกลุ่ม</string>
-    <string name="CallParticipantsListUpdatePopupWindow__s_s_and_d_others_left">%1$s %2$s และอีก %3$d คน ได้ออกจากกลุ่ม</string>
+    <!-- Toast message shown in group call when 3 or more people leave -->
+    <plurals name="CallParticipantsListUpdatePopupWindow__s_s_and_d_others_left">
+        <item quantity="other">%1$s, %2$s and %3$d others left</item>
+    </plurals>
 
     <string name="CallParticipant__you">คุณ</string>
     <string name="CallParticipant__you_on_another_device">คุณ (อยู่บนอุปกรณ์เครื่องอื่น)</string>
@@ -4448,10 +4531,14 @@
 
     <!-- PrivacySettingsFragment -->
     <string name="PrivacySettingsFragment__blocked">ถูกบล็อก</string>
-    <string name="PrivacySettingsFragment__d_contacts">%1$d ผู้ติดต่อ</string>
+    <!-- Settings label that shows the number blocked contacts -->
+    <plurals name="PrivacySettingsFragment__d_contacts">
+        <item quantity="other">%1$d contacts</item>
+    </plurals>
     <string name="PrivacySettingsFragment__messaging">การส่งข้อความ</string>
     <string name="PrivacySettingsFragment__disappearing_messages">ข้อความที่ลบตัวเอง</string>
     <string name="PrivacySettingsFragment__app_security">ความปลอดภัยของแอป</string>
+    <!-- This refers to the multi-tasking overview (recent apps) from the Android operating system.-->
     <string name="PrivacySettingsFragment__block_screenshots_in_the_recents_list_and_inside_the_app">ไม่อนุญาตให้ถ่ายภาพหน้าจอในรายการสนทนาล่าสุดและภายในแอป</string>
     <string name="PrivacySettingsFragment__signal_message_and_calls">Signal ส่งข้อความและโทร ถ่ายทอดการโทร และผู้ส่งที่ถูกปกปิด</string>
     <string name="PrivacySettingsFragment__default_timer_for_new_changes">ค่าเริ่มต้นของตัวจับเวลาสำหรับแชทใหม่</string>
@@ -4508,11 +4595,14 @@
     <string name="DataAndStorageSettingsFragment__media_quality">คุณภาพของสื่อ</string>
     <string name="DataAndStorageSettingsFragment__sent_media_quality">ส่งคุณภาพสื่อแล้ว</string>
     <string name="DataAndStorageSettingsFragment__sending_high_quality_media_will_use_more_data">การส่งสื่อคุณภาพสูงจะใช้ข้อมูลมากขึ้น</string>
+    <!-- Setting option that can be selected to default media to be sent as high quality by default -->
     <string name="DataAndStorageSettingsFragment__high">สูง</string>
+    <!-- Setting option that can be selected to default media to be sent as standard quality by default -->
     <string name="DataAndStorageSettingsFragment__standard">มาตรฐาน</string>
     <string name="DataAndStorageSettingsFragment__calls">การโทร</string>
 
     <!-- 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__use_custom_colors">ใช้สีที่กำหนดเอง</string>
     <string name="ChatColorSelectionFragment__chat_color">สีแชท</string>
@@ -4721,6 +4811,7 @@
     <string name="AvatarPickerFragment__take_a_picture">ถ่ายภาพ</string>
     <string name="AvatarPickerFragment__choose_a_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>
     <string name="AvatarPickerFragment__clear_avatar">ล้างอวตาร</string>
@@ -4777,7 +4868,7 @@
     <string name="MediaReviewFragment__add_a_message">เพิ่มข้อความ</string>
     <string name="MediaReviewFragment__add_a_reply">เพิ่มการตอบกลับ</string>
     <string name="MediaReviewFragment__send_to">ส่งไปให้</string>
-    <string name="MediaReviewFragment__view_once_message">ดูข้อความครั้งเดียว</string>
+    <string name="MediaReviewFragment__view_once_message">ไฟล์สื่อแบบที่ดูได้ครั้งเดียว</string>
     <string name="MediaReviewFragment__one_or_more_items_were_too_large">มีรายการที่ใหญ่เกินไปอย่างน้อยหนึ่งรายการ</string>
     <string name="MediaReviewFragment__one_or_more_items_were_invalid">มีรายการที่ไม่ถูกต้องอย่างน้อยหนึ่งรายการ</string>
     <string name="MediaReviewFragment__too_many_items_selected">เลือกหลายรายการมากเกินไป</string>
@@ -5365,7 +5456,7 @@
     <string name="StoryViewerFragment__s_s">%1$s %2$s</string>
     <!-- Displayed when viewing a post you sent -->
     <string name="StoryViewerPageFragment__you">คุณ</string>
-    <!-- Displayed when viewing a post displayed to a group -->
+    <!-- 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 -->
     <string name="StoryViewerPageFragment__reply">ตอบกลับ</string>
@@ -6558,5 +6649,26 @@
     <!-- Content description for opening the note editor -->
     <string name="ViewNoteSheet__edit_note">แก้ไขโน้ต</string>
 
+    <!-- BackupProgressService -->
+    <!-- Notification title shown while backup restore job is running -->
+    <string name="BackupProgressService_title">กำลังกู้คืนข้อมูลสำรอง…</string>
+    <!-- Notification title shown while downloading backup restore data -->
+    <string name="BackupProgressService_title_downloading">กำลังดาวน์โหลดข้อมูลสำรอง…</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>
+    <!-- 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 -->
+    <string name="BackupsTypeSettingsFragment__google_pay">Google Pay</string>
+    <!-- Displayed as the user\'s payment method as a label in a preference row -->
+    <string name="BackupsTypeSettingsFragment__bank_transfer">Bank transfer</string>
+    <!-- Displayed as the user\'s payment method as a label in a preference row -->
+    <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>
+
+
     <!-- 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 f29b89e76f..e98934be77 100644
--- a/app/src/main/res/values-tl/strings.xml
+++ b/app/src/main/res/values-tl/strings.xml
@@ -1,6 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- smartling.instruction_comments_enabled = on -->
-<resources>
+<?xml version="1.0" encoding="UTF-8"?><!-- 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,13 +41,13 @@
     <!-- 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 ia-unlock ang Molly at mga notipikasyong pangmensahe.</string>
+    <string name="ApplicationPreferencesActivity_this_will_permanently_unlock_signal_and_message_notifications">Permanente nitong ia-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">Kinailangan ang mga PIN para sa registration lock. Para mag-disable ng PIN, paki disable muna ang registration lock.</string>
     <string name="ApplicationPreferencesActivity_pin_created">Nalikha na ang PIN.</string>
     <string name="ApplicationPreferencesActivity_pin_disabled">Naka-disable ang PIN.</string>
-    <string name="ApplicationPreferencesActivity_record_payments_recovery_phrase">I-record ang payments recovery phase</string>
+    <string name="ApplicationPreferencesActivity_record_payments_recovery_phrase">I-record ang payments recovery phrase</string>
     <string name="ApplicationPreferencesActivity_record_phrase">I-record ang phrase</string>
     <string name="ApplicationPreferencesActivity_before_you_can_disable_your_pin">Bago mo ma-disable ang iyong PIN, kinakailangan mong i-record ang payments recovery phrase mo para masiguradong mare-recover mo ang iyong payments account.</string>
 
@@ -72,13 +70,13 @@
     <string name="DraftDatabase_Draft_audio_snippet">(audio)</string>
     <string name="DraftDatabase_Draft_video_snippet">(video)</string>
     <string name="DraftDatabase_Draft_location_snippet">(lokasyon)</string>
-    <string name="DraftDatabase_Draft_quote_snippet">(tugon)</string>
+    <string name="DraftDatabase_Draft_quote_snippet">(reply)</string>
     <string name="DraftDatabase_Draft_voice_note">(Voice message)</string>
 
     <!-- AttachmentKeyboard -->
     <string name="AttachmentKeyboard_gallery">Gallery</string>
     <string name="AttachmentKeyboard_file">File</string>
-    <string name="AttachmentKeyboard_contact">Kontak</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 Molly ng pahintulot upang maipakita ang iyong mga larawan at video.</string>
     <string name="AttachmentKeyboard_give_access">Bigyan ng Access</string>
@@ -86,9 +84,19 @@
 
     <!-- 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 Molly ng pahintulot sa Storage upang makapaglakip ng mga larawan, video, o audio, ngunit permanente itong ipinagbabawal. Pumunta sa app settings menu, piliin ang \"Mga Pahintulot\", at i-enable ang \"Storage\".</string>
-    <string name="AttachmentManager_signal_requires_contacts_permission_in_order_to_attach_contact_information">Kailangan ng Molly ng pahintulot sa Mga Kontak upang makapaglakip ng impormasyon ng kontak, ngunit permanente itong ipinagbabawal. Pumunta sa app settings menu, piliin ang \"mga Pahintulot\", at i-enable ang \"Mga Kontak\".</string>
-    <string name="AttachmentManager_signal_requires_location_information_in_order_to_attach_a_location">Kailangan ng Molly ng pahintulot sa Lokasyon upang makapaglakip ng lokasyon, ngunit permanente itong ipinagbabawal. Pumunta sa app settings menu, piliin ang \"Mga Pahintulot\", at i-enable ang \"Lokasyon\".</string>
+    <string name="AttachmentManager_signal_requires_the_external_storage_permission_in_order_to_attach_photos_videos_or_audio">Kailangan ng Molly ng pahintulot sa Storage upang 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 pahintulot 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 pahintulot 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">Allow access to your location</string>
+    <!-- Dialog description that will explain the steps needed to give location permission -->
+    <string name="AttachmentManager_signal_to_send_location">To send your location:</string>
+    <!-- Alert dialog description asking for location permission -->
+    <string name="AttachmentManager_signal_allow_signal_access_location">Allow Molly access to send your location.</string>
+    <!-- Toast text explaining Signal\'s need for location access -->
+    <string name="AttachmentManager_signal_needs_location_access">Molly needs location access to send your location.</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>
     <!-- Alert dialog description to send the recipient a request to activate payments -->
@@ -100,10 +108,10 @@
 
     <!-- AttachmentUploadJob -->
     <string name="AttachmentUploadJob_uploading_media">Nag-a-upload ng media…</string>
-    <string name="AttachmentUploadJob_compressing_video_start">Nagko-compress ng video…</string>
+    <string name="AttachmentUploadJob_compressing_video_start">Kino-compressa ng video…</string>
 
     <!-- BackgroundMessageRetriever -->
-    <string name="BackgroundMessageRetriever_checking_for_messages">Tinitignan ang messages…</string>
+    <string name="BackgroundMessageRetriever_checking_for_messages">Chine-check ang messages…</string>
 
     <!-- Fcm notifications -->
     <!-- Notification we show when there may be messages for you, but we cannot connect to the server to check -->
@@ -115,7 +123,7 @@
     <string name="BlockedUsersActivity__blocked_users_will">Hindi makakatawag o makakapag-send sa \'yo ng messages ang blocked users.</string>
     <string name="BlockedUsersActivity__no_blocked_users">Walang blocked users</string>
     <string name="BlockedUsersActivity__block_user">Gusto mo bang i-block ang user na ito?</string>
-    <string name="BlockedUserActivity__s_will_not_be_able_to">Hindi na makakatawag o makakapag-send ng messages si \"%1$s\" sa\'yo.</string>
+    <string name="BlockedUserActivity__s_will_not_be_able_to">Hindi na makakatawag o makakapag-send ng messages sa \'yo si \"%1$s\".</string>
     <string name="BlockedUsersActivity__block">I-block</string>
 
     <!-- CreditCardFragment -->
@@ -163,9 +171,9 @@
     <string name="BlockUnblockDialog_block_s">I-block ang %1$s?</string>
     <string name="BlockUnblockDialog_you_will_no_longer_receive_messages_or_updates">Hindi ka na makatatanggap ng messages o updates mula sa group, at hindi ka na rin pwedeng i-add ng members ulit sa group na ito.</string>
     <string name="BlockUnblockDialog_group_members_wont_be_able_to_add_you">Hindi ka na maaaring i-add ulit ng members sa groupong ito.</string>
-    <string name="BlockUnblockDialog_group_members_will_be_able_to_add_you">Ang mga kasapi ng grupong ito ay maaaring isali kang muli sa grupong ito.</string>
+    <string name="BlockUnblockDialog_group_members_will_be_able_to_add_you">Maaari ka ulit isali sa grupong ito ng members ng grupong ito.</string>
     <!-- Text that is shown when unblocking a Signal contact -->
-    <string name="BlockUnblockDialog_you_will_be_able_to_call_and_message_each_other">Pwede niyo nang i-message at tawagan ang isa\'t isa at ang pangalan at photo mo ay ibabahagi rin sa kanya.</string>
+    <string name="BlockUnblockDialog_you_will_be_able_to_call_and_message_each_other">Pwede niyo nang i-message at tawagan ang isa\'t isa at ibabahagi rin sa kanya ang pangalan at photo mo.</string>
     <!-- Text that is shown when unblocking an SMS contact -->
     <string name="BlockUnblockDialog_you_will_be_able_to_message_each_other">Pwede niyo nang i-message ang isa\'t isa.</string>
     <string name="BlockUnblockDialog_blocked_people_wont_be_able_to_call_you_or_send_you_messages">Hindi makakatawag o makakapag-send ng messages sa \'yo ang mga binlock mong tao.</string>
@@ -178,13 +186,13 @@
     <string name="BlockUnblockDialog_block">I-block</string>
     <string name="BlockUnblockDialog_block_and_leave">I-block at Umalis</string>
     <!-- Dialog button label to report as spam and block the person -->
-    <string name="BlockUnblockDialog_report_spam_and_block">Iulat at harangin</string>
+    <string name="BlockUnblockDialog_report_spam_and_block">I-report at i-block</string>
     <!-- Dialog title for reporting spam -->
-    <string name="BlockUnblockDialog_report_spam_title">Gusto mong iulat bilang spam?</string>
+    <string name="BlockUnblockDialog_report_spam_title">I-report bilang spam?</string>
     <!-- Dialog button to report as spam only -->
-    <string name="BlockUnblockDialog_report_spam">Iulat bilang spam</string>
+    <string name="BlockUnblockDialog_report_spam">I-report  bilang spam</string>
     <!-- Dialog message when reporting spam of an individual (1:1 conversation) -->
-    <string name="BlockUnblockDialog_report_spam_description">Aabisuhan ang signal na maaaring nagpapadala ng spam ang taong ito. Hindi nababasa ng Signal ang nilalaman ng anumang mga chat.</string>
+    <string name="BlockUnblockDialog_report_spam_description">Ino-notify ang Signal na maaaring nagpapadala ng spam ang taong ito. Hindi nababasa ng Signal ang nilalaman ng anumang chats.</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">Ang Signal ay aabisuhan na si %1$s, na siyang nag-imbita sa iyo sa grupong ito, ay maaaring nagpapadala ng spam. Hindi nababasa ng Signal ang nilalaman ng anumang chat.</string>
     <!-- Dialog message when reporting spam of a group and we cannot determine the group member that invited you -->
@@ -201,10 +209,10 @@
 
     <!-- CameraFragment -->
     <!-- Toasted when user device does not support video recording -->
-    <string name="CameraFragment__video_recording_is_not_supported_on_your_device">Hindi suportado sa iyong device ang video recording</string>
+    <string name="CameraFragment__video_recording_is_not_supported_on_your_device">Hindi suportado ng iyong device ang video recording</string>
 
     <!-- CameraXFragment -->
-    <string name="CameraXFragment_tap_for_photo_hold_for_video">I-tap para sa larawan, huwag bitiwan para video</string>
+    <string name="CameraXFragment_tap_for_photo_hold_for_video">I-tap para sa photo, i-hold para sa video</string>
     <string name="CameraXFragment_capture_description">Kunan</string>
     <string name="CameraXFragment_change_camera_description">Magpalit ng Camera</string>
     <string name="CameraXFragment_open_gallery_description">Buksan ang gallery</string>
@@ -241,7 +249,7 @@
     <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>
@@ -386,8 +394,16 @@
     <string name="ConversationActivity_your_request_to_join_has_been_sent_to_the_group_admin">Ang iyong request to join ay na-send na sa group admin. You\'ll be notified when they take action.</string>
     <string name="ConversationActivity_cancel_request">I-cancel ang Request</string>
 
-    <string name="ConversationActivity_to_send_audio_messages_allow_signal_access_to_your_microphone">Upang magpadala ng mensaheng audio, payagan ang Molly na magamit ang iyong mikropono.</string>
+    <!-- Dialog title asking users for microphone permission -->
+    <string name="ConversationActivity_allow_access_microphone">Allow access to your microphone</string>
+    <!-- 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>
+    <!-- Toast text explaining Signal\'s need for microphone access -->
+    <string name="ConversationActivity_signal_needs_microphone_access_voice_message">Molly needs microphone access to record a 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 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>
@@ -411,10 +427,17 @@
     <string name="ConversationActivity_you_will_leave_this_group_and_it_will_be_deleted_from_all_of_your_devices">Aalis ka sa grupong ito, at ito\'y mabubura sa lahat ng iyong mga device.</string>
     <string name="ConversationActivity_delete">Burahin</string>
     <string name="ConversationActivity_delete_and_leave">Burahin at umalis</string>
-    <string name="ConversationActivity__to_call_s_signal_needs_access_to_your_microphone">Para tawagan si %1$s, kailangan ng Molly ng access sa iyong microphone</string>
+
+    <!-- Dialog description that will explain the steps needed to give microphone permissions for a voice call -->
+    <string name="ConversationActivity__to_start_call">To start a 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">To start a call, allow Molly access to your microphone.</string>
+    <!-- Toast text explaining Signal\'s need for microphone access for a voice call -->
+    <string name="ConversationActivity_signal_needs_microphone_access_voice_call">Molly needs microphone access to start a call.</string>
 
 
     <string name="ConversationActivity_join">Mag-join</string>
+    <!-- Button text for an active group call but the call is currently full and unjoinable -->
     <string name="ConversationActivity_full">Full</string>
 
     <string name="ConversationActivity_error_sending_media">Error sending media</string>
@@ -613,6 +636,7 @@
     <string name="ConversationListFragment_unarchive">I-unarchive</string>
     <string name="ConversationListFragment_delete">Burahin</string>
     <string name="ConversationListFragment_select_all">Piliin lahat</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 selected</item>
         <item quantity="other">%1$d selected</item>
@@ -864,6 +888,7 @@
         <item quantity="one">Pinadala ang invite</item>
         <item quantity="other">Pinadala ang %1$d invites</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">Si \"%1$s\" ay hindi mo automatic na maidadagdag sa grupong ito. Siya ay naimbitahang mag-join, at hindi makakakita ng anumang group messages hanggang i-accept niya ito.</string>
     <string name="GroupManagement_invite_multiple_users">Ang users na ito ay hindi mo automatic na maidadagdag sa grupong ito. Sila ay naimbitahan mag-join, at hindi makakakita ng anumang group messages hanggang i-accept nila ito.</string>
 
@@ -1044,7 +1069,9 @@
 
     <string name="ManageGroupActivity_edit_name_and_picture">I-edit ang pangalan at picture</string>
     <string name="ManageGroupActivity_legacy_group">Legacy Group</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">Ito\'y isang Legacy Group. Ang features tulad ng group admins ay available lamang sa New Groups.</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">Ito\'y isang Legacy Group. Para magka-access sa new features tulad ng @mentions at admins,</string>
     <string name="ManageGroupActivity_legacy_group_too_large">Ang Legacy Group na ito\'y hindi pwedeng i-upgrade sa New Group dahil masyado itong malaki. Ang maximum na group size ay %1$d.</string>
     <string name="ManageGroupActivity_upgrade_this_group">i-upgrade ang group na ito.</string>
@@ -1271,6 +1298,7 @@
         <item quantity="other">Burahin</item>
     </plurals>
 
+    <!-- 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 selected (%2$s)</item>
         <item quantity="other">%1$d selected (%2$s)</item>
@@ -1335,17 +1363,13 @@
     <string name="MessageRecord_left_group">Nakaalis ka na sa grupo.</string>
     <string name="MessageRecord_you_updated_group">In-update mo ang grupo.</string>
     <string name="MessageRecord_the_group_was_updated">Ang group na ito\'y updated na.</string>
-    <!-- Update message shown when placing an outgoing 1:1 voice/audio call and it\'s answered by the other party -->
+    <!-- Update message shown when placing an outgoing 1:1 voice/audio call -->
     <string name="MessageRecord_outgoing_voice_call">Outgoing voice call</string>
-    <!-- Update message shown when placing an outgoing 1:1 video call and it\'s answered by the other party -->
+    <!-- Update message shown when placing an outgoing 1:1 video call -->
     <string name="MessageRecord_outgoing_video_call">Outgoing video call</string>
-    <!-- Update message shown when placing an outgoing 1:1 voice/audio call and it\'s not answered by the other party -->
-    <string name="MessageRecord_unanswered_voice_call">\'Di nasagot na voice call</string>
-    <!-- Update message shown when placing an outgoing 1:1 video call and it\'s not answered by the other party -->
-    <string name="MessageRecord_unanswered_video_call">\'Di nasagot na video call</string>
-    <!-- Update message shown when receiving an incoming 1:1 voice/audio call and it\'s answered -->
+    <!-- Update message shown when receiving an incoming 1:1 voice/audio call and it\'s answered or ringing -->
     <string name="MessageRecord_incoming_voice_call">Incoming voice call</string>
-    <!-- Update message shown when receiving an incoming 1:1 video call and answered -->
+    <!-- Update message shown when receiving an incoming 1:1 video call and answered or ringing -->
     <string name="MessageRecord_incoming_video_call">Incoming video call</string>
     <!-- Update message shown when receiving an incoming 1:1 voice/audio call and not answered -->
     <string name="MessageRecord_missed_voice_call">Missed voice call</string>
@@ -1355,10 +1379,6 @@
     <string name="MessageRecord_missed_voice_call_notification_profile">May hindi nasagot na voice call habang naka-on ang notification profile</string>
     <!-- Update message shown when receiving an incoming video call and declined due to notification profile -->
     <string name="MessageRecord_missed_video_call_notification_profile">May hindi nasagot na video call habang naka-on ang notification profile</string>
-    <!-- Update message shown when receiving an incoming 1:1 voice/audio call and explicitly declined -->
-    <string name="MessageRecord_you_declined_a_voice_call">Nag-decline ka sa voice call</string>
-    <!-- Update message shown when receiving an incoming 1:1 video call and explicitly declined -->
-    <string name="MessageRecord_you_declined_a_video_call">Nag-decline ka sa video call</string>
     <!-- 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">In-update ni %1$s ang grupo.</string>
@@ -1567,28 +1587,53 @@
     <string name="MessageRecord_can_accept_payments">Makakatanggap na si %1$s ng Payments</string>
 
     <!-- Group Calling update messages -->
-    <string name="MessageRecord_s_started_a_group_call_s">Sinimulan ni %1$s ang group call · %2$s</string>
-    <string name="MessageRecord_you_started_a_group_call_s">Nagsimula ka ng group call · %1$s</string>
-    <string name="MessageRecord_s_is_in_the_group_call_s">Si %1$s ay nasa group call · %2$s</string>
-    <string name="MessageRecord_you_are_in_the_group_call_s1">Ikaw ay kasama sa group call · %1$s</string>
-    <string name="MessageRecord_s_and_s_are_in_the_group_call_s1">Sila %1$s at %2$s ay nasa group call · %3$s</string>
-    <string name="MessageRecord_group_call_s">Group call · %1$s</string>
-
-    <string name="MessageRecord_s_started_a_group_call">Sinimulan ni %1$s ang group call</string>
-    <string name="MessageRecord_you_started_a_group_call">Sinimulan mo ang group call</string>
-    <string name="MessageRecord_s_is_in_the_group_call">Si %1$s ay nasa group call</string>
-    <string name="MessageRecord_you_are_in_the_group_call">Ikaw ay kasama sa group call</string>
-    <string name="MessageRecord_s_and_s_are_in_the_group_call">Sila %1$s at %2$s ay nasa group call</string>
-    <string name="MessageRecord_group_call">Group call</string>
+    <!-- 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">Si %1$s ay nasa call · %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">Ikaw ay nasa call · %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">Sila %1$s at %2$s ay nasa call · %3$s</string>
+    <!-- Chat log text for an ongoing group call that has one participant -->
+    <string name="MessageRecord_s_is_in_the_call">Si %1$s ay nasa call</string>
+    <!-- Chat log text for an ongoing group call only the local user has joined -->
+    <string name="MessageRecord_you_are_in_the_call">Ikaw ay nasa call</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">Sila %1$s at %2$s ay nasa call</string>
+    <!-- Chat log text for a group call that ended within the last 5 minutes -->
+    <string name="MessageRecord__the_video_call_has_ended">Tapos na ang video call</string>
+    <!-- Chat log text for a group call that ended within the last 5 minutes with a placeholder for formatted time -->
+    <string name="MessageRecord__the_video_call_has_ended_s">Tapos na ang video call · %1$s</string>
+    <!-- Chat log text for a group call that ended more than 5 minutes ago and was missed -->
+    <string name="MessageRecord__missed_video_call">Missed video call</string>
+    <!-- Chat log text for a group call that ended more than 5 minutes ago and was missed with a placeholder for formatted time -->
+    <string name="MessageRecord__missed_video_call_s">Missed video call · %1$s</string>
+    <!-- Chat log text for a group call that ended that the local user did not start -->
+    <string name="MessageRecord__incoming_video_call">Incoming video call</string>
+    <!-- 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">Incoming video call · %1$s</string>
+    <!-- Chat log text for a group call that ended that the local user started -->
+    <string name="MessageRecord__outgoing_video_call">Outgoing video call</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">Outgoing video call · %1$s</string>
+    <!-- Chat log text for an ongoing group call that the local user started -->
+    <string name="MessageRecord__you_started_a_video_call">Nagsimula ka ng video call</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">Nagsimula ka ng video call · %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">Si %1$s ay nagsimula ng video call</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">Si %1$s ay nagsimula ng video call · %2$s</string>
 
     <string name="MessageRecord_you">Ikaw</string>
 
-    <plurals name="MessageRecord_s_s_and_d_others_are_in_the_group_call_s">
+    <!-- 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">Sila %1$s, %2$s, at %3$d pa ay nasa group call · %4$s</item>
         <item quantity="other">Sila %1$s, %2$s, at %3$d na iba pa ay nasa group call · %4$s</item>
     </plurals>
 
-    <plurals name="MessageRecord_s_s_and_d_others_are_in_the_group_call">
+    <!-- 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">Sila %1$s, %2$s, at %3$d pa ay nasa group call</item>
         <item quantity="other">Sila %1$s, %2$s, at %3$d pa ay nasa group call</item>
     </plurals>
@@ -2063,6 +2108,7 @@
     <!-- Generic error when the app is unable to request an SMS code for an unknown reason. -->
     <string name="RegistrationActivity_unable_to_request_verification_code">Hindi makapag-request ng verification code. Paki-check ng iyong network connection at subukan ulit.</string>
     <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">Molly Android - Phone Number Format</string>
     <!--    Small "toast" notification to the user confirming that they have requested a new code via voice call.-->
@@ -2207,7 +2253,7 @@
     <string name="SubmitDebugLogActivity_this_log_will_be_posted_publicly_online_for_contributors">This log will be posted publicly online para ma-view ng contributors. Pwede mo itong i-examine before uploading.</string>
 
     <!-- SupportEmailUtil -->
-  <!-- Removed by excludeNonTranslatables <string name="SupportEmailUtil_support_email" translatable="false">support@molly.im</string> -->
+  <!-- Removed by excludeNonTranslatables <string name="SupportEmailUtil_support_email" translatable="false">support@signal.org</string> -->
     <string name="SupportEmailUtil_filter">Filter:</string>
     <string name="SupportEmailUtil_device_info">Impormasyon ng device:</string>
     <string name="SupportEmailUtil_android_version">Bersyon ng Android:</string>
@@ -2709,6 +2755,8 @@
     <string name="ConversationUpdateItem_loading">Naglo-load</string>
     <string name="ConversationUpdateItem_learn_more">Matuto pa</string>
     <string name="ConversationUpdateItem_join_call">Mag-join sa call</string>
+    <!-- Action button label for starting a new call in the current conversation -->
+    <string name="ConversationUpdateItem_call_back">Tawagan Pabalik</string>
     <string name="ConversationUpdateItem_return_to_call">Return to call</string>
     <string name="ConversationUpdateItem_call_is_full">Puno na ang call</string>
     <string name="ConversationUpdateItem_invite_friends">Imbitahan ang mga kaibigan</string>
@@ -2773,6 +2821,7 @@
     <string name="safety_number_change_dialog__leave_call">Leave call</string>
     <string name="safety_number_change_dialog__the_following_people_may_have_reinstalled_or_changed_devices">Maaaring nag-reinstall o nagpalit ng devices ang mga nabanggit na tao. I-verify ang safety number mo sa kanila para masiguro ang iyong privacy.</string>
     <string name="safety_number_change_dialog__view">Tingnan</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">Previous verified</string>
 
     <!-- EnableCallNotificationSettingsDialog__call_notifications_checklist -->
@@ -3086,6 +3135,7 @@
 
     <string name="arrays__default">Default</string>
     <string name="arrays__high">Mataas</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">Pinakasagad</string>
 
     <!-- plurals.xml -->
@@ -3357,7 +3407,7 @@
     <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 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>
@@ -3406,6 +3456,14 @@
     <!-- Storage permission row description -->
     <string name="GrantPermissionsFragment__send_photos_videos_and_files">Mag-send ng photos, videos, at files mula sa device mo.</string>
 
+    <!-- PermissionDeniedBottomSheet -->
+    <!-- Sheet describing step 1 on how to give permissions by opening settings -->
+    <string name="PermissionDeniedBottomSheet__1_tap_settings_below">1. Tap “Settings” below</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 Allow the permission</string>
+    <!-- Label for button at the bottom of the sheet which opens the system permission settings -->
+    <string name="PermissionDeniedBottomSheet__settings">Settings</string>
+
     <!-- PaymentsSecuritySetupFragment -->
     <!-- Toolbar title -->
     <string name="PaymentsSecuritySetupFragment__security_setup">Security setup</string>
@@ -3446,6 +3504,7 @@
     <string name="PaymentsDetailsFragment__sent_to_s">Sent to %1$s</string>
     <string name="PaymentsDetailsFragment__you_on_s_at_s">You on %1$s at %2$s</string>
     <string name="PaymentsDetailsFragment__s_on_s_at_s">%1$s on %2$s at %3$s</string>
+    <!-- Prefix to a name to indicate who a payment was sent to -->
     <string name="PaymentsDetailsFragment__to">To</string>
     <string name="PaymentsDetailsFragment__from">From</string>
     <string name="PaymentsDetailsFragment__information">Ang transaction details gaya ng payment amount at oras ng transaction ay parte ng MobileCoin Ledger.</string>
@@ -3508,6 +3567,7 @@
     <string name="ConfirmPayment__confirm_payment">I-confirm ang payment</string>
     <string name="ConfirmPayment__network_fee">Network fee</string>
     <string name="ConfirmPayment__estimated_s">Estimated %1$s</string>
+    <!-- Prefix to a name to indicate who a payment will be sent to -->
     <string name="ConfirmPayment__to">To</string>
     <string name="ConfirmPayment__total_amount">Total amount</string>
     <string name="ConfirmPayment__balance_s">Balance: %1$s</string>
@@ -3658,6 +3718,14 @@
     <string name="conversation_group_options__conversation">Chat</string>
     <string name="conversation_group_options__broadcast">Broadcast</string>
 
+    <!-- DoubleTapEditEducationSheet -->
+    <!-- Displayed as the title of the education bottom sheet -->
+    <string name="DoubleTapEditEducationSheet__double_tap_edit_title">Double tap to edit</string>
+    <!-- Text on the sheet explaining how double tapping on a message will let them edit it -->
+    <string name="DoubleTapEditEducationSheet__quickly_tap_twice">Quickly tap twice on your messages to edit them. You can edit your messages up to 24hrs after they’ve been sent.</string>
+    <!-- Button label to dismiss sheet -->
+    <string name="DoubleTapEditEducationSheet__got_it">Got it</string>
+
     <!-- text_secure_normal -->
     <string name="text_secure_normal__menu_new_group">Bagong Grupo</string>
     <string name="text_secure_normal__menu_settings">Settings</string>
@@ -4112,6 +4180,7 @@
     <string name="RecipientBottomSheet_copied_to_clipboard">Copied to clipboard</string>
 
     <string name="GroupRecipientListItem_admin">Admin</string>
+    <!-- Button text to approve a user that has requested to join a group -->
     <string name="GroupRecipientListItem_approve_description">Approve</string>
     <string name="GroupRecipientListItem_deny_description">I-deny</string>
 
@@ -4139,6 +4208,7 @@
 
     <!-- VoiceNoteMediaDescriptionCompatFactory -->
     <string name="VoiceNoteMediaItemFactory__voice_message">Voice message · %1$s</string>
+    <!-- This is a title in a banner describing the conversation sender to receiver placeholders of the currently playing voice memo. -->
     <string name="VoiceNoteMediaItemFactory__s_to_s">%1$s hanggang %2$s</string>
 
     <!-- StorageUtil -->
@@ -4152,8 +4222,16 @@
     <string name="ReviewCardDialogFragment__review_members">I-review ang Members</string>
     <!-- Title of a screen where the user will be prompted to review a message request matching the name of someone they already know -->
     <string name="ReviewCardDialogFragment__review_request">I-review ang Request</string>
-    <string name="ReviewCardDialogFragment__d_group_members_have_the_same_name">%1$d group members ang may parehong pangalan, i-review ang members sa baba at piliing mag-take action.</string>
-    <string name="ReviewCardDialogFragment__if_youre_not_sure">Kung hindi ka sigurado kung kanino galing ang request na ito, i-review ang contacts sa baba and take action.</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="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 -->
+    <plurals name="ReviewCardDialogFragment__if_youre_not_sure">
+        <item quantity="one">If you\'re not sure who the request is from, review the contact below and take action.</item>
+        <item quantity="other">If you\'re not sure who the request is from, review the contacts below and take action.</item>
+    </plurals>
     <string name="ReviewCardDialogFragment__no_other_groups_in_common">Walang other groups in common.</string>
     <string name="ReviewCardDialogFragment__no_groups_in_common">Walang groups in common.</string>
     <plurals name="ReviewCardDialogFragment__d_other_groups_in_common">
@@ -4184,11 +4262,20 @@
     <string name="CallParticipantsListUpdatePopupWindow__s_joined">%1$s joined</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_and_s_joined">%1$s and %2$s joined</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_s_and_s_joined">%1$s, %2$s, and %3$s joined</string>
-    <string name="CallParticipantsListUpdatePopupWindow__s_s_and_d_others_joined">%1$s, %2$s, and %3$d others joined</string>
+    <!-- Toast message shown in group call when 3 or more people join -->
+    <plurals name="CallParticipantsListUpdatePopupWindow__s_s_and_d_others_joined">
+        <item quantity="one">%1$s, %2$s and %3$d other joined</item>
+        <item quantity="other">%1$s, %2$s and %3$d others joined</item>
+    </plurals>
+    <!-- Toast/popup text shown when someone leaves a group call -->
     <string name="CallParticipantsListUpdatePopupWindow__s_left">%1$s left</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_and_s_left">%1$s and %2$s left</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_s_and_s_left">%1$s, %2$s, and %3$s left</string>
-    <string name="CallParticipantsListUpdatePopupWindow__s_s_and_d_others_left">%1$s, %2$s, and %3$d others left</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 and %3$d other left</item>
+        <item quantity="other">%1$s, %2$s and %3$d others left</item>
+    </plurals>
 
     <string name="CallParticipant__you">Ikaw</string>
     <string name="CallParticipant__you_on_another_device">You (sa ibang device)</string>
@@ -4558,10 +4645,15 @@
 
     <!-- PrivacySettingsFragment -->
     <string name="PrivacySettingsFragment__blocked">Naka-block</string>
-    <string name="PrivacySettingsFragment__d_contacts">%1$d contacts</string>
+    <!-- Settings label that shows the number blocked contacts -->
+    <plurals name="PrivacySettingsFragment__d_contacts">
+        <item quantity="one">%1$d contact</item>
+        <item quantity="other">%1$d contacts</item>
+    </plurals>
     <string name="PrivacySettingsFragment__messaging">Messaging</string>
     <string name="PrivacySettingsFragment__disappearing_messages">Mga naglalahong mensahe</string>
     <string name="PrivacySettingsFragment__app_security">App security</string>
+    <!-- This refers to the multi-tasking overview (recent apps) from the Android operating system.-->
     <string name="PrivacySettingsFragment__block_screenshots_in_the_recents_list_and_inside_the_app">I-block ang screenshots sa recents list at sa loob ng app</string>
     <string name="PrivacySettingsFragment__signal_message_and_calls">Signal messages and calls, always relay calls, and sealed sender</string>
     <string name="PrivacySettingsFragment__default_timer_for_new_changes">Default timer para sa new chats</string>
@@ -4618,11 +4710,14 @@
     <string name="DataAndStorageSettingsFragment__media_quality">Media quality</string>
     <string name="DataAndStorageSettingsFragment__sent_media_quality">Sent media quality</string>
     <string name="DataAndStorageSettingsFragment__sending_high_quality_media_will_use_more_data">Ang pag-send ng high quality media will use more data.</string>
+    <!-- Setting option that can be selected to default media to be sent as high quality by default -->
     <string name="DataAndStorageSettingsFragment__high">Mataas</string>
+    <!-- Setting option that can be selected to default media to be sent as standard quality by default -->
     <string name="DataAndStorageSettingsFragment__standard">Standard</string>
     <string name="DataAndStorageSettingsFragment__calls">Mga Tawag</string>
 
     <!-- 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__use_custom_colors">Use custom colors</string>
     <string name="ChatColorSelectionFragment__chat_color">Chat color</string>
@@ -4834,6 +4929,7 @@
     <string name="AvatarPickerFragment__take_a_picture">Take a picture</string>
     <string name="AvatarPickerFragment__choose_a_photo">Pumili ng photo</string>
     <string name="AvatarPickerFragment__photo">Larawan</string>
+    <!-- Button label during avatar selection/creation that when tapped lets you generate an avatar from typed in text. -->
     <string name="AvatarPickerFragment__text">Text</string>
     <string name="AvatarPickerFragment__save">I-save</string>
     <string name="AvatarPickerFragment__clear_avatar">I-clear ang avatar</string>
@@ -4894,7 +4990,7 @@
     <string name="MediaReviewFragment__add_a_message">Mag-add ng message</string>
     <string name="MediaReviewFragment__add_a_reply">Mag-add ng reply</string>
     <string name="MediaReviewFragment__send_to">I-send kay</string>
-    <string name="MediaReviewFragment__view_once_message">View message once</string>
+    <string name="MediaReviewFragment__view_once_message">View-once media</string>
     <string name="MediaReviewFragment__one_or_more_items_were_too_large">Ang isa o higit pang files were too large</string>
     <string name="MediaReviewFragment__one_or_more_items_were_invalid">Ang isa o higit pang files were invalid</string>
     <string name="MediaReviewFragment__too_many_items_selected">Too many items selected</string>
@@ -5487,7 +5583,7 @@
     <string name="StoryViewerFragment__s_s">%1$s %2$s</string>
     <!-- Displayed when viewing a post you sent -->
     <string name="StoryViewerPageFragment__you">Ikaw</string>
-    <!-- Displayed when viewing a post displayed to a group -->
+    <!-- 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 hanggang %2$s</string>
     <!-- Displayed when viewing a post from another user with no replies -->
     <string name="StoryViewerPageFragment__reply">Tugon</string>
@@ -6680,7 +6776,7 @@
     <!-- Title displayed at the top of the screen -->
     <string name="NicknameActivity__nickname">Nickname</string>
     <!-- Subtitle displayed under title -->
-    <string name="NicknameActivity__nicknames_amp_notes">Nicknames &amp; notes are stored with Signal and end-to-end encrypted. They are only visible to you.</string>
+    <string name="NicknameActivity__nicknames_amp_notes">Ang nicknames at notes ay nakatago sa Signal at end-to-end encrypted. Ikaw lang ang makakakita ng mga ito.</string>
     <!-- Field label for given name -->
     <string name="NicknameActivity__first_name">First name</string>
     <!-- Content description for first name clear button -->
@@ -6694,9 +6790,9 @@
     <!-- Button label to save -->
     <string name="NicknameActivity__save">I-save</string>
     <!-- Dialog title for note and name deletion -->
-    <string name="NicknameActivity__delete_nickname">Delete?</string>
+    <string name="NicknameActivity__delete_nickname">Gusto mo ba itong burahin?</string>
     <!-- Dialog message for note and name deletion -->
-    <string name="NicknameActivity__this_will_permanently_delete_this_nickname_and_note">This will permanently delete any nickname and note you’ve set.</string>
+    <string name="NicknameActivity__this_will_permanently_delete_this_nickname_and_note">Permanenteng buburahin nito ang inilagay mong nickname at note.</string>
 
     <!-- ViewNoteBottomSheetDialogFragment -->
     <!-- Sheet title -->
@@ -6704,5 +6800,26 @@
     <!-- Content description for opening the note editor -->
     <string name="ViewNoteSheet__edit_note">I-edit ang note</string>
 
+    <!-- BackupProgressService -->
+    <!-- Notification title shown while backup restore job is running -->
+    <string name="BackupProgressService_title">Nire-restore ang backup…</string>
+    <!-- Notification title shown while downloading backup restore data -->
+    <string name="BackupProgressService_title_downloading">Dina-download ang backup data…</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>
+    <!-- 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 -->
+    <string name="BackupsTypeSettingsFragment__google_pay">Google Pay</string>
+    <!-- Displayed as the user\'s payment method as a label in a preference row -->
+    <string name="BackupsTypeSettingsFragment__bank_transfer">Bank transfer</string>
+    <!-- Displayed as the user\'s payment method as a label in a preference row -->
+    <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>
+
+
     <!-- 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 7c55fe6302..98a17ad994 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -1,6 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- smartling.instruction_comments_enabled = on -->
-<resources>
+<?xml version="1.0" encoding="UTF-8"?><!-- 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> -->
@@ -89,6 +87,16 @@
     <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">Allow access to your location</string>
+    <!-- Dialog description that will explain the steps needed to give location permission -->
+    <string name="AttachmentManager_signal_to_send_location">To send your location:</string>
+    <!-- Alert dialog description asking for location permission -->
+    <string name="AttachmentManager_signal_allow_signal_access_location">Allow Molly access to send your location.</string>
+    <!-- Toast text explaining Signal\'s need for location access -->
+    <string name="AttachmentManager_signal_needs_location_access">Molly needs location access to send your location.</string>
+
     <!-- Alert dialog title to show the recipient has not activated payments -->
     <string name="AttachmentManager__not_activated_payments">%1$s, Ödemeleri etkinleştirmedi </string>
     <!-- Alert dialog description to send the recipient a request to activate payments -->
@@ -386,8 +394,16 @@
     <string name="ConversationActivity_your_request_to_join_has_been_sent_to_the_group_admin">Katılma isteğiniz grup yöneticisine gönderildi. İsteğiniz yanıtlandığı zaman haberdar edileceksiniz.</string>
     <string name="ConversationActivity_cancel_request">İsteği İptal Et</string>
 
-    <string name="ConversationActivity_to_send_audio_messages_allow_signal_access_to_your_microphone">Sesli ileti göndermek için Molly\'in mikrofonunuza erişmesine izin verin.</string>
+    <!-- Dialog title asking users for microphone permission -->
+    <string name="ConversationActivity_allow_access_microphone">Allow access to your microphone</string>
+    <!-- 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>
+    <!-- Toast text explaining Signal\'s need for microphone access -->
+    <string name="ConversationActivity_signal_needs_microphone_access_voice_message">Molly needs microphone access to record a voice message.</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">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>
@@ -411,10 +427,17 @@
     <string name="ConversationActivity_you_will_leave_this_group_and_it_will_be_deleted_from_all_of_your_devices">Bu gruptan ayrılacaksın ve grup tüm cihazlarından silinecek.</string>
     <string name="ConversationActivity_delete">Sil</string>
     <string name="ConversationActivity_delete_and_leave">Sil ve ayrıl</string>
-    <string name="ConversationActivity__to_call_s_signal_needs_access_to_your_microphone">%1$s ile arama yapmanız için Molly\'in mikrofonunuza erişime ihtiyacı var.</string>
+
+    <!-- Dialog description that will explain the steps needed to give microphone permissions for a voice call -->
+    <string name="ConversationActivity__to_start_call">To start a 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">To start a call, allow Molly access to your microphone.</string>
+    <!-- Toast text explaining Signal\'s need for microphone access for a voice call -->
+    <string name="ConversationActivity_signal_needs_microphone_access_voice_call">Molly needs microphone access to start a call.</string>
 
 
     <string name="ConversationActivity_join">Katıl</string>
+    <!-- Button text for an active group call but the call is currently full and unjoinable -->
     <string name="ConversationActivity_full">Dolu</string>
 
     <string name="ConversationActivity_error_sending_media">İçerik gönderilemedi</string>
@@ -613,6 +636,7 @@
     <string name="ConversationListFragment_unarchive">Çıkart</string>
     <string name="ConversationListFragment_delete">Sil</string>
     <string name="ConversationListFragment_select_all">Hepsini seç</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 seçili</item>
         <item quantity="other">%1$d seçili</item>
@@ -864,6 +888,7 @@
         <item quantity="one">Davet gönderildi</item>
         <item quantity="other">%1$d davet gönderildi</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">\"%1$s\" sizin tarafınızdan bu gruba otomatik olarak eklenemez.\n\nKatılmaları için davet gönderildi ve daveti kabul edene kadar hiçbir grup iletisini görmeyecekler.</string>
     <string name="GroupManagement_invite_multiple_users">Bu kullanıcılar otomatik olarak bu gruba eklenemez.\n\nKatılmaları için davet gönderildi ve daveti kabul edene kadar hiçbir grup iletisini görmeyecekler.</string>
 
@@ -1044,7 +1069,9 @@
 
     <string name="ManageGroupActivity_edit_name_and_picture">Adı ve resmi düzenleyin</string>
     <string name="ManageGroupActivity_legacy_group">Eski Grup</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">Bu bir Eski Gruptur. Grup yöneticisi gibi özellikler sadece Yeni Gruplarda mevcuttur.</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">Bu bir Eski Gruptur. Bahsedilmeler ve yöneticiler gibi özelliklere erişmek için,</string>
     <string name="ManageGroupActivity_legacy_group_too_large">Bu eski grup, boyutu çok büyük olduğu için Yeni Gruba yükseltilemiyor. Maksimum grup boyutu %1$d.</string>
     <string name="ManageGroupActivity_upgrade_this_group">bu grubu yükseltin.</string>
@@ -1271,6 +1298,7 @@
         <item quantity="other">Sil</item>
     </plurals>
 
+    <!-- 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 seçili (%2$s)</item>
         <item quantity="other">%1$d seçili (%2$s)</item>
@@ -1335,17 +1363,13 @@
     <string name="MessageRecord_left_group">Gruptan ayrıldınız.</string>
     <string name="MessageRecord_you_updated_group">Grubu güncellediniz.</string>
     <string name="MessageRecord_the_group_was_updated">Grup güncellendi</string>
-    <!-- Update message shown when placing an outgoing 1:1 voice/audio call and it\'s answered by the other party -->
+    <!-- Update message shown when placing an outgoing 1:1 voice/audio call -->
     <string name="MessageRecord_outgoing_voice_call">Giden sesli arama</string>
-    <!-- Update message shown when placing an outgoing 1:1 video call and it\'s answered by the other party -->
+    <!-- Update message shown when placing an outgoing 1:1 video call -->
     <string name="MessageRecord_outgoing_video_call">Giden görüntülü arama</string>
-    <!-- Update message shown when placing an outgoing 1:1 voice/audio call and it\'s not answered by the other party -->
-    <string name="MessageRecord_unanswered_voice_call">Cevapsız sesli arama</string>
-    <!-- Update message shown when placing an outgoing 1:1 video call and it\'s not answered by the other party -->
-    <string name="MessageRecord_unanswered_video_call">Cevapsız görüntülü arama</string>
-    <!-- Update message shown when receiving an incoming 1:1 voice/audio call and it\'s answered -->
+    <!-- Update message shown when receiving an incoming 1:1 voice/audio call and it\'s answered or ringing -->
     <string name="MessageRecord_incoming_voice_call">Gelen sesli arama</string>
-    <!-- Update message shown when receiving an incoming 1:1 video call and answered -->
+    <!-- Update message shown when receiving an incoming 1:1 video call and answered or ringing -->
     <string name="MessageRecord_incoming_video_call">Gelen görüntülü arama</string>
     <!-- Update message shown when receiving an incoming 1:1 voice/audio call and not answered -->
     <string name="MessageRecord_missed_voice_call">Cevapsız sesli arama</string>
@@ -1355,10 +1379,6 @@
     <string name="MessageRecord_missed_voice_call_notification_profile">Bildirim profili açıkken cevapsız sesli arama</string>
     <!-- Update message shown when receiving an incoming video call and declined due to notification profile -->
     <string name="MessageRecord_missed_video_call_notification_profile">Bildirim profili açıkken cevapsız görüntülü arama</string>
-    <!-- Update message shown when receiving an incoming 1:1 voice/audio call and explicitly declined -->
-    <string name="MessageRecord_you_declined_a_voice_call">Sesli aramayı reddettin</string>
-    <!-- Update message shown when receiving an incoming 1:1 video call and explicitly declined -->
-    <string name="MessageRecord_you_declined_a_video_call">Görüntülü aramayı reddettin</string>
     <!-- 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 grubu güncelledi.</string>
@@ -1567,28 +1587,53 @@
     <string name="MessageRecord_can_accept_payments">%1$s artık Ödemeleri kabul edebilir</string>
 
     <!-- Group Calling update messages -->
-    <string name="MessageRecord_s_started_a_group_call_s">%1$s grup araması başlattı · %2$s</string>
-    <string name="MessageRecord_you_started_a_group_call_s">Bir grup araması başlattın · %1$s</string>
-    <string name="MessageRecord_s_is_in_the_group_call_s">%1$s grup görüşmesinde· %2$s</string>
-    <string name="MessageRecord_you_are_in_the_group_call_s1">Grup görüşmesindesiniz · %1$s</string>
-    <string name="MessageRecord_s_and_s_are_in_the_group_call_s1">%1$s ve %2$s grup görüşmesinde · %3$s</string>
-    <string name="MessageRecord_group_call_s">Grup araması · %1$s</string>
-
-    <string name="MessageRecord_s_started_a_group_call">%1$s grup araması başlattı</string>
-    <string name="MessageRecord_you_started_a_group_call">Bir grup görüşmesi başlattınız</string>
-    <string name="MessageRecord_s_is_in_the_group_call">%1$s grup görüşmesinde</string>
-    <string name="MessageRecord_you_are_in_the_group_call">Grup görüşmesindesiniz</string>
-    <string name="MessageRecord_s_and_s_are_in_the_group_call">%1$s ve %2$s grup görüşmesinde</string>
-    <string name="MessageRecord_group_call">Grup görüşmesi</string>
+    <!-- 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 aramada · %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">Aramadasın · %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 ve %2$s aramada · %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 aramada</string>
+    <!-- Chat log text for an ongoing group call only the local user has joined -->
+    <string name="MessageRecord_you_are_in_the_call">Aramadasın</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 ve %2$s aramada</string>
+    <!-- Chat log text for a group call that ended within the last 5 minutes -->
+    <string name="MessageRecord__the_video_call_has_ended">Görüntülü arama sona erdi</string>
+    <!-- Chat log text for a group call that ended within the last 5 minutes with a placeholder for formatted time -->
+    <string name="MessageRecord__the_video_call_has_ended_s">Görüntülü arama sona erdi · %1$s</string>
+    <!-- Chat log text for a group call that ended more than 5 minutes ago and was missed -->
+    <string name="MessageRecord__missed_video_call">Cevapsız görüntülü arama</string>
+    <!-- Chat log text for a group call that ended more than 5 minutes ago and was missed with a placeholder for formatted time -->
+    <string name="MessageRecord__missed_video_call_s">Yanıtsız görüntülü arama · %1$s</string>
+    <!-- Chat log text for a group call that ended that the local user did not start -->
+    <string name="MessageRecord__incoming_video_call">Gelen görüntülü arama</string>
+    <!-- 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">Gelen görüntülü arama · %1$s</string>
+    <!-- Chat log text for a group call that ended that the local user started -->
+    <string name="MessageRecord__outgoing_video_call">Giden görüntülü arama</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">Giden görüntülü arama · %1$s</string>
+    <!-- Chat log text for an ongoing group call that the local user started -->
+    <string name="MessageRecord__you_started_a_video_call">Bir görüntülü arama başlattın</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">Bir görüntülü arama başlattın · %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 bir görüntülü arama başlattı</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 bir görüntülü arama başlattı · %2$s</string>
 
     <string name="MessageRecord_you">Siz</string>
 
-    <plurals name="MessageRecord_s_s_and_d_others_are_in_the_group_call_s">
+    <!-- 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, ve %3$d diğer kişi grup görüşmesinde · %4$s</item>
         <item quantity="other">%1$s, %2$s, ve %3$d diğer kişi grup görüşmesinde · %4$s</item>
     </plurals>
 
-    <plurals name="MessageRecord_s_s_and_d_others_are_in_the_group_call">
+    <!-- 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, ve %3$d diğer kişi grup görüşmesinde</item>
         <item quantity="other">%1$s, %2$s, ve %3$d diğer kişi grup görüşmesinde</item>
     </plurals>
@@ -2063,6 +2108,7 @@
     <!-- Generic error when the app is unable to request an SMS code for an unknown reason. -->
     <string name="RegistrationActivity_unable_to_request_verification_code">Doğrulama kodu istenemiyor. Lütfen ağ bağlantını kontrol edip tekrar dene.</string>
     <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">Molly Android - Telefon Numarası Formatı</string>
     <!--    Small "toast" notification to the user confirming that they have requested a new code via voice call.-->
@@ -2207,7 +2253,7 @@
     <string name="SubmitDebugLogActivity_this_log_will_be_posted_publicly_online_for_contributors">Bu günlük katkıda bulunanların görmesi için herkese açık bir şekilde paylaşılacaktır. Yüklemeden önce inceleyebilirsiniz.</string>
 
     <!-- SupportEmailUtil -->
-  <!-- Removed by excludeNonTranslatables <string name="SupportEmailUtil_support_email" translatable="false">support@molly.im</string> -->
+  <!-- Removed by excludeNonTranslatables <string name="SupportEmailUtil_support_email" translatable="false">support@signal.org</string> -->
     <string name="SupportEmailUtil_filter">Filtre:</string>
     <string name="SupportEmailUtil_device_info">Cihaz bilgisi:</string>
     <string name="SupportEmailUtil_android_version">Android sürümü:</string>
@@ -2709,6 +2755,8 @@
     <string name="ConversationUpdateItem_loading">Yükleniyor</string>
     <string name="ConversationUpdateItem_learn_more">Dahasını öğrenin</string>
     <string name="ConversationUpdateItem_join_call">Aramaya katıl</string>
+    <!-- Action button label for starting a new call in the current conversation -->
+    <string name="ConversationUpdateItem_call_back">Geri Ara</string>
     <string name="ConversationUpdateItem_return_to_call">Aramaya dön</string>
     <string name="ConversationUpdateItem_call_is_full">Arama dolu</string>
     <string name="ConversationUpdateItem_invite_friends">Arkadaşlarını davet et</string>
@@ -2773,6 +2821,7 @@
     <string name="safety_number_change_dialog__leave_call">Aramadan ayrıl</string>
     <string name="safety_number_change_dialog__the_following_people_may_have_reinstalled_or_changed_devices">Aşağıdaki kişiler cihaz değiştirmiş veya yeniden yükleme yapmış olabilir. Gizliliğinizden emin olmak için güvenlik numaranızı doğrulayın.</string>
     <string name="safety_number_change_dialog__view">Görüntüle</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">Daha önce doğrulandı</string>
 
     <!-- EnableCallNotificationSettingsDialog__call_notifications_checklist -->
@@ -3086,6 +3135,7 @@
 
     <string name="arrays__default">Varsayılan</string>
     <string name="arrays__high">Yüksek</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">En Yüksek</string>
 
     <!-- plurals.xml -->
@@ -3357,7 +3407,7 @@
     <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">Molly\'de Ödemeler artık mevcut değil. Yine de kambiyoya para aktarabilirsiniz ancak ödeme alıp gönderemez veya para ekleyemezsiniz.</string>
@@ -3406,6 +3456,14 @@
     <!-- Storage permission row description -->
     <string name="GrantPermissionsFragment__send_photos_videos_and_files">Cihazından fotoğraf, video ve dosya gönder.</string>
 
+    <!-- PermissionDeniedBottomSheet -->
+    <!-- Sheet describing step 1 on how to give permissions by opening settings -->
+    <string name="PermissionDeniedBottomSheet__1_tap_settings_below">1. Tap “Settings” below</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 Allow the permission</string>
+    <!-- Label for button at the bottom of the sheet which opens the system permission settings -->
+    <string name="PermissionDeniedBottomSheet__settings">Settings</string>
+
     <!-- PaymentsSecuritySetupFragment -->
     <!-- Toolbar title -->
     <string name="PaymentsSecuritySetupFragment__security_setup">Güvenlik kurulumu</string>
@@ -3446,6 +3504,7 @@
     <string name="PaymentsDetailsFragment__sent_to_s">%1$s\'ye gönderildi</string>
     <string name="PaymentsDetailsFragment__you_on_s_at_s">Siz %1$s tarihinde saat %2$s \'de</string>
     <string name="PaymentsDetailsFragment__s_on_s_at_s">%2$starihinde saat %3$s\'te %1$s</string>
+    <!-- Prefix to a name to indicate who a payment was sent to -->
     <string name="PaymentsDetailsFragment__to">Alıcı</string>
     <string name="PaymentsDetailsFragment__from">Gönderen</string>
     <string name="PaymentsDetailsFragment__information">Ödeme miktarı ve işlem zamanını da içeren işlem ayrıntıları MobileCoin hesap defterinin bir parçasıdır.</string>
@@ -3508,6 +3567,7 @@
     <string name="ConfirmPayment__confirm_payment">Ödemeyi onayla</string>
     <string name="ConfirmPayment__network_fee">Ağ ücreti</string>
     <string name="ConfirmPayment__estimated_s">Tahmini %1$s</string>
+    <!-- Prefix to a name to indicate who a payment will be sent to -->
     <string name="ConfirmPayment__to">Alıcı</string>
     <string name="ConfirmPayment__total_amount">Toplam tutar</string>
     <string name="ConfirmPayment__balance_s">Bakiye: %1$s</string>
@@ -3658,6 +3718,14 @@
     <string name="conversation_group_options__conversation">Sohbet</string>
     <string name="conversation_group_options__broadcast">Yayın</string>
 
+    <!-- DoubleTapEditEducationSheet -->
+    <!-- Displayed as the title of the education bottom sheet -->
+    <string name="DoubleTapEditEducationSheet__double_tap_edit_title">Double tap to edit</string>
+    <!-- Text on the sheet explaining how double tapping on a message will let them edit it -->
+    <string name="DoubleTapEditEducationSheet__quickly_tap_twice">Quickly tap twice on your messages to edit them. You can edit your messages up to 24hrs after they’ve been sent.</string>
+    <!-- Button label to dismiss sheet -->
+    <string name="DoubleTapEditEducationSheet__got_it">Got it</string>
+
     <!-- text_secure_normal -->
     <string name="text_secure_normal__menu_new_group">Yeni grup</string>
     <string name="text_secure_normal__menu_settings">Ayarlar</string>
@@ -4112,6 +4180,7 @@
     <string name="RecipientBottomSheet_copied_to_clipboard">Panoya kopyalandı</string>
 
     <string name="GroupRecipientListItem_admin">Yönetici</string>
+    <!-- Button text to approve a user that has requested to join a group -->
     <string name="GroupRecipientListItem_approve_description">Onayla</string>
     <string name="GroupRecipientListItem_deny_description">Reddet</string>
 
@@ -4139,6 +4208,7 @@
 
     <!-- VoiceNoteMediaDescriptionCompatFactory -->
     <string name="VoiceNoteMediaItemFactory__voice_message">Sesli ileti · %1$s</string>
+    <!-- This is a title in a banner describing the conversation sender to receiver placeholders of the currently playing voice memo. -->
     <string name="VoiceNoteMediaItemFactory__s_to_s">%1$s --&gt; %2$s</string>
 
     <!-- StorageUtil -->
@@ -4152,8 +4222,16 @@
     <string name="ReviewCardDialogFragment__review_members">Üyeleri incele</string>
     <!-- Title of a screen where the user will be prompted to review a message request matching the name of someone they already know -->
     <string name="ReviewCardDialogFragment__review_request">İsteği incele</string>
-    <string name="ReviewCardDialogFragment__d_group_members_have_the_same_name">%1$d grup üyesi aynı ada sahip, aşağıdan inceleyerek tercih yapabilirsiniz.</string>
-    <string name="ReviewCardDialogFragment__if_youre_not_sure">İsteğin kimden geldiğinden emin değilseniz, aşağıdaki kişileri inceleyerek tercih yapabilirsiniz.</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="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 -->
+    <plurals name="ReviewCardDialogFragment__if_youre_not_sure">
+        <item quantity="one">If you\'re not sure who the request is from, review the contact below and take action.</item>
+        <item quantity="other">If you\'re not sure who the request is from, review the contacts below and take action.</item>
+    </plurals>
     <string name="ReviewCardDialogFragment__no_other_groups_in_common">Başka ortak grup yok.</string>
     <string name="ReviewCardDialogFragment__no_groups_in_common">Ortak grup yok.</string>
     <plurals name="ReviewCardDialogFragment__d_other_groups_in_common">
@@ -4184,11 +4262,20 @@
     <string name="CallParticipantsListUpdatePopupWindow__s_joined">%1$s katıldı</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_and_s_joined">%1$s ve %2$s katıldı</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_s_and_s_joined">%1$s, %2$s ve %3$s katıldı</string>
-    <string name="CallParticipantsListUpdatePopupWindow__s_s_and_d_others_joined">%1$s, %2$s ve %3$d diğer kişi katıldı</string>
+    <!-- Toast message shown in group call when 3 or more people join -->
+    <plurals name="CallParticipantsListUpdatePopupWindow__s_s_and_d_others_joined">
+        <item quantity="one">%1$s, %2$s and %3$d other joined</item>
+        <item quantity="other">%1$s, %2$s and %3$d others joined</item>
+    </plurals>
+    <!-- Toast/popup text shown when someone leaves a group call -->
     <string name="CallParticipantsListUpdatePopupWindow__s_left">%1$s ayrıldı</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_and_s_left">%1$s ve %2$s ayrıldı</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_s_and_s_left">%1$s, %2$s ve %3$s ayrıldı</string>
-    <string name="CallParticipantsListUpdatePopupWindow__s_s_and_d_others_left">%1$s, %2$s ve %3$d diğer kişi ayrıldı</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 and %3$d other left</item>
+        <item quantity="other">%1$s, %2$s and %3$d others left</item>
+    </plurals>
 
     <string name="CallParticipant__you">Siz</string>
     <string name="CallParticipant__you_on_another_device">Siz (başka bir cihazda)</string>
@@ -4558,10 +4645,15 @@
 
     <!-- PrivacySettingsFragment -->
     <string name="PrivacySettingsFragment__blocked">Engellendi</string>
-    <string name="PrivacySettingsFragment__d_contacts">%1$d kişi</string>
+    <!-- Settings label that shows the number blocked contacts -->
+    <plurals name="PrivacySettingsFragment__d_contacts">
+        <item quantity="one">%1$d contact</item>
+        <item quantity="other">%1$d contacts</item>
+    </plurals>
     <string name="PrivacySettingsFragment__messaging">Yazışma</string>
     <string name="PrivacySettingsFragment__disappearing_messages">Kaybolan iletiler</string>
     <string name="PrivacySettingsFragment__app_security">Uygulama güvenliği</string>
+    <!-- This refers to the multi-tasking overview (recent apps) from the Android operating system.-->
     <string name="PrivacySettingsFragment__block_screenshots_in_the_recents_list_and_inside_the_app">Son kullanılanlar listesinde ve uygulama içinde ekran görüntüsü alınmasını engelle</string>
     <string name="PrivacySettingsFragment__signal_message_and_calls">Signal iletileri ve aramaları, arama aktarma ve gizli gönderici</string>
     <string name="PrivacySettingsFragment__default_timer_for_new_changes">Yeni sohbetler için varsayılan zamanlayıcı</string>
@@ -4618,11 +4710,14 @@
     <string name="DataAndStorageSettingsFragment__media_quality">İçerik kalitesi</string>
     <string name="DataAndStorageSettingsFragment__sent_media_quality">Gönderilen içerik kalitesi</string>
     <string name="DataAndStorageSettingsFragment__sending_high_quality_media_will_use_more_data">Yüksek kalitede içerik göndermek daha fazla veri kullanacaktır.</string>
+    <!-- Setting option that can be selected to default media to be sent as high quality by default -->
     <string name="DataAndStorageSettingsFragment__high">Yüksek</string>
+    <!-- Setting option that can be selected to default media to be sent as standard quality by default -->
     <string name="DataAndStorageSettingsFragment__standard">Standart</string>
     <string name="DataAndStorageSettingsFragment__calls">Aramalar</string>
 
     <!-- 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__use_custom_colors">Özel renkleri kullan</string>
     <string name="ChatColorSelectionFragment__chat_color">Sohbet rengi</string>
@@ -4834,6 +4929,7 @@
     <string name="AvatarPickerFragment__take_a_picture">Fotoğraf çekin</string>
     <string name="AvatarPickerFragment__choose_a_photo">Fotoğraf seçin</string>
     <string name="AvatarPickerFragment__photo">Fotoğraf</string>
+    <!-- Button label during avatar selection/creation that when tapped lets you generate an avatar from typed in text. -->
     <string name="AvatarPickerFragment__text">Yazı</string>
     <string name="AvatarPickerFragment__save">Kaydet</string>
     <string name="AvatarPickerFragment__clear_avatar">Avatarı sil</string>
@@ -4894,7 +4990,7 @@
     <string name="MediaReviewFragment__add_a_message">İleti ekle</string>
     <string name="MediaReviewFragment__add_a_reply">Yanıt ekle</string>
     <string name="MediaReviewFragment__send_to">Gönder:</string>
-    <string name="MediaReviewFragment__view_once_message">Tek görümlük ileti</string>
+    <string name="MediaReviewFragment__view_once_message">Bir kez görünür medya</string>
     <string name="MediaReviewFragment__one_or_more_items_were_too_large">Bir veya daha fazla öğe çok büyük</string>
     <string name="MediaReviewFragment__one_or_more_items_were_invalid">Bir veya daha fazla öğe çok geçersiz</string>
     <string name="MediaReviewFragment__too_many_items_selected">Çok fazla öğe seçildi</string>
@@ -5487,7 +5583,7 @@
     <string name="StoryViewerFragment__s_s">%1$s %2$s</string>
     <!-- Displayed when viewing a post you sent -->
     <string name="StoryViewerPageFragment__you">Siz</string>
-    <!-- Displayed when viewing a post displayed to a group -->
+    <!-- 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 -->
     <string name="StoryViewerPageFragment__reply">Cevapla</string>
@@ -6704,5 +6800,26 @@
     <!-- Content description for opening the note editor -->
     <string name="ViewNoteSheet__edit_note">Notu düzenle</string>
 
+    <!-- BackupProgressService -->
+    <!-- Notification title shown while backup restore job is running -->
+    <string name="BackupProgressService_title">Yedekleme geri yükleniyor…</string>
+    <!-- Notification title shown while downloading backup restore data -->
+    <string name="BackupProgressService_title_downloading">Yedekleme verileri indiriliyor…</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>
+    <!-- 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 -->
+    <string name="BackupsTypeSettingsFragment__google_pay">Google Pay</string>
+    <!-- Displayed as the user\'s payment method as a label in a preference row -->
+    <string name="BackupsTypeSettingsFragment__bank_transfer">Bank transfer</string>
+    <!-- Displayed as the user\'s payment method as a label in a preference row -->
+    <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>
+
+
     <!-- 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 85383f6711..75aa169ea1 100644
--- a/app/src/main/res/values-ug/strings.xml
+++ b/app/src/main/res/values-ug/strings.xml
@@ -1,6 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- smartling.instruction_comments_enabled = on -->
-<resources>
+<?xml version="1.0" encoding="UTF-8"?><!-- 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> -->
@@ -89,6 +87,16 @@
     <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">Allow access to your location</string>
+    <!-- Dialog description that will explain the steps needed to give location permission -->
+    <string name="AttachmentManager_signal_to_send_location">To send your location:</string>
+    <!-- Alert dialog description asking for location permission -->
+    <string name="AttachmentManager_signal_allow_signal_access_location">Allow Molly access to send your location.</string>
+    <!-- Toast text explaining Signal\'s need for location access -->
+    <string name="AttachmentManager_signal_needs_location_access">Molly needs location access to send your location.</string>
+
     <!-- Alert dialog title to show the recipient has not activated payments -->
     <string name="AttachmentManager__not_activated_payments">%1$s پۇل تۆلەش ئىقتىدارىنى تېخى ئاكتىپلىمىغان </string>
     <!-- Alert dialog description to send the recipient a request to activate payments -->
@@ -240,7 +248,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>
@@ -383,8 +391,16 @@
     <string name="ConversationActivity_your_request_to_join_has_been_sent_to_the_group_admin">قوشۇلۇش تەلىپىڭىز گۇرۇپپا باشقۇرغۇچىسىغا ئەۋەتىلدى. ئۇلار قارار قىلغاندا سىزگە ئۇقتۇرۇلىدۇ.</string>
     <string name="ConversationActivity_cancel_request">ئىلتىماستىن ۋاز كەچ</string>
 
-    <string name="ConversationActivity_to_send_audio_messages_allow_signal_access_to_your_microphone">ئۈنلىك ئۇچۇر يوللاش ئۈچۈن، Molly نىڭ مىكروفونىڭىزنى زىيارەت قىلىشىغا رۇخسەت قىلىڭ.</string>
+    <!-- Dialog title asking users for microphone permission -->
+    <string name="ConversationActivity_allow_access_microphone">Allow access to your microphone</string>
+    <!-- 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>
+    <!-- Toast text explaining Signal\'s need for microphone access -->
+    <string name="ConversationActivity_signal_needs_microphone_access_voice_message">Molly needs microphone access to record a voice message.</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 گە چاقىرىق قىلىش ئۈچۈن 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>
@@ -408,10 +424,17 @@
     <string name="ConversationActivity_you_will_leave_this_group_and_it_will_be_deleted_from_all_of_your_devices">بۇ گۇرۇپپىدىن چېكىنىپ چىقىسىز، شۇنداقلا بۇ گۇرۇپپا بارلىق ئۈسكۈنىلىرىڭىزدىن ئۆچۈرۈلىدۇ.</string>
     <string name="ConversationActivity_delete">ئۆچۈر</string>
     <string name="ConversationActivity_delete_and_leave">ئۆچۈر ۋە ئايرىل</string>
-    <string name="ConversationActivity__to_call_s_signal_needs_access_to_your_microphone">%1$sنى چاقىرىش ئۈچۈن Molly مىكروفونىڭىزنى ئىشلىتەلىشى كېرەك</string>
+
+    <!-- Dialog description that will explain the steps needed to give microphone permissions for a voice call -->
+    <string name="ConversationActivity__to_start_call">To start a 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">To start a call, allow Molly access to your microphone.</string>
+    <!-- Toast text explaining Signal\'s need for microphone access for a voice call -->
+    <string name="ConversationActivity_signal_needs_microphone_access_voice_call">Molly needs microphone access to start a call.</string>
 
 
     <string name="ConversationActivity_join">قوشۇل</string>
+    <!-- Button text for an active group call but the call is currently full and unjoinable -->
     <string name="ConversationActivity_full">توشتى</string>
 
     <string name="ConversationActivity_error_sending_media">ۋاسىتە ئەۋەتىش خاتالىقى</string>
@@ -597,6 +620,7 @@
     <string name="ConversationListFragment_unarchive">ئارخىپسىزلاش</string>
     <string name="ConversationListFragment_delete">ئۆچۈرۈش</string>
     <string name="ConversationListFragment_select_all">ھەممىنى تاللاش</string>
+    <!-- Screen title shown when selecting multiple items from a list like conversation threads or call logs. -->
     <plurals name="ConversationListFragment_s_selected">
         <item quantity="other">%1$d تاللانغان</item>
     </plurals>
@@ -845,6 +869,7 @@
     <plurals name="GroupManagement_invitation_sent">
         <item quantity="other">%1$d تەكلىپنامە يوللاندى</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">«%1$s» بۇ گۇرۇپپىغا سىز تەرىپىڭىزدىن ئاپتوماتىك قوشۇلمايدۇ. \n\nئۇلار قاتنىشىشقا تەكلىپ قىلىندى، ۋە ئۇلار تەكلىپنى قوبۇل قىلغۇچە گۇرۇپپا ئۇچۇرلىرىنى كۆرەلمەيدۇ.</string>
     <string name="GroupManagement_invite_multiple_users">بۇ ئەزالار بۇ گۇرۇپپىغا سىز تەرىپىڭىزدىن ئاپتوماتىك قوشۇلمايدۇ. \n\nئۇلار قاتنىشىشقا تەكلىپ قىلىندى، ۋە ئۇلار تەكلىپنى قوبۇل قىلغۇچە گۇرۇپپا ئۇچۇرلىرىنى كۆرەلمەيدۇ.</string>
 
@@ -1009,7 +1034,9 @@
 
     <string name="ManageGroupActivity_edit_name_and_picture">ئات ۋە باش سۈرەت تەھرىر</string>
     <string name="ManageGroupActivity_legacy_group">كونا گۇرۇپپا</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">بۇ كونا گۇرۇپپا، گۇرۇپپا باشقۇرغۇچىلىرىغا ئوخشاش ئىقتىدارلار يېڭى گۇرۇپپىدىلا ئىشلەيدۇ.</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">بۇ كونا گۇرۇپپا. @ئاتاش ۋە باشقۇرغۇچىلارغا ئوخشاش ئىقتىدارنى ئىشلىتىشتە،</string>
     <string name="ManageGroupActivity_legacy_group_too_large">بۇ كونا گۇرۇپپىنى يېڭى گۇرۇپپىغا يۈكسەلتەلمەيدۇ چۈنكى ئادەم بەك كۆپ. يۈكسەلتىشنىڭ ئەزا سان چېكى %1$d .</string>
     <string name="ManageGroupActivity_upgrade_this_group">بۇ گۇرۇپپىنى يۈكسەلتىدۇ.</string>
@@ -1227,6 +1254,7 @@
         <item quantity="other">ئۆچۈرۈش</item>
     </plurals>
 
+    <!-- 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="other">%1$d تاللانغان (%2$s)</item>
     </plurals>
@@ -1290,17 +1318,13 @@
     <string name="MessageRecord_left_group">سىز گۇرۇپپىدىن ئايرىلدىڭىز.</string>
     <string name="MessageRecord_you_updated_group">گۇرۇپپىنى يېڭىلىدىڭىز.</string>
     <string name="MessageRecord_the_group_was_updated">بۇ گۇرۇپپا يېڭىلاندى.</string>
-    <!-- Update message shown when placing an outgoing 1:1 voice/audio call and it\'s answered by the other party -->
+    <!-- Update message shown when placing an outgoing 1:1 voice/audio call -->
     <string name="MessageRecord_outgoing_voice_call">ئۇرۇلغان ئاۋازلىق چاقىرىق</string>
-    <!-- Update message shown when placing an outgoing 1:1 video call and it\'s answered by the other party -->
+    <!-- Update message shown when placing an outgoing 1:1 video call -->
     <string name="MessageRecord_outgoing_video_call">قوبۇل قىلىنغان ۋىدېيولۇق چاقىرىق</string>
-    <!-- Update message shown when placing an outgoing 1:1 voice/audio call and it\'s not answered by the other party -->
-    <string name="MessageRecord_unanswered_voice_call">جاۋابسىز ئاۋازلىق چاقىرىق</string>
-    <!-- Update message shown when placing an outgoing 1:1 video call and it\'s not answered by the other party -->
-    <string name="MessageRecord_unanswered_video_call">جاۋابسىز ۋىدېيولۇق چاقىرىق</string>
-    <!-- Update message shown when receiving an incoming 1:1 voice/audio call and it\'s answered -->
+    <!-- Update message shown when receiving an incoming 1:1 voice/audio call and it\'s answered or ringing -->
     <string name="MessageRecord_incoming_voice_call">كەلگەن ئاۋازلىق چاقىرىق</string>
-    <!-- Update message shown when receiving an incoming 1:1 video call and answered -->
+    <!-- Update message shown when receiving an incoming 1:1 video call and answered or ringing -->
     <string name="MessageRecord_incoming_video_call">كەلگەن ۋىدېيولۇق چاقىرىق</string>
     <!-- Update message shown when receiving an incoming 1:1 voice/audio call and not answered -->
     <string name="MessageRecord_missed_voice_call">ئېلىنمىغان ئاۋازلىق چاقىرىق</string>
@@ -1310,10 +1334,6 @@
     <string name="MessageRecord_missed_voice_call_notification_profile">ئۇقتۇرۇش ئارخىپى ئوچۇق ۋاقىتتا رەت قىلىنغان ئاۋازلىق چاقىرىق</string>
     <!-- Update message shown when receiving an incoming video call and declined due to notification profile -->
     <string name="MessageRecord_missed_video_call_notification_profile">ئۇقتۇرۇش ئارخىپى ئوچۇق ۋاقىتتا رەت قىلىنغان ۋىدېيولۇق چاقىرىق</string>
-    <!-- Update message shown when receiving an incoming 1:1 voice/audio call and explicitly declined -->
-    <string name="MessageRecord_you_declined_a_voice_call">بىر ئاۋازلىق چاقىرىقنى رەت قىلدىڭىز</string>
-    <!-- Update message shown when receiving an incoming 1:1 video call and explicitly declined -->
-    <string name="MessageRecord_you_declined_a_video_call">بىر ۋىدېيولۇق چاقىرىقنى رەت قىلدىڭىز</string>
     <!-- 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>
@@ -1514,27 +1534,52 @@
     <string name="MessageRecord_can_accept_payments">%1$s ئەمدى پۇل قوبۇل قىلالايدۇ</string>
 
     <!-- Group Calling update messages -->
-    <string name="MessageRecord_s_started_a_group_call_s">%1$s گۇرۇپپىغا چاقىرىشىنى باشلىدى. %2$s</string>
-    <string name="MessageRecord_you_started_a_group_call_s">سىز گۇرۇپپا چاقىرىقى باشلىدىڭىز · %1$s</string>
-    <string name="MessageRecord_s_is_in_the_group_call_s">%1$s گۇرۇپپا چاقىرىقىدا. %2$s</string>
-    <string name="MessageRecord_you_are_in_the_group_call_s1">سىز گۇرۇپپا چاقىرىقىدا. %1$s</string>
-    <string name="MessageRecord_s_and_s_are_in_the_group_call_s1">%1$s ۋە %2$s گۇرۇپپا چاقىرىقىدا. %3$s</string>
-    <string name="MessageRecord_group_call_s">گۇرۇپپا چاقىرىشى. %1$s</string>
-
-    <string name="MessageRecord_s_started_a_group_call">%1$s گۇرۇپپا چاقىرىقىنى باشلىدى.</string>
-    <string name="MessageRecord_you_started_a_group_call">سىز گۇرۇپپا چاقىرىقىنى باشلىدىڭىز</string>
-    <string name="MessageRecord_s_is_in_the_group_call">%1$s گۇرۇپپا چاقىرىقىدا</string>
-    <string name="MessageRecord_you_are_in_the_group_call">سىز بۇ گۇرۇپپا چاقىرىقىدا</string>
-    <string name="MessageRecord_s_and_s_are_in_the_group_call">%1$s ۋە %2$s گۇرۇپپا چاقىرىقىدا.</string>
-    <string name="MessageRecord_group_call">گۇرۇپپا چاقىرىقى</string>
+    <!-- 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 چاقىرىقتا · %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">سىز چاقىرىقتا · %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 ۋە %2$s چاقىرىقتا · %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 چاقىرىقتا</string>
+    <!-- Chat log text for an ongoing group call only the local user has joined -->
+    <string name="MessageRecord_you_are_in_the_call">سىز چاقىرىقتا</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 ۋە %2$s چاقىرىقتا</string>
+    <!-- Chat log text for a group call that ended within the last 5 minutes -->
+    <string name="MessageRecord__the_video_call_has_ended">ۋىدېيولۇق چاقىرىق ئاخىرلاشتى</string>
+    <!-- Chat log text for a group call that ended within the last 5 minutes with a placeholder for formatted time -->
+    <string name="MessageRecord__the_video_call_has_ended_s">ۋىدېيولۇق چاقىرىق ئاخىرلاشتى · %1$s</string>
+    <!-- Chat log text for a group call that ended more than 5 minutes ago and was missed -->
+    <string name="MessageRecord__missed_video_call">سۆزلەشمىگەن سىن چاقىرىش</string>
+    <!-- Chat log text for a group call that ended more than 5 minutes ago and was missed with a placeholder for formatted time -->
+    <string name="MessageRecord__missed_video_call_s">سۆزلەشمىگەن سىن چاقىرىش. %1$s</string>
+    <!-- Chat log text for a group call that ended that the local user did not start -->
+    <string name="MessageRecord__incoming_video_call">كەلگەن ۋىدېيولۇق چاقىرىق</string>
+    <!-- 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">كەلگەن ۋىدېيولۇق چاقىرىق · %1$s</string>
+    <!-- Chat log text for a group call that ended that the local user started -->
+    <string name="MessageRecord__outgoing_video_call">قوبۇل قىلىنغان ۋىدېيولۇق چاقىرىق</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">ئۇرۇلغان ۋىدېيولۇق چاقىرىق · %1$s</string>
+    <!-- Chat log text for an ongoing group call that the local user started -->
+    <string name="MessageRecord__you_started_a_video_call">بىر ۋىدېيولۇق چاقىرىق باشلىدىڭىز</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">بىر ۋىدېيولۇق چاقىرىق باشلىدىڭىز · %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 ۋىدېيولۇق چاقىرىق باشلىدى</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 ۋىدېيولۇق چاقىرىق باشلىدى · %2$s</string>
 
     <string name="MessageRecord_you">سىز</string>
 
-    <plurals name="MessageRecord_s_s_and_d_others_are_in_the_group_call_s">
+    <!-- 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="other">%1$s، %2$s ۋە باشقا %3$d ئەزا گۇرۇپپا چاقىرىقى · «%4$s» دا</item>
     </plurals>
 
-    <plurals name="MessageRecord_s_s_and_d_others_are_in_the_group_call">
+    <!-- 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="other">%1$s، %2$s ۋە باشقا %3$d ئەزا گۇرۇپپا چاقىرىقىدا</item>
     </plurals>
 
@@ -1984,6 +2029,7 @@
     <!-- Generic error when the app is unable to request an SMS code for an unknown reason. -->
     <string name="RegistrationActivity_unable_to_request_verification_code">دەلىللەش كودى تەلەپ قىلالمىدى. تور ئۇلىنىشىنى تەكشۈرۈپ قايتا سىناڭ.</string>
     <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">Molly Android - تېلېفون نومۇرى فورماتى</string>
     <!--    Small "toast" notification to the user confirming that they have requested a new code via voice call.-->
@@ -2127,7 +2173,7 @@
     <string name="SubmitDebugLogActivity_this_log_will_be_posted_publicly_online_for_contributors">بۇ خاتىرە تۆھپىكارلارنىڭ كۆرۈشى ئۈچۈن توردا ئاشكارا ئېلان قىلىنىدۇ، يوللاشتىن ئىلگىرى مەزكۇر خاتىرەنى تەكشۈرۈپ ۋە تەھرىرلىيەلەيسىز.</string>
 
     <!-- SupportEmailUtil -->
-  <!-- Removed by excludeNonTranslatables <string name="SupportEmailUtil_support_email" translatable="false">support@molly.im</string> -->
+  <!-- Removed by excludeNonTranslatables <string name="SupportEmailUtil_support_email" translatable="false">support@signal.org</string> -->
     <string name="SupportEmailUtil_filter">سۈزگۈچ:</string>
     <string name="SupportEmailUtil_device_info">ئۈسكۈنە ئۇچۇرى:</string>
     <string name="SupportEmailUtil_android_version">Android نەشرى</string>
@@ -2622,6 +2668,8 @@
     <string name="ConversationUpdateItem_loading">يۈكلەۋاتىدۇ</string>
     <string name="ConversationUpdateItem_learn_more">كۆپرەك ئۆگىنىش</string>
     <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_call_is_full">چاقىرىق توشتى</string>
     <string name="ConversationUpdateItem_invite_friends">دوستلىرىڭىزنى تەكلىپ قىلىڭ</string>
@@ -2686,6 +2734,7 @@
     <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>
 
     <!-- EnableCallNotificationSettingsDialog__call_notifications_checklist -->
@@ -2992,6 +3041,7 @@
 
     <string name="arrays__default">كۆڭۈلدىكى</string>
     <string name="arrays__high">يۇقىرى</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">ئەڭ يۇقىرى</string>
 
     <!-- plurals.xml -->
@@ -3260,7 +3310,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">‫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">‫Molly دا چىقىم ئەمدى ئىشلىمەيدۇ. سىز مەبلەغلىرىڭىزنى ئالماشتۇرۇش ئورنىغا داۋاملىق يۆتكىيەلەيسىز. ئەمما ئەمدى چىقىمنى يوللاپ ۋە تاپشۇرىۋالالمايسىز ياكى مەبلەغ قوشالمايسىز.</string>
@@ -3309,6 +3359,14 @@
     <!-- Storage permission row description -->
     <string name="GrantPermissionsFragment__send_photos_videos_and_files">ئۈسكۈنىڭىزدىن رەسىم ، سىن ۋە ھۆججەتلەرنى ئەۋەتىڭ.</string>
 
+    <!-- PermissionDeniedBottomSheet -->
+    <!-- Sheet describing step 1 on how to give permissions by opening settings -->
+    <string name="PermissionDeniedBottomSheet__1_tap_settings_below">1. Tap “Settings” below</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 Allow the permission</string>
+    <!-- Label for button at the bottom of the sheet which opens the system permission settings -->
+    <string name="PermissionDeniedBottomSheet__settings">Settings</string>
+
     <!-- PaymentsSecuritySetupFragment -->
     <!-- Toolbar title -->
     <string name="PaymentsSecuritySetupFragment__security_setup">بىخەتەرلىك تەڭشىكى</string>
@@ -3349,6 +3407,7 @@
     <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__information">چىقىم سوممىسى ۋە مۇئامىلە ۋاقتىنى ئۆز ئىچىگە ئالغان مۇئامىلە تەپسىلاتلىرى MobileCoin  ھېسابات دەپتىرىنىڭ بىر قىسمى.</string>
@@ -3411,6 +3470,7 @@
     <string name="ConfirmPayment__confirm_payment">چىقىمنى جەزىملە</string>
     <string name="ConfirmPayment__network_fee">تور ھەققى</string>
     <string name="ConfirmPayment__estimated_s">مۆلچەرلەندى%1$s</string>
+    <!-- Prefix to a name to indicate who a payment will be sent to -->
     <string name="ConfirmPayment__to">كىمگە</string>
     <string name="ConfirmPayment__total_amount">جەمئىي سومما</string>
     <string name="ConfirmPayment__balance_s">قالدۇق: %1$s</string>
@@ -3559,6 +3619,14 @@
     <string name="conversation_group_options__conversation">پاراڭ</string>
     <string name="conversation_group_options__broadcast">تارقىتىش</string>
 
+    <!-- DoubleTapEditEducationSheet -->
+    <!-- Displayed as the title of the education bottom sheet -->
+    <string name="DoubleTapEditEducationSheet__double_tap_edit_title">Double tap to edit</string>
+    <!-- Text on the sheet explaining how double tapping on a message will let them edit it -->
+    <string name="DoubleTapEditEducationSheet__quickly_tap_twice">Quickly tap twice on your messages to edit them. You can edit your messages up to 24hrs after they’ve been sent.</string>
+    <!-- Button label to dismiss sheet -->
+    <string name="DoubleTapEditEducationSheet__got_it">Got it</string>
+
     <!-- text_secure_normal -->
     <string name="text_secure_normal__menu_new_group">يېڭى گۇرۇپپا</string>
     <string name="text_secure_normal__menu_settings">تەڭشەكلەر</string>
@@ -4006,6 +4074,7 @@
     <string name="RecipientBottomSheet_copied_to_clipboard">چاپلاش تاختىسىغا كۆچۈردى</string>
 
     <string name="GroupRecipientListItem_admin">باشقۇرغۇچى</string>
+    <!-- Button text to approve a user that has requested to join a group -->
     <string name="GroupRecipientListItem_approve_description">تەستىقلا</string>
     <string name="GroupRecipientListItem_deny_description">رەت قىلىش</string>
 
@@ -4033,6 +4102,7 @@
 
     <!-- VoiceNoteMediaDescriptionCompatFactory -->
     <string name="VoiceNoteMediaItemFactory__voice_message">ئاۋازلىق ئۇچۇر· %1$s</string>
+    <!-- This is a title in a banner describing the conversation sender to receiver placeholders of the currently playing voice memo. -->
     <string name="VoiceNoteMediaItemFactory__s_to_s">%1$s دىن%2$s غىچە</string>
 
     <!-- StorageUtil -->
@@ -4046,8 +4116,14 @@
     <string name="ReviewCardDialogFragment__review_members">ئەزالارنى تەكشۈر</string>
     <!-- Title of a screen where the user will be prompted to review a message request matching the name of someone they already know -->
     <string name="ReviewCardDialogFragment__review_request">ئىلتىماسنى تەكشۈر</string>
-    <string name="ReviewCardDialogFragment__d_group_members_have_the_same_name">%1$d گۇرۇپپا ئەزاسىنىڭ ئوخشاش ئىسمى بار ئىكەن. تۆۋەندىكىلەرنى كۆزدىن كەچۈرۈڭ، بىر مەشغۇلات تاللاڭ.</string>
-    <string name="ReviewCardDialogFragment__if_youre_not_sure">ئىلتىماسنىڭ نەدىن كەلگەنلىكىنى جەزملەشتۈرەلمىسىڭىز، ئاستىدىكى ئالاقەداشلارنى كۆزدىن كەچۈرۈڭ ۋە مەشغۇلات قىلىڭ.</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="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 -->
+    <plurals name="ReviewCardDialogFragment__if_youre_not_sure">
+        <item quantity="other">If you\'re not sure who the request is from, review the contacts below and take action.</item>
+    </plurals>
     <string name="ReviewCardDialogFragment__no_other_groups_in_common">باشقا ئورتاق گۇرۇپپا يوق</string>
     <string name="ReviewCardDialogFragment__no_groups_in_common">ئورتاق گۇرۇپپا يوق.</string>
     <plurals name="ReviewCardDialogFragment__d_other_groups_in_common">
@@ -4076,11 +4152,18 @@
     <string name="CallParticipantsListUpdatePopupWindow__s_joined">%1$s قېتىلدى</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_and_s_joined">%1$s بىلەن%2$s قېتىلدى</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_s_and_s_joined">%1$s، %2$s ۋە%3$s قېتىلدى</string>
-    <string name="CallParticipantsListUpdatePopupWindow__s_s_and_d_others_joined">%1$s، %2$s ۋە%3$d باشقىلار قېتىلدى</string>
+    <!-- Toast message shown in group call when 3 or more people join -->
+    <plurals name="CallParticipantsListUpdatePopupWindow__s_s_and_d_others_joined">
+        <item quantity="other">%1$s, %2$s and %3$d others joined</item>
+    </plurals>
+    <!-- Toast/popup text shown when someone leaves a group call -->
     <string name="CallParticipantsListUpdatePopupWindow__s_left">%1$s ئايرىلدى</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_and_s_left">%1$s ۋە%2$s ئايرىلدى</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_s_and_s_left">%1$s، %2$s ۋە%3$s ئايرىلدى</string>
-    <string name="CallParticipantsListUpdatePopupWindow__s_s_and_d_others_left">%1$s، %2$s ۋە%3$d باشقىلار ئايرىلدى</string>
+    <!-- Toast message shown in group call when 3 or more people leave -->
+    <plurals name="CallParticipantsListUpdatePopupWindow__s_s_and_d_others_left">
+        <item quantity="other">%1$s, %2$s and %3$d others left</item>
+    </plurals>
 
     <string name="CallParticipant__you">سىز</string>
     <string name="CallParticipant__you_on_another_device">سىز (يەنە بىر ئۈسكۈنىدە)</string>
@@ -4448,10 +4531,14 @@
 
     <!-- PrivacySettingsFragment -->
     <string name="PrivacySettingsFragment__blocked">چەكلەندى</string>
-    <string name="PrivacySettingsFragment__d_contacts">%1$d ئالاقەداش</string>
+    <!-- Settings label that shows the number blocked contacts -->
+    <plurals name="PrivacySettingsFragment__d_contacts">
+        <item quantity="other">%1$d contacts</item>
+    </plurals>
     <string name="PrivacySettingsFragment__messaging">ئۇچۇرلىشىش</string>
     <string name="PrivacySettingsFragment__disappearing_messages">غايىب ئۇچۇرلار</string>
     <string name="PrivacySettingsFragment__app_security">ئەپ بىخەتەرلىكى</string>
+    <!-- This refers to the multi-tasking overview (recent apps) from the Android operating system.-->
     <string name="PrivacySettingsFragment__block_screenshots_in_the_recents_list_and_inside_the_app">خاتىرىلەش تىزىملىكى ۋە ئەپ ئىچىدە ئېكران كەسمە رەسىمگە ئېلىشنى چەكلەيدۇ</string>
     <string name="PrivacySettingsFragment__signal_message_and_calls">Signal ئۇچۇر ۋە چاقىرىقنى ھەمىشە چاقىرىق ۋە يوشۇرۇن ئەۋەتكۈچىگە ئۇلاپ يەتكۈزىدۇ</string>
     <string name="PrivacySettingsFragment__default_timer_for_new_changes">يېڭى پاراڭلار ئۈچۈن سۈكۈتتىكى ۋاقىت خاتىرىلىگۈچ</string>
@@ -4508,11 +4595,14 @@
     <string name="DataAndStorageSettingsFragment__media_quality">ۋاسىتە سۈپىتى</string>
     <string name="DataAndStorageSettingsFragment__sent_media_quality">ۋاسىتە سۈپىتىنى ئەۋەت</string>
     <string name="DataAndStorageSettingsFragment__sending_high_quality_media_will_use_more_data">يۇقىرى سۈپەتلىك ۋاسىتە يوللىسىڭىز كۆپرەك مەلۇمات ئىشلىتىسىز</string>
+    <!-- Setting option that can be selected to default media to be sent as high quality by default -->
     <string name="DataAndStorageSettingsFragment__high">يۇقىرى</string>
+    <!-- Setting option that can be selected to default media to be sent as standard quality by default -->
     <string name="DataAndStorageSettingsFragment__standard">ئۆلچەملىك</string>
     <string name="DataAndStorageSettingsFragment__calls">چاقىرىشلار</string>
 
     <!-- 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__use_custom_colors">ئىختىيارىچە رەڭ ئىشلەت</string>
     <string name="ChatColorSelectionFragment__chat_color">پاراڭ رەڭگى</string>
@@ -4721,6 +4811,7 @@
     <string name="AvatarPickerFragment__take_a_picture">رەسىم تارت</string>
     <string name="AvatarPickerFragment__choose_a_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>
     <string name="AvatarPickerFragment__clear_avatar">سىمانى تازىلا</string>
@@ -4777,7 +4868,7 @@
     <string name="MediaReviewFragment__add_a_message">بىز ئۇچۇر قوش</string>
     <string name="MediaReviewFragment__add_a_reply">جاۋاپ قوش</string>
     <string name="MediaReviewFragment__send_to">تاپشۇرۇۋالغۇچى</string>
-    <string name="MediaReviewFragment__view_once_message">بىرلا كۆرسەت ئۇچۇر</string>
+    <string name="MediaReviewFragment__view_once_message">بىرلا قېتىم كۆرۈلىدىغان مېدىيا</string>
     <string name="MediaReviewFragment__one_or_more_items_were_too_large">بىر ياكى كۆپ تۈرنىڭ ھەجىمى بەك چوڭ</string>
     <string name="MediaReviewFragment__one_or_more_items_were_invalid">بىر ياكى كۆپ تۈر ئىناۋەتسىز</string>
     <string name="MediaReviewFragment__too_many_items_selected">تاللانغان تۈر زىيادە كۆپ</string>
@@ -5365,7 +5456,7 @@
     <string name="StoryViewerFragment__s_s">%1$s %2$s</string>
     <!-- Displayed when viewing a post you sent -->
     <string name="StoryViewerPageFragment__you">سىز</string>
-    <!-- Displayed when viewing a post displayed to a group -->
+    <!-- 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 -->
     <string name="StoryViewerPageFragment__reply">جاۋاب</string>
@@ -6534,7 +6625,7 @@
     <!-- Title displayed at the top of the screen -->
     <string name="NicknameActivity__nickname">لەقەم</string>
     <!-- Subtitle displayed under title -->
-    <string name="NicknameActivity__nicknames_amp_notes">Nicknames &amp; notes are stored with Signal and end-to-end encrypted. They are only visible to you.</string>
+    <string name="NicknameActivity__nicknames_amp_notes">لەقەم ۋە خاتىرىلەر Signal ئۇچتىن ئۇچقا مەخپىيلەشتۈرۈلگەن ھالدا ساقلىنىدۇ. ئۇلارنى پەقەت سىز كۆرەلەيسىز.</string>
     <!-- Field label for given name -->
     <string name="NicknameActivity__first_name">ئات</string>
     <!-- Content description for first name clear button -->
@@ -6548,9 +6639,9 @@
     <!-- Button label to save -->
     <string name="NicknameActivity__save">ساقلاش</string>
     <!-- Dialog title for note and name deletion -->
-    <string name="NicknameActivity__delete_nickname">Delete?</string>
+    <string name="NicknameActivity__delete_nickname">ئۆچۈرەمسىز؟</string>
     <!-- Dialog message for note and name deletion -->
-    <string name="NicknameActivity__this_will_permanently_delete_this_nickname_and_note">This will permanently delete any nickname and note you’ve set.</string>
+    <string name="NicknameActivity__this_will_permanently_delete_this_nickname_and_note">بۇ مەشغۇلات سىز تەڭشىگەن بارلىق لەقەم ۋە خاتىرىلەرنى مەڭگۈلۈك ئۆچۈرىدۇ.</string>
 
     <!-- ViewNoteBottomSheetDialogFragment -->
     <!-- Sheet title -->
@@ -6558,5 +6649,26 @@
     <!-- Content description for opening the note editor -->
     <string name="ViewNoteSheet__edit_note">خاتىرە تەھرىرلەش</string>
 
+    <!-- BackupProgressService -->
+    <!-- Notification title shown while backup restore job is running -->
+    <string name="BackupProgressService_title">زاپاسنى ئەسلىگە قايتۇرۇۋاتىدۇ…</string>
+    <!-- Notification title shown while downloading backup restore data -->
+    <string name="BackupProgressService_title_downloading">زاپاس سانلىق مەلۇماتنى چۈشۈرۈۋاتىدۇ…</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>
+    <!-- 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 -->
+    <string name="BackupsTypeSettingsFragment__google_pay">Google Pay</string>
+    <!-- Displayed as the user\'s payment method as a label in a preference row -->
+    <string name="BackupsTypeSettingsFragment__bank_transfer">Bank transfer</string>
+    <!-- Displayed as the user\'s payment method as a label in a preference row -->
+    <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>
+
+
     <!-- 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 067e5f196c..3e0387196b 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -1,6 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- smartling.instruction_comments_enabled = on -->
-<resources>
+<?xml version="1.0" encoding="UTF-8"?><!-- 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> -->
@@ -46,7 +44,7 @@
     <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>
+    <string name="ApplicationPreferencesActivity_pins_are_required_for_registration_lock">PIN-коди необхідні для блокування реєстрації. Для вимкнення PIN-кодів спершу необхідно вимкнути блокування реєстрації.</string>
     <string name="ApplicationPreferencesActivity_pin_created">PIN створений.</string>
     <string name="ApplicationPreferencesActivity_pin_disabled">PIN вимкнений.</string>
     <string name="ApplicationPreferencesActivity_record_payments_recovery_phrase">Записати кодову фразу для платежів</string>
@@ -89,6 +87,16 @@
     <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">Allow access to your location</string>
+    <!-- Dialog description that will explain the steps needed to give location permission -->
+    <string name="AttachmentManager_signal_to_send_location">To send your location:</string>
+    <!-- Alert dialog description asking for location permission -->
+    <string name="AttachmentManager_signal_allow_signal_access_location">Allow Molly access to send your location.</string>
+    <!-- Toast text explaining Signal\'s need for location access -->
+    <string name="AttachmentManager_signal_needs_location_access">Molly needs location access to send your location.</string>
+
     <!-- Alert dialog title to show the recipient has not activated payments -->
     <string name="AttachmentManager__not_activated_payments">%1$s не активував/-ла платежі </string>
     <!-- Alert dialog description to send the recipient a request to activate payments -->
@@ -243,7 +251,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>
@@ -392,13 +400,21 @@
     <string name="ConversationActivity_your_request_to_join_has_been_sent_to_the_group_admin">Ваш запит на приєднання надіслано до адміністраторів групи. Ви отримаєте повідомлення, коли вони відреагують.</string>
     <string name="ConversationActivity_cancel_request">Відкликати запит</string>
 
-    <string name="ConversationActivity_to_send_audio_messages_allow_signal_access_to_your_microphone">Щоб надсилати аудіоповідомлення, надайте Molly доступ до мікрофона.</string>
+    <!-- Dialog title asking users for microphone permission -->
+    <string name="ConversationActivity_allow_access_microphone">Allow access to your microphone</string>
+    <!-- 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>
+    <!-- Toast text explaining Signal\'s need for microphone access -->
+    <string name="ConversationActivity_signal_needs_microphone_access_voice_message">Molly needs microphone access to record a voice message.</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">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_enable_the_microphone_permission_to_capture_videos_with_sound">Надайте доступ до мікрофона, щоб записувати відео зі звуком.</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>
 
@@ -417,10 +433,17 @@
     <string name="ConversationActivity_you_will_leave_this_group_and_it_will_be_deleted_from_all_of_your_devices">Ви покинете цю групу, та її буде видалено з усіх ваших пристроїв.</string>
     <string name="ConversationActivity_delete">Видалити</string>
     <string name="ConversationActivity_delete_and_leave">Видалити і покинути</string>
-    <string name="ConversationActivity__to_call_s_signal_needs_access_to_your_microphone">Щоб зателефонувати %1$s, Molly має отримати доступ до мікрофона</string>
+
+    <!-- Dialog description that will explain the steps needed to give microphone permissions for a voice call -->
+    <string name="ConversationActivity__to_start_call">To start a 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">To start a call, allow Molly access to your microphone.</string>
+    <!-- Toast text explaining Signal\'s need for microphone access for a voice call -->
+    <string name="ConversationActivity_signal_needs_microphone_access_voice_call">Molly needs microphone access to start a call.</string>
 
 
     <string name="ConversationActivity_join">Приєднатись</string>
+    <!-- Button text for an active group call but the call is currently full and unjoinable -->
     <string name="ConversationActivity_full">Переповнено</string>
 
     <string name="ConversationActivity_error_sending_media">Помилка відправлення медіа</string>
@@ -645,6 +668,7 @@
     <string name="ConversationListFragment_unarchive">Розархівувати</string>
     <string name="ConversationListFragment_delete">Видалити</string>
     <string name="ConversationListFragment_select_all">Вибрати все</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 обрано</item>
         <item quantity="few">%1$d обрано</item>
@@ -738,8 +762,8 @@
     <string name="BackupsPreferenceFragment__backup_time">Час резервного копіювання</string>
     <string name="BackupsPreferenceFragment__verify_backup_passphrase">Перевірити парольну фразу резервної копії</string>
     <string name="BackupsPreferenceFragment__test_your_backup_passphrase">Випробуйте парольну фразу своєї резервної копії і переконайтеся, що вона збігається</string>
-    <string name="BackupsPreferenceFragment__turn_on">Відключити Блокування Реєстрації?</string>
-    <string name="BackupsPreferenceFragment__turn_off">Відключити</string>
+    <string name="BackupsPreferenceFragment__turn_on">Увімкнути</string>
+    <string name="BackupsPreferenceFragment__turn_off">Вимкнути</string>
     <string name="BackupsPreferenceFragment__to_restore_a_backup">"Щоб відновити з резервної копії, встановіть нову копію Molly. Відкрийте програму та натисніть \"Відновити резервну копію\", потім виберіть файл резервної копії. %1$s"</string>
     <string name="BackupsPreferenceFragment__learn_more">Дізнатися більше</string>
     <string name="BackupsPreferenceFragment__in_progress">В процесі…</string>
@@ -828,8 +852,8 @@
 
     <!-- DeviceListItem -->
     <string name="DeviceListItem_unnamed_device">Неназваний пристрій</string>
-    <string name="DeviceListItem_linked_s">З\'язано %1$s</string>
-    <string name="DeviceListItem_last_active_s">Остання активність %1$s</string>
+    <string name="DeviceListItem_linked_s">Зв\'язано %1$s</string>
+    <string name="DeviceListItem_last_active_s">Остання активність: %1$s</string>
     <string name="DeviceListItem_today">Сьогодні</string>
 
     <!-- DocumentView -->
@@ -902,6 +926,7 @@
         <item quantity="many">Надіслано %1$d запрошень</item>
         <item quantity="other">Надіслано %1$d запрошення</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">Ви не можете автоматично додати \"%1$s\" в цю групу.\n\nЙому (їй) було відправлено запрошення приєднатися, і він (-а) не побачить повідомлення в групі, поки не прийме запрошення.</string>
     <string name="GroupManagement_invite_multiple_users">Ви не можете автоматично додати цих користувачів до цієї групи.\n\nЇм було відправлено запрошення приєднатися, і вони не побачать повідомлення в групі, поки не приймуть запрошення.</string>
 
@@ -999,7 +1024,7 @@
     <string name="LeaveGroupDialog_choose_admin">Вибрати адміністратора</string>
 
     <!-- LinkPreviewView -->
-    <string name="LinkPreviewView_no_link_preview_available">Немає попереднього перегляду посилання</string>
+    <string name="LinkPreviewView_no_link_preview_available">Попередній вигляд вебсторінки недоступний</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 -->
@@ -1114,7 +1139,9 @@
 
     <string name="ManageGroupActivity_edit_name_and_picture">Редагувати назву та картинку</string>
     <string name="ManageGroupActivity_legacy_group">Спадкована Група</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">Це Застаріла Група. Такі функції, як адміністратори груп, доступні тільки для Нових Груп.</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">Це Застаріла Група. Щоб отримати доступ до таких функцій, як @згадування і адміністратори груп,</string>
     <string name="ManageGroupActivity_legacy_group_too_large">Ця Застаріла Група не може бути оновлена до Нової Групи, тому що вона занадто велика. Максимальний розмір групи це - %1$d.</string>
     <string name="ManageGroupActivity_upgrade_this_group">оновити цю групу.</string>
@@ -1125,7 +1152,7 @@
 
     <!-- GroupMentionSettingDialog -->
     <string name="GroupMentionSettingDialog_notify_me_for_mentions">Сповіщати мене про згадування</string>
-    <string name="GroupMentionSettingDialog_receive_notifications_when_youre_mentioned_in_muted_chats">Отримувати сповіщення, якщо вас згадали в чатах із вимкнутими сповіщеннями?</string>
+    <string name="GroupMentionSettingDialog_receive_notifications_when_youre_mentioned_in_muted_chats">Отримувати сповіщення, коли вас згадують, навіть якщо сповіщення від чату вимкнено?</string>
     <string name="GroupMentionSettingDialog_always_notify_me">Завжди сповіщати</string>
     <string name="GroupMentionSettingDialog_dont_notify_me">Не сповіщати</string>
 
@@ -1337,10 +1364,10 @@
     <string name="MediaOverviewActivity_Media_delete_progress_title">Видалення</string>
     <string name="MediaOverviewActivity_Media_delete_progress_message">Видалення повідомлень…</string>
     <string name="MediaOverviewActivity_collecting_attachments">Збираю вкладення…</string>
-    <string name="MediaOverviewActivity_Sort_by">Сортувати як</string>
-    <string name="MediaOverviewActivity_Newest">Новіші</string>
-    <string name="MediaOverviewActivity_Oldest">Старіші</string>
-    <string name="MediaOverviewActivity_Storage_used">Використання сховища</string>
+    <string name="MediaOverviewActivity_Sort_by">Сортування</string>
+    <string name="MediaOverviewActivity_Newest">Найновіші</string>
+    <string name="MediaOverviewActivity_Oldest">Найдавніші</string>
+    <string name="MediaOverviewActivity_Storage_used">Розмір</string>
     <string name="MediaOverviewActivity_All_storage_use">Загальне використання сховища</string>
     <string name="MediaOverviewActivity_Grid_view_description">Сітка</string>
     <string name="MediaOverviewActivity_List_view_description">Список</string>
@@ -1359,6 +1386,7 @@
         <item quantity="other">Видалити</item>
     </plurals>
 
+    <!-- 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 обрав (%2$s)</item>
         <item quantity="few">%1$d обрав (%2$s)</item>
@@ -1379,7 +1407,7 @@
 
     <!-- Megaphones -->
     <string name="Megaphones_remind_me_later">Нагадати пізніше</string>
-    <string name="Megaphones_verify_your_signal_pin">Підтвердіть свій PIN-код Signal</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>
@@ -1425,17 +1453,13 @@
     <string name="MessageRecord_left_group">Ви покинули групу.</string>
     <string name="MessageRecord_you_updated_group">Ви оновили групу.</string>
     <string name="MessageRecord_the_group_was_updated">Групу оновлено.</string>
-    <!-- Update message shown when placing an outgoing 1:1 voice/audio call and it\'s answered by the other party -->
+    <!-- Update message shown when placing an outgoing 1:1 voice/audio call -->
     <string name="MessageRecord_outgoing_voice_call">Вихідний голосовий виклик</string>
-    <!-- Update message shown when placing an outgoing 1:1 video call and it\'s answered by the other party -->
+    <!-- Update message shown when placing an outgoing 1:1 video call -->
     <string name="MessageRecord_outgoing_video_call">Вихідний відеовиклик</string>
-    <!-- Update message shown when placing an outgoing 1:1 voice/audio call and it\'s not answered by the other party -->
-    <string name="MessageRecord_unanswered_voice_call">Голосовий виклик без відповіді</string>
-    <!-- Update message shown when placing an outgoing 1:1 video call and it\'s not answered by the other party -->
-    <string name="MessageRecord_unanswered_video_call">Відеовиклик без відповіді</string>
-    <!-- Update message shown when receiving an incoming 1:1 voice/audio call and it\'s answered -->
+    <!-- Update message shown when receiving an incoming 1:1 voice/audio call and it\'s answered or ringing -->
     <string name="MessageRecord_incoming_voice_call">Вхідний голосовий виклик</string>
-    <!-- Update message shown when receiving an incoming 1:1 video call and answered -->
+    <!-- Update message shown when receiving an incoming 1:1 video call and answered or ringing -->
     <string name="MessageRecord_incoming_video_call">Вхідний відеовиклик</string>
     <!-- Update message shown when receiving an incoming 1:1 voice/audio call and not answered -->
     <string name="MessageRecord_missed_voice_call">Пропущений голосовий виклик</string>
@@ -1445,19 +1469,15 @@
     <string name="MessageRecord_missed_voice_call_notification_profile">Пропущено голосовий виклик під час увімкненого профілю сповіщень</string>
     <!-- Update message shown when receiving an incoming video call and declined due to notification profile -->
     <string name="MessageRecord_missed_video_call_notification_profile">Пропущено відеовиклик під час увімкненого профілю сповіщень</string>
-    <!-- Update message shown when receiving an incoming 1:1 voice/audio call and explicitly declined -->
-    <string name="MessageRecord_you_declined_a_voice_call">Ви відхилили голосовий виклик</string>
-    <!-- Update message shown when receiving an incoming 1:1 video call and explicitly declined -->
-    <string name="MessageRecord_you_declined_a_video_call">Ви відхилили відеовиклик</string>
     <!-- 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_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_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_chat_session_refreshed">Сесію чату оновлено</string>
@@ -1673,34 +1693,59 @@
     <string name="MessageRecord_can_accept_payments">%1$s тепер може приймати платежі</string>
 
     <!-- Group Calling update messages -->
-    <string name="MessageRecord_s_started_a_group_call_s">%1$s розпочав груповий дзвінок · %2$s</string>
-    <string name="MessageRecord_you_started_a_group_call_s">Ви розпочали груповий виклик · %1$s</string>
-    <string name="MessageRecord_s_is_in_the_group_call_s">%1$s бере участь у груповому дзвінку · %2$s</string>
-    <string name="MessageRecord_you_are_in_the_group_call_s1">Ви у груповому дзвінку · %1$s</string>
-    <string name="MessageRecord_s_and_s_are_in_the_group_call_s1">%1$s і %2$s бере участь у груповому дзвінку · %3$s</string>
-    <string name="MessageRecord_group_call_s">Груповий дзвінок · %1$s</string>
-
-    <string name="MessageRecord_s_started_a_group_call">%1$s розпочав груповий дзвінок</string>
-    <string name="MessageRecord_you_started_a_group_call">Ви розпочали груповий дзвінок</string>
-    <string name="MessageRecord_s_is_in_the_group_call">%1$s бере участь у груповому дзвінку</string>
-    <string name="MessageRecord_you_are_in_the_group_call">Ви у груповому дзвінку</string>
-    <string name="MessageRecord_s_and_s_are_in_the_group_call">%1$s і %2$s беруть участь у груповому дзвінку</string>
-    <string name="MessageRecord_group_call">Груповий дзвінок</string>
+    <!-- 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 бере участь у виклику · %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">Ви берете участь у виклику · %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 і %2$s беруть участь у виклику · %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 бере участь у виклику</string>
+    <!-- Chat log text for an ongoing group call only the local user has joined -->
+    <string name="MessageRecord_you_are_in_the_call">Ви берете участь у виклику</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 і %2$s беруть участь у виклику</string>
+    <!-- Chat log text for a group call that ended within the last 5 minutes -->
+    <string name="MessageRecord__the_video_call_has_ended">Відеовиклик завершено</string>
+    <!-- Chat log text for a group call that ended within the last 5 minutes with a placeholder for formatted time -->
+    <string name="MessageRecord__the_video_call_has_ended_s">Відеовиклик завершено · %1$s</string>
+    <!-- Chat log text for a group call that ended more than 5 minutes ago and was missed -->
+    <string name="MessageRecord__missed_video_call">Пропущений відеовиклик</string>
+    <!-- Chat log text for a group call that ended more than 5 minutes ago and was missed with a placeholder for formatted time -->
+    <string name="MessageRecord__missed_video_call_s">Пропущений відеовиклик · %1$s</string>
+    <!-- Chat log text for a group call that ended that the local user did not start -->
+    <string name="MessageRecord__incoming_video_call">Вхідний відеовиклик</string>
+    <!-- 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">Вхідний відеовиклик · %1$s</string>
+    <!-- Chat log text for a group call that ended that the local user started -->
+    <string name="MessageRecord__outgoing_video_call">Вихідний відеовиклик</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">Вихідний відеовиклик · %1$s</string>
+    <!-- Chat log text for an ongoing group call that the local user started -->
+    <string name="MessageRecord__you_started_a_video_call">Ви почали відеовиклик</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">Ви почали відеовиклик · %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 почав відеовиклик</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 почав відеовиклик · %2$s</string>
 
     <string name="MessageRecord_you">Ви</string>
 
-    <plurals name="MessageRecord_s_s_and_d_others_are_in_the_group_call_s">
-        <item quantity="one">%1$s, %2$s, та %3$d інші у цьому груповому дзвінку · %4$s</item>
-        <item quantity="few">%1$s, %2$s, та %3$d інші у цьому груповому дзвінку · %4$s</item>
-        <item quantity="many">%1$s,%2$s, та %3$d а інші у цьому груповому дзвінку · %4$s</item>
-        <item quantity="other">%1$s, %2$s, та%3$d а інші у цьому груповому дзвінку · %4$s</item>
+    <!-- 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 і ще %3$d користувач беруть участь у груповому виклику · %4$s</item>
+        <item quantity="few">%1$s, %2$s і ще %3$d користувачі беруть участь у груповому виклику · %4$s</item>
+        <item quantity="many">%1$s,%2$s і ще %3$d користувачів беруть участь у груповому виклику · %4$s</item>
+        <item quantity="other">%1$s, %2$s і ще %3$d користувача беруть участь у груповому виклику · %4$s</item>
     </plurals>
 
-    <plurals name="MessageRecord_s_s_and_d_others_are_in_the_group_call">
-        <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>
+    <!-- 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 і ще %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>
 
     <!-- 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. -->
@@ -2221,6 +2266,7 @@
     <!-- Generic error when the app is unable to request an SMS code for an unknown reason. -->
     <string name="RegistrationActivity_unable_to_request_verification_code">Не вдається надіслати запит на код підтвердження. Перевірте підключення до мережі та спробуйте знову.</string>
     <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">Molly Android — Формат телефонних номерів</string>
     <!--    Small "toast" notification to the user confirming that they have requested a new code via voice call.-->
@@ -2267,10 +2313,10 @@
 
     <!-- RegistrationLockV2Dialog -->
     <string name="RegistrationLockV2Dialog_turn_on_registration_lock">Включити блокування реєстрації?</string>
-    <string name="RegistrationLockV2Dialog_turn_off_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_turn_on">Увімкнути</string>
-    <string name="RegistrationLockV2Dialog_turn_off">Відключити</string>
+    <string name="RegistrationLockV2Dialog_turn_off">Вимкнути</string>
 
     <!-- RevealableMessageView -->
     <string name="RevealableMessageView_view_photo">Переглянути фото</string>
@@ -2367,7 +2413,7 @@
     <string name="SubmitDebugLogActivity_this_log_will_be_posted_publicly_online_for_contributors">Цей журнал буде доступний онлайн для перегляду розробниками. Ви можете перевірити його перед завантаженням.</string>
 
     <!-- SupportEmailUtil -->
-  <!-- Removed by excludeNonTranslatables <string name="SupportEmailUtil_support_email" translatable="false">support@molly.im</string> -->
+  <!-- Removed by excludeNonTranslatables <string name="SupportEmailUtil_support_email" translatable="false">support@signal.org</string> -->
     <string name="SupportEmailUtil_filter">Фільтр:</string>
     <string name="SupportEmailUtil_device_info">Про пристрій:</string>
     <string name="SupportEmailUtil_android_version">Версія Android:</string>
@@ -2397,9 +2443,9 @@
     <!-- 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_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_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>
@@ -2883,6 +2929,8 @@
     <string name="ConversationUpdateItem_loading">Завантаження</string>
     <string name="ConversationUpdateItem_learn_more">Дізнатися більше</string>
     <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_call_is_full">Дзвінок повний</string>
     <string name="ConversationUpdateItem_invite_friends">Запросити друзів</string>
@@ -2893,7 +2941,7 @@
     <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>
+    <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 -->
     <string name="ConversationUpdateItem_donate">Задонатити</string>
     <!-- Update item button text to send payment -->
@@ -2936,17 +2984,18 @@
     <!-- 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 -->
-    <string name="BubbleOptOutTooltip__turn_off">Відключити</string>
+    <string name="BubbleOptOutTooltip__turn_off">Вимкнути</string>
 
     <!-- safety_number_change_dialog -->
-    <string name="safety_number_change_dialog__safety_number_changes">Історія змін коду безпеки</string>
+    <string name="safety_number_change_dialog__safety_number_changes">Зміна коду безпеки</string>
     <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__the_following_people_may_have_reinstalled_or_changed_devices">Можливо, ці користувачі перевстановили застосунок або замінили пристрої. Перевірте коди безпеки для чатів з цими користувачами, щоб упевнитись у конфіденційності спілкування.</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>
 
     <!-- EnableCallNotificationSettingsDialog__call_notifications_checklist -->
@@ -3085,8 +3134,8 @@
 
     <!-- BadDecryptLearnMoreDialog -->
     <string name="BadDecryptLearnMoreDialog_delivery_issue">Проблема з доставленням</string>
-    <string name="BadDecryptLearnMoreDialog_couldnt_be_delivered_individual">Не вдалося доставити вам повідомлення, стікер, реакцію або сповіщення про прочитання від користувача %1$s. Користувач намагався надіслати це безпосередньо вам або в груповий чат.</string>
-    <string name="BadDecryptLearnMoreDialog_couldnt_be_delivered_group">Не вдалося доставити вам повідомлення, стікер, реакцію або сповіщення про прочитання від користувача %1$s.</string>
+    <string name="BadDecryptLearnMoreDialog_couldnt_be_delivered_individual">Не вдалося доставити вам повідомлення, стікер, реакцію або відмітку про читання від користувача %1$s. Користувач намагався надіслати це безпосередньо вам або в груповий чат.</string>
+    <string name="BadDecryptLearnMoreDialog_couldnt_be_delivered_group">Не вдалося доставити вам повідомлення, стікер, реакцію або відмітку про читання від користувача %1$s.</string>
 
     <!-- profile_create_activity -->
     <string name="CreateProfileActivity_first_name_required">Ім\'я (обов\'язково)</string>
@@ -3158,7 +3207,7 @@
     <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_disappears">Зникає</string>
+    <string name="message_details_header_disappears">Зникне через</string>
     <string name="message_details_header_via">Через</string>
 
     <!-- message_details_recipient_header -->
@@ -3274,6 +3323,7 @@
 
     <string name="arrays__default">Типово</string>
     <string name="arrays__high">Великий</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">Максимум</string>
 
     <!-- plurals.xml -->
@@ -3293,8 +3343,8 @@
     <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__generate_link_previews">Генерувати посилання попереднього перегляду</string>
-    <string name="preferences__retrieve_link_previews_from_websites_for_messages">Для надісланих повідомлень отримувати дані попереднього перегляду посилань напряму з веб-сайтів.</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>
     <string name="preferences__change_your_passphrase">Змінить вашу фразу-пароль</string>
     <string name="preferences__enable_passphrase">Увімкнути фразу-пароль</string>
@@ -3355,7 +3405,7 @@
     <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>
+    <string name="preferences__linked_devices">Зв\'язані пристрої</string>
     <string name="preferences__light_theme">Світла</string>
     <string name="preferences__dark_theme">Темна</string>
     <string name="preferences__appearance">Вигляд</string>
@@ -3395,10 +3445,10 @@
     <string name="preferences__support_wifi_calling">Режим сумісності \'WiFi Calling\'</string>
     <string name="preferences__enable_if_your_device_supports_sms_mms_delivery_over_wifi">Увімкніть, якщо ваш пристрій використовує доставку SMS/MMS через WiFi (вмикайте лише якщо «WiFi Calling» увімкнен на вашому пристрої)</string>
     <string name="preferences__incognito_keyboard">Клавіатура в режимі «інкогніто»</string>
-    <string name="preferences__read_receipts">Звіти про прочитання</string>
-    <string name="preferences__if_read_receipts_are_disabled_you_wont_be_able_to_see_read_receipts">Якщо звіти про прочитання вимкнено, ви не бачитимете ці звіти від інших.</string>
-    <string name="preferences__typing_indicators">Індикатори набору тексту</string>
-    <string name="preferences__if_typing_indicators_are_disabled_you_wont_be_able_to_see_typing_indicators">Якщо індикатори набору тексту вимкнено, ви не бачитимете їх від інших користувачів.</string>
+    <string name="preferences__read_receipts">Відмітки про читання</string>
+    <string name="preferences__if_read_receipts_are_disabled_you_wont_be_able_to_see_read_receipts">Якщо вимкнути відмітки про читання, ви не будете бачити, чи ваші повідомлення прочитали.</string>
+    <string name="preferences__typing_indicators">Індикатор набору тексту</string>
+    <string name="preferences__if_typing_indicators_are_disabled_you_wont_be_able_to_see_typing_indicators">Якщо індикатор набору тексту вимкнено, його не буде видно, коли інший користувач набиратиме повідомлення.</string>
     <string name="preferences__request_keyboard_to_disable">Запитати клавіатуру, щоб вимкнути персоналізоване навчання</string>
     <string name="preferences__this_setting_is_not_a_guarantee">Це налаштування може не спрацювати, бо ваша клавіатура може його ігнорувати.</string>
   <!-- Removed by excludeNonTranslatables <string name="preferences__incognito_keyboard_learn_more" translatable="false">https://support.signal.org/hc/articles/360055276112</string> -->
@@ -3488,7 +3538,7 @@
     <string name="preferences_connected_to_proxy">Під\'єднано до проксі</string>
     <string name="preferences_connection_failed">З\'єднання не вдалася!</string>
     <string name="preferences_couldnt_connect_to_the_proxy">Помилка з\'єднання із проксі. Перевірте адресу проксі і спробуйте ще раз.</string>
-    <string name="preferences_you_are_connected_to_the_proxy">Помилка з\'єднання із проксі. Ви можете відключити проксі в будь-який час в настройках.</string>
+    <string name="preferences_you_are_connected_to_the_proxy">Ви з\'єднані з проксі-сервером. Проксі-сервер можна завжди вимкнути в налаштуваннях.</string>
     <string name="preferences_success">Успіх</string>
     <string name="preferences_failed_to_connect">Не вдалось підключитися</string>
     <string name="preferences_enter_proxy_address">Введіть адресу проксі</string>
@@ -3551,7 +3601,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">Ви можете використовувати 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">Платежі у Molly більше недоступні. Ви все ще можете переказати кошти на обмін, але більше не зможете надсилати та отримувати платежі, поповнювати рахунок.</string>
@@ -3600,6 +3650,14 @@
     <!-- Storage permission row description -->
     <string name="GrantPermissionsFragment__send_photos_videos_and_files">Надсилайте фото, відео й інші файли зі свого пристрою.</string>
 
+    <!-- PermissionDeniedBottomSheet -->
+    <!-- Sheet describing step 1 on how to give permissions by opening settings -->
+    <string name="PermissionDeniedBottomSheet__1_tap_settings_below">1. Tap “Settings” below</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 Allow the permission</string>
+    <!-- Label for button at the bottom of the sheet which opens the system permission settings -->
+    <string name="PermissionDeniedBottomSheet__settings">Settings</string>
+
     <!-- PaymentsSecuritySetupFragment -->
     <!-- Toolbar title -->
     <string name="PaymentsSecuritySetupFragment__security_setup">Налаштування безпеки</string>
@@ -3640,6 +3698,7 @@
     <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__information">Деталі транзакції, зокрема сума платежу і час транзакції, є частиною особового рахунку MobileCoin.</string>
@@ -3702,6 +3761,7 @@
     <string name="ConfirmPayment__confirm_payment">Підтвердити платіж</string>
     <string name="ConfirmPayment__network_fee">Комісія мережі</string>
     <string name="ConfirmPayment__estimated_s">Приблизно %1$s</string>
+    <!-- Prefix to a name to indicate who a payment will be sent to -->
     <string name="ConfirmPayment__to">Кому</string>
     <string name="ConfirmPayment__total_amount">Загальна сума</string>
     <string name="ConfirmPayment__balance_s">Баланс: %1$s</string>
@@ -3764,7 +3824,7 @@
     <!-- Button to save a message attachment (image, file etc.) -->
 
     <!-- conversation_expiring_off -->
-    <string name="conversation_expiring_off__disappearing_messages">Зникнення повідомлень</string>
+    <string name="conversation_expiring_off__disappearing_messages">Тимчасові повідомлення</string>
 
     <!-- conversation_selection -->
     <!-- Button to view detailed information for a message; Action item with hyphenation. Translation can use soft hyphen - Unicode U+00AD  -->
@@ -3856,6 +3916,14 @@
     <string name="conversation_group_options__conversation">Чат</string>
     <string name="conversation_group_options__broadcast">Трансляція</string>
 
+    <!-- DoubleTapEditEducationSheet -->
+    <!-- Displayed as the title of the education bottom sheet -->
+    <string name="DoubleTapEditEducationSheet__double_tap_edit_title">Double tap to edit</string>
+    <!-- Text on the sheet explaining how double tapping on a message will let them edit it -->
+    <string name="DoubleTapEditEducationSheet__quickly_tap_twice">Quickly tap twice on your messages to edit them. You can edit your messages up to 24hrs after they’ve been sent.</string>
+    <!-- Button label to dismiss sheet -->
+    <string name="DoubleTapEditEducationSheet__got_it">Got it</string>
+
     <!-- text_secure_normal -->
     <string name="text_secure_normal__menu_new_group">Нова група</string>
     <string name="text_secure_normal__menu_settings">Налаштування</string>
@@ -4046,7 +4114,7 @@
     <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="registration_activity__transfer_or_restore_account">Перенесення або відновлення акаунту</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>
@@ -4066,7 +4134,7 @@
     <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_please_acknowledge_your_understanding_by_marking_the_confirmation_check_box">Підтвердіть, що ви розумієте про що йдеться поставивши галочку</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_delete_backups_statement">Видалити резервні копії</string>
@@ -4135,13 +4203,13 @@
     <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__turn_off">Відключити</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__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_disable_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>
@@ -4175,7 +4243,7 @@
     <string name="preferences_account_delete_all_data_failed">Не вдалося видалити дані</string>
 
     <!-- TransferOrRestoreFragment -->
-    <string name="TransferOrRestoreFragment__transfer_or_restore_account">Перенесення або відновлення акаунту</string>
+    <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_your_account_and_messages_from_your_old_android_device">Перенести акаунт і повідомлення зі старого пристрою Android. Необхідний доступ до старого пристрою.</string>
@@ -4237,7 +4305,7 @@
     <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>
-    <string name="DeviceTransferSetup__try_turning_wifi_off_and_on_on_both_devices">Спробуйте відключити і включити Wi-Fi на обох пристроях.</string>
+    <string name="DeviceTransferSetup__try_turning_wifi_off_and_on_on_both_devices">Спробуйте вимкнути і ввімкнути Wi-Fi на обох пристроях.</string>
     <string name="DeviceTransferSetup__make_sure_both_devices_are_in_transfer_mode">Переконайтеся, що обидва пристрої знаходяться в режимі переносу.</string>
     <string name="DeviceTransferSetup__go_to_support_page">Перейти на сторінку підтримки</string>
     <string name="DeviceTransferSetup__try_again">Спробувати знову</string>
@@ -4324,6 +4392,7 @@
     <string name="RecipientBottomSheet_copied_to_clipboard">Скопійовано до буфера обміну</string>
 
     <string name="GroupRecipientListItem_admin">Адміністратор</string>
+    <!-- Button text to approve a user that has requested to join a group -->
     <string name="GroupRecipientListItem_approve_description">Прийняти</string>
     <string name="GroupRecipientListItem_deny_description">Відхилити</string>
 
@@ -4351,6 +4420,7 @@
 
     <!-- VoiceNoteMediaDescriptionCompatFactory -->
     <string name="VoiceNoteMediaItemFactory__voice_message">Голосове повідомлення · %1$s</string>
+    <!-- This is a title in a banner describing the conversation sender to receiver placeholders of the currently playing voice memo. -->
     <string name="VoiceNoteMediaItemFactory__s_to_s">%1$s до %2$s</string>
 
     <!-- StorageUtil -->
@@ -4364,8 +4434,20 @@
     <string name="ReviewCardDialogFragment__review_members">Перегляд учасників</string>
     <!-- Title of a screen where the user will be prompted to review a message request matching the name of someone they already know -->
     <string name="ReviewCardDialogFragment__review_request">Переглянути запит</string>
-    <string name="ReviewCardDialogFragment__d_group_members_have_the_same_name">%1$d учасники групи мають однакові імена, перегляньте учасників нижче та оберіть дію.</string>
-    <string name="ReviewCardDialogFragment__if_youre_not_sure">Якщо ви не впевнені, від кого надійшов запит, перегляньте контакти нижче та прийміть рішення.</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="few">%1$d group members have the same name, review the members below and choose to take action.</item>
+        <item quantity="many">%1$d group members have the same name, review the members 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 -->
+    <plurals name="ReviewCardDialogFragment__if_youre_not_sure">
+        <item quantity="one">If you\'re not sure who the request is from, review the contact below and take action.</item>
+        <item quantity="few">If you\'re not sure who the request is from, review the contacts below and take action.</item>
+        <item quantity="many">If you\'re not sure who the request is from, review the contacts below and take action.</item>
+        <item quantity="other">If you\'re not sure who the request is from, review the contacts below and take action.</item>
+    </plurals>
     <string name="ReviewCardDialogFragment__no_other_groups_in_common">Інших спільних груп немає.</string>
     <string name="ReviewCardDialogFragment__no_groups_in_common">Немає спільних груп.</string>
     <plurals name="ReviewCardDialogFragment__d_other_groups_in_common">
@@ -4400,11 +4482,24 @@
     <string name="CallParticipantsListUpdatePopupWindow__s_joined">Приєднався: %1$s</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_and_s_joined">%1$s та %2$s приєднались</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_s_and_s_joined">%1$s, %2$s і %3$s приєднались</string>
-    <string name="CallParticipantsListUpdatePopupWindow__s_s_and_d_others_joined">%1$s, %2$s та %3$d інші приєднались</string>
+    <!-- Toast message shown in group call when 3 or more people join -->
+    <plurals name="CallParticipantsListUpdatePopupWindow__s_s_and_d_others_joined">
+        <item quantity="one">%1$s, %2$s and %3$d other joined</item>
+        <item quantity="few">%1$s, %2$s and %3$d others joined</item>
+        <item quantity="many">%1$s, %2$s and %3$d others joined</item>
+        <item quantity="other">%1$s, %2$s and %3$d others joined</item>
+    </plurals>
+    <!-- Toast/popup text shown when someone leaves a group call -->
     <string name="CallParticipantsListUpdatePopupWindow__s_left">Залишив розмову: %1$s</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_and_s_left">%1$s та %2$s покинули розмову</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_s_and_s_left">%1$s,%2$s та %3$s покинули розмову</string>
-    <string name="CallParticipantsListUpdatePopupWindow__s_s_and_d_others_left">%1$s, %2$s та %3$d інші покинули розмову</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 and %3$d other left</item>
+        <item quantity="few">%1$s, %2$s and %3$d others left</item>
+        <item quantity="many">%1$s, %2$s and %3$d others left</item>
+        <item quantity="other">%1$s, %2$s and %3$d others left</item>
+    </plurals>
 
     <string name="CallParticipant__you">Ви</string>
     <string name="CallParticipant__you_on_another_device">Ви (на іншому пристрої)</string>
@@ -4524,7 +4619,7 @@
     <!-- 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> -->
@@ -4534,7 +4629,7 @@
     <!-- DeactivateWalletFragment -->
     <string name="DeactivateWalletFragment__deactivate_wallet">Вимкнути гаманець</string>
     <string name="DeactivateWalletFragment__your_balance">Ваш баланс</string>
-    <string name="DeactivateWalletFragment__its_recommended_that_you">Перш ніж відключити платежі, ми рекомендуємо перевести кошти в інший гаманець. Інакше кошти залишаться у вашому гаманці, прив\'язаному до Molly, якщо ви знову активуєте платежі.</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>
@@ -4634,11 +4729,11 @@
 
     <!-- QualitySelectorBottomSheetDialog -->
     <!-- Label for our standard quality media conversion. -->
-    <string name="QualitySelectorBottomSheetDialog__standard">Стандартне</string>
+    <string name="QualitySelectorBottomSheetDialog__standard">Стандартна</string>
     <!-- Description for our standard quality media conversion. -->
     <string name="QualitySelectorBottomSheetDialog__faster_less_data">Швидше, менше даних</string>
     <!-- Label for our high quality media conversion. This has better quality than standard. -->
-    <string name="QualitySelectorBottomSheetDialog__high">Великий</string>
+    <string name="QualitySelectorBottomSheetDialog__high">Висока</string>
     <!-- Label for our high quality media conversion. This has better quality than standard. -->
     <string name="QualitySelectorBottomSheetDialog__slower_more_data">Повільніше, більше даних</string>
     <!-- Title heading for our media conversion quality selector. -->
@@ -4778,14 +4873,21 @@
 
     <!-- PrivacySettingsFragment -->
     <string name="PrivacySettingsFragment__blocked">Заблоковані</string>
-    <string name="PrivacySettingsFragment__d_contacts">%1$d контактів</string>
-    <string name="PrivacySettingsFragment__messaging">Листування</string>
-    <string name="PrivacySettingsFragment__disappearing_messages">Зникаючі повідомлення</string>
+    <!-- Settings label that shows the number blocked contacts -->
+    <plurals name="PrivacySettingsFragment__d_contacts">
+        <item quantity="one">%1$d contact</item>
+        <item quantity="few">%1$d contacts</item>
+        <item quantity="many">%1$d contacts</item>
+        <item quantity="other">%1$d contacts</item>
+    </plurals>
+    <string name="PrivacySettingsFragment__messaging">Повідомлення</string>
+    <string name="PrivacySettingsFragment__disappearing_messages">Тимчасові повідомлення</string>
     <string name="PrivacySettingsFragment__app_security">Безпека програми</string>
+    <!-- This refers to the multi-tasking overview (recent apps) from the Android operating system.-->
     <string name="PrivacySettingsFragment__block_screenshots_in_the_recents_list_and_inside_the_app">Блокувати знімки екрану в списку недавніх і в застосунку</string>
     <string name="PrivacySettingsFragment__signal_message_and_calls">Повідомлення і виклики в Signal, завжди ретранслювати виклики, захищений відправник</string>
     <string name="PrivacySettingsFragment__default_timer_for_new_changes">Таймер за умовчанням для нових чатів</string>
-    <string name="PrivacySettingsFragment__set_a_default_disappearing_message_timer_for_all_new_chats_started_by_you">Встановіть таймер зникнення повідомлень за замовчуванням для усіх нових чатів, які ви створите.</string>
+    <string name="PrivacySettingsFragment__set_a_default_disappearing_message_timer_for_all_new_chats_started_by_you">Установіть стандартний таймер для тимчасових повідомлень у всіх нових чатах, які ви починаєте.</string>
     <!-- Summary for stories preference to launch into story privacy settings -->
     <string name="PrivacySettingsFragment__payment_lock_require_lock">Увімкніть розблокування екрана Android чи розблокування відбитком пальця для переказу коштів</string>
     <!-- Alert dialog title when payment lock cannot be enabled -->
@@ -4803,8 +4905,8 @@
     <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_this_chat_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>
     <string name="ExpireTimerSettingsFragment__1_week">1 тиждень</string>
@@ -4813,8 +4915,8 @@
     <string name="ExpireTimerSettingsFragment__1_hour">1 година</string>
     <string name="ExpireTimerSettingsFragment__5_minutes">5 хвилин</string>
     <string name="ExpireTimerSettingsFragment__30_seconds">30 секунд</string>
-    <string name="ExpireTimerSettingsFragment__custom_time">Власний час</string>
-    <string name="ExpireTimerSettingsFragment__set">Задати</string>
+    <string name="ExpireTimerSettingsFragment__custom_time">Свій час</string>
+    <string name="ExpireTimerSettingsFragment__set">Установити</string>
     <string name="ExpireTimerSettingsFragment__save">Зберегти</string>
 
     <string name="CustomExpireTimerSelectorView__seconds">секунди</string>
@@ -4838,11 +4940,14 @@
     <string name="DataAndStorageSettingsFragment__media_quality">Якість медіа</string>
     <string name="DataAndStorageSettingsFragment__sent_media_quality">Якість відправлених медіа</string>
     <string name="DataAndStorageSettingsFragment__sending_high_quality_media_will_use_more_data">Відправлення медіа високої якості споживатиме більше даних.</string>
-    <string name="DataAndStorageSettingsFragment__high">Великий</string>
-    <string name="DataAndStorageSettingsFragment__standard">Стандартне</string>
+    <!-- Setting option that can be selected to default media to be sent as high quality by default -->
+    <string name="DataAndStorageSettingsFragment__high">Висока</string>
+    <!-- Setting option that can be selected to default media to be sent as standard quality by default -->
+    <string name="DataAndStorageSettingsFragment__standard">Стандартна</string>
     <string name="DataAndStorageSettingsFragment__calls">Виклики</string>
 
     <!-- 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__use_custom_colors">Використовуйте власні кольори</string>
     <string name="ChatColorSelectionFragment__chat_color">Колір чату</string>
@@ -4950,7 +5055,7 @@
     <string name="ConversationSettingsFragment__muted">Сповіщення вимкнені</string>
     <!-- Button label with hyphenation. Translation can use soft hyphen - Unicode U+00AD -->
     <string name="ConversationSettingsFragment__search">Пошук</string>
-    <string name="ConversationSettingsFragment__disappearing_messages">Зникаючі повідомлення</string>
+    <string name="ConversationSettingsFragment__disappearing_messages">Тимчасові повідомлення</string>
     <string name="ConversationSettingsFragment__sounds_and_notifications">Звуки &amp; сповіщення</string>
   <!-- Removed by excludeNonTranslatables <string name="ConversationSettingsFragment__internal_details" translatable="false">Internal details</string> -->
     <string name="ConversationSettingsFragment__contact_details">Дані з контактів телефона</string>
@@ -4986,10 +5091,10 @@
 
     <!-- SoundsAndNotificationsSettingsFragment -->
     <string name="SoundsAndNotificationsSettingsFragment__mute_notifications">Вимкнути сповіщення</string>
-    <string name="SoundsAndNotificationsSettingsFragment__not_muted">Сповіщення увімкнені</string>
+    <string name="SoundsAndNotificationsSettingsFragment__not_muted">Сповіщення ввімкнено</string>
     <string name="SoundsAndNotificationsSettingsFragment__mentions">Згадки</string>
-    <string name="SoundsAndNotificationsSettingsFragment__always_notify">Завжди повідомляти</string>
-    <string name="SoundsAndNotificationsSettingsFragment__do_not_notify">Не повідомляти</string>
+    <string name="SoundsAndNotificationsSettingsFragment__always_notify">Завжди сповіщати</string>
+    <string name="SoundsAndNotificationsSettingsFragment__do_not_notify">Не сповіщати</string>
     <string name="SoundsAndNotificationsSettingsFragment__custom_notifications">Власні повідомлення</string>
 
     <!-- StickerKeyboard -->
@@ -5060,6 +5165,7 @@
     <string name="AvatarPickerFragment__take_a_picture">Зробити фото</string>
     <string name="AvatarPickerFragment__choose_a_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>
     <string name="AvatarPickerFragment__clear_avatar">Витерти фото профілю</string>
@@ -5128,7 +5234,7 @@
     <string name="MediaReviewFragment__add_a_message">Додати повідомлення</string>
     <string name="MediaReviewFragment__add_a_reply">Додати відповідь</string>
     <string name="MediaReviewFragment__send_to">Надіслати</string>
-    <string name="MediaReviewFragment__view_once_message">Одноразове повідомлення</string>
+    <string name="MediaReviewFragment__view_once_message">Одноразовий медіафайл</string>
     <string name="MediaReviewFragment__one_or_more_items_were_too_large">Один або більше елементів були завеликими</string>
     <string name="MediaReviewFragment__one_or_more_items_were_invalid">Один або кілька елементів були недійсними</string>
     <string name="MediaReviewFragment__too_many_items_selected">Обрано забагато елементів</string>
@@ -5731,7 +5837,7 @@
     <string name="StoryViewerFragment__s_s">%1$s %2$s</string>
     <!-- Displayed when viewing a post you sent -->
     <string name="StoryViewerPageFragment__you">Ви</string>
-    <!-- Displayed when viewing a post displayed to a group -->
+    <!-- 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 -->
     <string name="StoryViewerPageFragment__reply">Відповісти</string>
@@ -5752,7 +5858,7 @@
     <!-- Dialog title when removing a viewer from a story -->
     <string name="StoryViewsFragment__remove_viewer">Вилучити глядача?</string>
     <!-- Dialog message when removing a viewer from a story -->
-    <string name="StoryViewsFragment__s_will_still_be_able">%1$s все одно зможе переглядати цей пост, але не бачитиме майбутніх постів, якими ви поділитесь у сторі %2$s.</string>
+    <string name="StoryViewsFragment__s_will_still_be_able">Користувач %1$s ще зможе бачити цей вміст, але вже не побачить вмісту історії «%2$s», яким ви поділитесь у майбутньому.</string>
     <!-- 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 -->
@@ -5934,11 +6040,11 @@
     <!-- Choose story type bottom sheet new story row title -->
     <string name="ChooseStoryTypeBottomSheet__new_custom_story">Нова індивідуальна історія</string>
     <!-- Choose story type bottom sheet new story row summary -->
-    <string name="ChooseStoryTypeBottomSheet__visible_only_to">Можуть побачити лише окремі особи</string>
+    <string name="ChooseStoryTypeBottomSheet__visible_only_to">Можуть бачити лише конкретні користувачі</string>
     <!-- Choose story type bottom sheet group story title -->
     <string name="ChooseStoryTypeBottomSheet__group_story">Групова історія</string>
     <!-- Choose story type bottom sheet group story summary -->
-    <string name="ChooseStoryTypeBottomSheet__share_to_an_existing_group">Поділитись у групі</string>
+    <string name="ChooseStoryTypeBottomSheet__share_to_an_existing_group">Для користувачів уже створеної групи</string>
     <!-- Choose groups bottom sheet title -->
     <string name="ChooseGroupStoryBottomSheet__choose_groups">Обрати групи</string>
     <!-- Displayed when copying group story reply text to clipboard -->
@@ -6135,9 +6241,9 @@
     <!-- Sub-line when a user is verified. -->
     <string name="SafetyNumberRecipientRowItem__verified">Верифіковано</string>
     <!-- Title of safety number changes bottom sheet when showing individual records -->
-    <string name="SafetyNumberBottomSheetFragment__safety_number_changes">Історія змін коду безпеки</string>
+    <string name="SafetyNumberBottomSheetFragment__safety_number_changes">Зміна коду безпеки</string>
     <!-- Message of safety number changes bottom sheet when showing individual records -->
-    <string name="SafetyNumberBottomSheetFragment__the_following_people">Ці люди могли заново встановити Signal або змінити пристрої. Натисніть на одержувача, щоб підтвердити новий код безпеки. Це необов\'язково.</string>
+    <string name="SafetyNumberBottomSheetFragment__the_following_people">Можливо, ці люди перевстановили Signal або замінили пристрій. Натисніть на користувача, щоб підтвердити новий код безпеки. Це необов\'язково.</string>
     <!-- Title of safety number changes bottom sheet when not showing individual records -->
     <string name="SafetyNumberBottomSheetFragment__safety_number_checkup">Перевірка коду безпеки</string>
     <!-- Title of safety number changes bottom sheet when not showing individual records and user has seen review screen -->
@@ -6164,7 +6270,7 @@
     <!-- Done button on safety number review fragment -->
     <string name="SafetyNumberReviewConnectionsFragment__done">Готово</string>
     <!-- Title of safety number review fragment -->
-    <string name="SafetyNumberReviewConnectionsFragment__safety_number_changes">Історія змін коду безпеки</string>
+    <string name="SafetyNumberReviewConnectionsFragment__safety_number_changes">Зміна коду безпеки</string>
     <!-- Message of safety number review fragment -->
     <plurals name="SafetyNumberReviewConnectionsFragment__d_recipients_may_have">
         <item quantity="one">%1$d одержувач міг заново встановити Signal або змінити пристрій. Натисніть на одержувача, щоб підтвердити новий код безпеки. Це необов\'язково.</item>
@@ -6203,11 +6309,11 @@
 
     <!-- StoriesPrivacySettingsFragment -->
     <!-- Explanation about how stories are deleted and managed -->
-    <string name="StoriesPrivacySettingsFragment__story_updates_automatically_disappear">Оновлення історій автоматично зникають через 24 години. Оберіть глядачів вашої історії або створіть нові історії для конкретних глядачів або груп.</string>
+    <string name="StoriesPrivacySettingsFragment__story_updates_automatically_disappear">Оновлення історій автоматично зникають через 24 години. Оберіть глядачів своєї історії або створіть нові історії для конкретних глядачів і груп.</string>
     <!-- Preference title to turn off stories -->
     <string name="StoriesPrivacySettingsFragment__turn_off_stories">Вимкнути історії</string>
     <!-- Preference summary to turn off stories -->
-    <string name="StoriesPrivacySettingsFragment__if_you_opt_out">Якщо вимкнути історії, ви не зможете ні публікувати, ні переглядати історії.</string>
+    <string name="StoriesPrivacySettingsFragment__if_you_opt_out">Якщо історії вимкнути, ви не зможете їх ні публікувати, ні переглядати.</string>
     <!-- Preference title to turn on stories -->
     <string name="StoriesPrivacySettingsFragment__turn_on_stories">Увімкнути історії</string>
     <!-- Preference summary to turn on stories -->
@@ -6565,7 +6671,7 @@
     <!-- Shown in a time duration picker for selecting duration in hours and minutes, label shown after the user input value for minute, e.g., 24m -->
     <string name="TimeDurationPickerDialog_single_letter_minute_abbreviation">хв</string>
     <!-- Shown in a time duration picker for selecting duration in hours and minutes, label for button that will apply the setting -->
-    <string name="TimeDurationPickerDialog_positive_button">Задати</string>
+    <string name="TimeDurationPickerDialog_positive_button">Установити</string>
     <!-- Shown in a time duration picker for selecting duration in hours and minutes, helper text indicating minimum allowable duration -->
     <string name="TimeDurationPickerDialog_minimum_duration_warning">Мінімальний час до застосування блокування екрана становить 1 хвилину.</string>
 
@@ -6972,7 +7078,7 @@
     <!-- Title displayed at the top of the screen -->
     <string name="NicknameActivity__nickname">Умовне ім\'я</string>
     <!-- Subtitle displayed under title -->
-    <string name="NicknameActivity__nicknames_amp_notes">Nicknames &amp; notes are stored with Signal and end-to-end encrypted. They are only visible to you.</string>
+    <string name="NicknameActivity__nicknames_amp_notes">Умовні імена й примітки зберігаються в Signal і захищені наскрізним шифруванням. Їх бачите лише ви.</string>
     <!-- Field label for given name -->
     <string name="NicknameActivity__first_name">Ім\'я</string>
     <!-- Content description for first name clear button -->
@@ -6986,9 +7092,9 @@
     <!-- Button label to save -->
     <string name="NicknameActivity__save">Зберегти</string>
     <!-- Dialog title for note and name deletion -->
-    <string name="NicknameActivity__delete_nickname">Delete?</string>
+    <string name="NicknameActivity__delete_nickname">Видалити?</string>
     <!-- Dialog message for note and name deletion -->
-    <string name="NicknameActivity__this_will_permanently_delete_this_nickname_and_note">This will permanently delete any nickname and note you’ve set.</string>
+    <string name="NicknameActivity__this_will_permanently_delete_this_nickname_and_note">Умовне ім\'я і примітку буде видалено остаточно.</string>
 
     <!-- ViewNoteBottomSheetDialogFragment -->
     <!-- Sheet title -->
@@ -6996,5 +7102,26 @@
     <!-- Content description for opening the note editor -->
     <string name="ViewNoteSheet__edit_note">Змінити примітку</string>
 
+    <!-- BackupProgressService -->
+    <!-- Notification title shown while backup restore job is running -->
+    <string name="BackupProgressService_title">Відновлення резервної копії…</string>
+    <!-- Notification title shown while downloading backup restore data -->
+    <string name="BackupProgressService_title_downloading">Завантаження резервної копії…</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>
+    <!-- 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 -->
+    <string name="BackupsTypeSettingsFragment__google_pay">Google Pay</string>
+    <!-- Displayed as the user\'s payment method as a label in a preference row -->
+    <string name="BackupsTypeSettingsFragment__bank_transfer">Bank transfer</string>
+    <!-- Displayed as the user\'s payment method as a label in a preference row -->
+    <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>
+
+
     <!-- 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 86dd4a0e8f..70b29a3755 100644
--- a/app/src/main/res/values-ur/strings.xml
+++ b/app/src/main/res/values-ur/strings.xml
@@ -1,6 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- smartling.instruction_comments_enabled = on -->
-<resources>
+<?xml version="1.0" encoding="UTF-8"?><!-- 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> -->
@@ -89,6 +87,16 @@
     <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">Allow access to your location</string>
+    <!-- Dialog description that will explain the steps needed to give location permission -->
+    <string name="AttachmentManager_signal_to_send_location">To send your location:</string>
+    <!-- Alert dialog description asking for location permission -->
+    <string name="AttachmentManager_signal_allow_signal_access_location">Allow Molly access to send your location.</string>
+    <!-- Toast text explaining Signal\'s need for location access -->
+    <string name="AttachmentManager_signal_needs_location_access">Molly needs location access to send your location.</string>
+
     <!-- Alert dialog title to show the recipient has not activated payments -->
     <string name="AttachmentManager__not_activated_payments">%1$s نے پیمنٹس فعال نہیں کیں </string>
     <!-- Alert dialog description to send the recipient a request to activate payments -->
@@ -241,7 +249,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>
@@ -386,8 +394,16 @@
     <string name="ConversationActivity_your_request_to_join_has_been_sent_to_the_group_admin">آپ کی شمولیت کی درخواست گروپ منتظم کو بھیج دی گئی ہے۔ جب وہ کارروائی کریں گے تو آپ کو مطلع کیا جائے گا۔</string>
     <string name="ConversationActivity_cancel_request">درخواست منسوخ</string>
 
-    <string name="ConversationActivity_to_send_audio_messages_allow_signal_access_to_your_microphone">آڈیو پیغامات بھیجنے کے لیے Molly کو مائکروفون تک رسائی کی اجازت دیں۔</string>
+    <!-- Dialog title asking users for microphone permission -->
+    <string name="ConversationActivity_allow_access_microphone">Allow access to your microphone</string>
+    <!-- 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>
+    <!-- Toast text explaining Signal\'s need for microphone access -->
+    <string name="ConversationActivity_signal_needs_microphone_access_voice_message">Molly needs microphone access to record a voice message.</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 کال کیلئے 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>
@@ -411,10 +427,17 @@
     <string name="ConversationActivity_you_will_leave_this_group_and_it_will_be_deleted_from_all_of_your_devices">آپ اس گروپ کو چھوڑ دیں گے ، اور یہ آپ کے سبھی devices سے حذف ہوجائے گا۔</string>
     <string name="ConversationActivity_delete">حذف کریں</string>
     <string name="ConversationActivity_delete_and_leave">حذف کریں اور چھوڑیں</string>
-    <string name="ConversationActivity__to_call_s_signal_needs_access_to_your_microphone">%1$s کو فون کرنے کے لئے ، Molly کو آپ کے مائکروفون تک رسائی کی ضرورت ہے</string>
+
+    <!-- Dialog description that will explain the steps needed to give microphone permissions for a voice call -->
+    <string name="ConversationActivity__to_start_call">To start a 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">To start a call, allow Molly access to your microphone.</string>
+    <!-- Toast text explaining Signal\'s need for microphone access for a voice call -->
+    <string name="ConversationActivity_signal_needs_microphone_access_voice_call">Molly needs microphone access to start a call.</string>
 
 
     <string name="ConversationActivity_join">شامل ہوں</string>
+    <!-- Button text for an active group call but the call is currently full and unjoinable -->
     <string name="ConversationActivity_full">بھرا ہوا</string>
 
     <string name="ConversationActivity_error_sending_media">میڈیا بھیجنے میں خامی</string>
@@ -613,6 +636,7 @@
     <string name="ConversationListFragment_unarchive">ان آرکائیو</string>
     <string name="ConversationListFragment_delete">حذف کریں</string>
     <string name="ConversationListFragment_select_all">سب منتخب کریں</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 منتخب کیا گیا</item>
         <item quantity="other">%1$d منتخب کیا گیا</item>
@@ -864,6 +888,7 @@
         <item quantity="one">انوائٹ چلا گیا</item>
         <item quantity="other">%1$d انوائٹس چلے گئے</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">\"%1$s\" آپ کے ذریعہ خود بخود اس گروپ میں شامل نہیں ہوسکتے ہیں۔ \\ n y n ان میں شامل ہونے کی دعوت دی گئی ہے ، اور جب تک وہ قبول نہیں کریں گے کوئی گروپ پیغامات نہیں دیکھیں گے۔</string>
     <string name="GroupManagement_invite_multiple_users">ان صارفین کو آپ کے ذریعہ خود بخود اس گروپ میں شامل نہیں کیا جاسکتا۔ \\ n \\ n انہیں گروپ میں شامل ہونے کے لئے مدعو کیا گیا ہے ، اور جب تک وہ قبول نہیں کریں گے کوئی گروپ پیغامات نہیں دیکھیں گے۔</string>
 
@@ -1044,7 +1069,9 @@
 
     <string name="ManageGroupActivity_edit_name_and_picture">نام اور تصویر میں ترمیم کریں</string>
     <string name="ManageGroupActivity_legacy_group">لیگیسی گروپ</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">یہ لیگیسی گروپ ہے۔ گروپ منتظمین جیسی خصوصیات صرف نئے گروپس کیلئے دستیاب ہیں۔</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">یہ لیگیسی گروپ ہے۔ @ ذکر اور منتظمین جیسی نئی خصوصیات تک رسائی حاصل کرنے کیلئے ،</string>
     <string name="ManageGroupActivity_legacy_group_too_large">اس لیگیسی گروپ کو نئے گروپ میں اپ گریڈ نہیں کیا جاسکتا کیونکہ یہ بہت بڑا ہے۔ زیادہ سے زیادہ گروپ سائز %1$d ہے۔</string>
     <string name="ManageGroupActivity_upgrade_this_group">اس گروپ کو اپ گریڈ کریں۔</string>
@@ -1271,6 +1298,7 @@
         <item quantity="other">حذف کریں</item>
     </plurals>
 
+    <!-- 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 نے (%2$s) منتخب کیا</item>
         <item quantity="other">%1$d نے (%2$s) منتخب کیا</item>
@@ -1335,17 +1363,13 @@
     <string name="MessageRecord_left_group">آپ نے گروپ چھوڑدیا ہے۔</string>
     <string name="MessageRecord_you_updated_group">آپ نے گروپ کی تجدید کی۔</string>
     <string name="MessageRecord_the_group_was_updated">گروپ کو اپ ڈیٹ کیا گیا تھا۔</string>
-    <!-- Update message shown when placing an outgoing 1:1 voice/audio call and it\'s answered by the other party -->
+    <!-- Update message shown when placing an outgoing 1:1 voice/audio call -->
     <string name="MessageRecord_outgoing_voice_call">آؤٹ گوئنگ وائس کال</string>
-    <!-- Update message shown when placing an outgoing 1:1 video call and it\'s answered by the other party -->
+    <!-- Update message shown when placing an outgoing 1:1 video call -->
     <string name="MessageRecord_outgoing_video_call">آؤٹ گوئنگ ویڈیو کال</string>
-    <!-- Update message shown when placing an outgoing 1:1 voice/audio call and it\'s not answered by the other party -->
-    <string name="MessageRecord_unanswered_voice_call">غیر جواب شدہ وائس کال</string>
-    <!-- Update message shown when placing an outgoing 1:1 video call and it\'s not answered by the other party -->
-    <string name="MessageRecord_unanswered_video_call">غیر جواب شدہ ویڈیو کال</string>
-    <!-- Update message shown when receiving an incoming 1:1 voice/audio call and it\'s answered -->
+    <!-- Update message shown when receiving an incoming 1:1 voice/audio call and it\'s answered or ringing -->
     <string name="MessageRecord_incoming_voice_call">ان کمنگ وائس کال</string>
-    <!-- Update message shown when receiving an incoming 1:1 video call and answered -->
+    <!-- Update message shown when receiving an incoming 1:1 video call and answered or ringing -->
     <string name="MessageRecord_incoming_video_call">ان کمنگ ویڈیو کال</string>
     <!-- Update message shown when receiving an incoming 1:1 voice/audio call and not answered -->
     <string name="MessageRecord_missed_voice_call">مسڈ وائس کال</string>
@@ -1355,10 +1379,6 @@
     <string name="MessageRecord_missed_voice_call_notification_profile">اطلاعات کی پروفائل آن ہونے کے دوران مسڈ وائس کال</string>
     <!-- Update message shown when receiving an incoming video call and declined due to notification profile -->
     <string name="MessageRecord_missed_video_call_notification_profile">اطلاعات کی پروفائل آن ہونے کے دوران مسڈ ویڈیو کال</string>
-    <!-- Update message shown when receiving an incoming 1:1 voice/audio call and explicitly declined -->
-    <string name="MessageRecord_you_declined_a_voice_call">آپ نے وائس کال مسترد کر دی</string>
-    <!-- Update message shown when receiving an incoming 1:1 video call and explicitly declined -->
-    <string name="MessageRecord_you_declined_a_video_call">آپ نے ویڈیو کال مسترد کردی</string>
     <!-- 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>
@@ -1567,28 +1587,53 @@
     <string name="MessageRecord_can_accept_payments">%1$s اب پیمنٹس قبول کر سکتا ہے</string>
 
     <!-- Group Calling update messages -->
-    <string name="MessageRecord_s_started_a_group_call_s">%1$s نے ایک گروپ کال شروع کی.%2$s</string>
-    <string name="MessageRecord_you_started_a_group_call_s">آپ نے گروپ کال کا آغاز کیا ہے · %1$s</string>
-    <string name="MessageRecord_s_is_in_the_group_call_s">%1$s گروپ کال میں ہے ·%2$s</string>
-    <string name="MessageRecord_you_are_in_the_group_call_s1">آپ گروپ کال میں ہیں ·%1$s</string>
-    <string name="MessageRecord_s_and_s_are_in_the_group_call_s1">%1$s اور %2$s گروپ کال میں ہیں ·%3$s</string>
-    <string name="MessageRecord_group_call_s">گروپ کال .%1$s</string>
-
-    <string name="MessageRecord_s_started_a_group_call">%1$s نے ایک گروپ کال شروع کی</string>
-    <string name="MessageRecord_you_started_a_group_call">آپ نے ایک گروپ کال شروع کی</string>
-    <string name="MessageRecord_s_is_in_the_group_call">%1$s گروپ کال میں ہے.</string>
-    <string name="MessageRecord_you_are_in_the_group_call">آپ گروپ کال میں ہیں</string>
-    <string name="MessageRecord_s_and_s_are_in_the_group_call">%1$s اور %2$s گروپ کال میں ہیں</string>
-    <string name="MessageRecord_group_call">گروپ کال</string>
+    <!-- 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 کال میں ہے · %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">آپ کال میں ہیں · %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 اور %2$s کال میں ہیں · %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 کال میں ہے</string>
+    <!-- Chat log text for an ongoing group call only the local user has joined -->
+    <string name="MessageRecord_you_are_in_the_call">آپ کال میں ہیں</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 اور%2$s کال میں ہیں</string>
+    <!-- Chat log text for a group call that ended within the last 5 minutes -->
+    <string name="MessageRecord__the_video_call_has_ended">ویڈیو کال ختم ہو چکی ہے</string>
+    <!-- Chat log text for a group call that ended within the last 5 minutes with a placeholder for formatted time -->
+    <string name="MessageRecord__the_video_call_has_ended_s">ویڈیو کال ختم ہو چکی ہے · %1$s</string>
+    <!-- Chat log text for a group call that ended more than 5 minutes ago and was missed -->
+    <string name="MessageRecord__missed_video_call">مسڈ ویڈیو کال</string>
+    <!-- Chat log text for a group call that ended more than 5 minutes ago and was missed with a placeholder for formatted time -->
+    <string name="MessageRecord__missed_video_call_s">مس ویڈیو کال · %1$s</string>
+    <!-- Chat log text for a group call that ended that the local user did not start -->
+    <string name="MessageRecord__incoming_video_call">ان کمنگ ویڈیو کال</string>
+    <!-- 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">ان کمنگ ویڈیو کال · %1$s</string>
+    <!-- Chat log text for a group call that ended that the local user started -->
+    <string name="MessageRecord__outgoing_video_call">آؤٹ گوئنگ ویڈیو کال</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">آؤٹ گوئنگ ویڈیو کال · %1$s</string>
+    <!-- Chat log text for an ongoing group call that the local user started -->
+    <string name="MessageRecord__you_started_a_video_call">آپ نے ایک ویڈیو کال شروع کی</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">آپ نے ایک ویڈیو کال شروع کی · %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 نے ایک ویڈیو کال شروع کی</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 نے ایک ویڈیو کال شروع کی · %2$s</string>
 
     <string name="MessageRecord_you">آپ</string>
 
-    <plurals name="MessageRecord_s_s_and_d_others_are_in_the_group_call_s">
+    <!-- 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 ، اور %3$d دوسرے گروپ کال میں شامل ہیں.%4$s</item>
         <item quantity="other">%1$s،%2$s ، اور%3$d دیگر گروپ کال میں ہیں ·%4$s</item>
     </plurals>
 
-    <plurals name="MessageRecord_s_s_and_d_others_are_in_the_group_call">
+    <!-- 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 ، اور %3$d دوسرے گروپ کال میں شامل ہیں</item>
         <item quantity="other">%1$s،%2$s ، اور %3$d دوسرے گروپ کال میں شامل ہیں</item>
     </plurals>
@@ -2063,6 +2108,7 @@
     <!-- Generic error when the app is unable to request an SMS code for an unknown reason. -->
     <string name="RegistrationActivity_unable_to_request_verification_code">تصدیقی کوڈ کی درخواست کرنے سے قاصر ہیں۔ براہ کرم نیٹ ورک کنکشن چیک کریں اور دوبارہ کوشش کریں۔</string>
     <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">Molly Android - فون نمبر کا فارمیٹ</string>
     <!--    Small "toast" notification to the user confirming that they have requested a new code via voice call.-->
@@ -2207,7 +2253,7 @@
     <string name="SubmitDebugLogActivity_this_log_will_be_posted_publicly_online_for_contributors">اس لاگ کو دیکھنے والوں کے دیکھنے کے لئے عوامی سطح پر آن لائن پوسٹ کیا جائے گا۔ اپ لوڈ کرنے سے پہلے آپ اس کی جانچ کرسکتے ہیں۔</string>
 
     <!-- SupportEmailUtil -->
-  <!-- Removed by excludeNonTranslatables <string name="SupportEmailUtil_support_email" translatable="false">support@molly.im</string> -->
+  <!-- Removed by excludeNonTranslatables <string name="SupportEmailUtil_support_email" translatable="false">support@signal.org</string> -->
     <string name="SupportEmailUtil_filter">فلٹر:</string>
     <string name="SupportEmailUtil_device_info">Device کی معلومات:</string>
     <string name="SupportEmailUtil_android_version">Android ورژن:</string>
@@ -2709,6 +2755,8 @@
     <string name="ConversationUpdateItem_loading">لوڈ ہو رہا ہے</string>
     <string name="ConversationUpdateItem_learn_more">مزید پڑھیں</string>
     <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_call_is_full">کال پوری ہے</string>
     <string name="ConversationUpdateItem_invite_friends">دوستوں کو مدعو کریں</string>
@@ -2773,6 +2821,7 @@
     <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>
 
     <!-- EnableCallNotificationSettingsDialog__call_notifications_checklist -->
@@ -3086,6 +3135,7 @@
 
     <string name="arrays__default">پہلے سے طے شدہ</string>
     <string name="arrays__high">اونچا</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">زیادہ سے زیادہ</string>
 
     <!-- plurals.xml -->
@@ -3357,7 +3407,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 والیٹ کی استعمال کی شرائط سے مشروط ہیں۔ آپ کو کچھ مسائل کا سامنا ہو سکتا ہے اور آپ جن پیمنٹس یا بیلنسز سے محروم ہو سکتے ہیں انہیں بحال نہیں کیا جا سکتا۔ </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">Molly میں ادائیگی اب دستیاب نہیں ہے۔ آپ اب بھی ایکسچینج میں فنڈز کی منتقلی کرسکتے ہیں لیکن آپ اب ادائیگی بھیجنے اور وصول کرنے یا فنڈز شامل نہیں کرسکتے ہیں۔</string>
@@ -3406,6 +3456,14 @@
     <!-- Storage permission row description -->
     <string name="GrantPermissionsFragment__send_photos_videos_and_files">اپنی ڈیوائس سے تصاویر، ویڈیوز اور فائلز بھیجیں۔</string>
 
+    <!-- PermissionDeniedBottomSheet -->
+    <!-- Sheet describing step 1 on how to give permissions by opening settings -->
+    <string name="PermissionDeniedBottomSheet__1_tap_settings_below">1. Tap “Settings” below</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 Allow the permission</string>
+    <!-- Label for button at the bottom of the sheet which opens the system permission settings -->
+    <string name="PermissionDeniedBottomSheet__settings">Settings</string>
+
     <!-- PaymentsSecuritySetupFragment -->
     <!-- Toolbar title -->
     <string name="PaymentsSecuritySetupFragment__security_setup">سکیورٹی سیٹ اپ</string>
@@ -3446,6 +3504,7 @@
     <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__information">ٹرانزیکشن کی تفصیلات بشمول پیمنٹ کی رقم اور لین دین کا وقت، موبائل کوائن لیجر کا حصہ ہیں۔</string>
@@ -3508,6 +3567,7 @@
     <string name="ConfirmPayment__confirm_payment">ادائیگی کی تصدیق کریں</string>
     <string name="ConfirmPayment__network_fee">نیٹ ورک کی فیس</string>
     <string name="ConfirmPayment__estimated_s">تخمینہ %1$s</string>
+    <!-- Prefix to a name to indicate who a payment will be sent to -->
     <string name="ConfirmPayment__to">کے لئے</string>
     <string name="ConfirmPayment__total_amount">کل رقم</string>
     <string name="ConfirmPayment__balance_s">بقیہ: %1$s</string>
@@ -3658,6 +3718,14 @@
     <string name="conversation_group_options__conversation">چیٹ</string>
     <string name="conversation_group_options__broadcast">نشر کرنا</string>
 
+    <!-- DoubleTapEditEducationSheet -->
+    <!-- Displayed as the title of the education bottom sheet -->
+    <string name="DoubleTapEditEducationSheet__double_tap_edit_title">Double tap to edit</string>
+    <!-- Text on the sheet explaining how double tapping on a message will let them edit it -->
+    <string name="DoubleTapEditEducationSheet__quickly_tap_twice">Quickly tap twice on your messages to edit them. You can edit your messages up to 24hrs after they’ve been sent.</string>
+    <!-- Button label to dismiss sheet -->
+    <string name="DoubleTapEditEducationSheet__got_it">Got it</string>
+
     <!-- text_secure_normal -->
     <string name="text_secure_normal__menu_new_group">نیا گروپ</string>
     <string name="text_secure_normal__menu_settings">ترتیبات</string>
@@ -4112,6 +4180,7 @@
     <string name="RecipientBottomSheet_copied_to_clipboard">کلپ بورڈ کو کاپی کریں</string>
 
     <string name="GroupRecipientListItem_admin">ایڈمن</string>
+    <!-- Button text to approve a user that has requested to join a group -->
     <string name="GroupRecipientListItem_approve_description">منظور کریں</string>
     <string name="GroupRecipientListItem_deny_description">انکار کرنا</string>
 
@@ -4139,6 +4208,7 @@
 
     <!-- VoiceNoteMediaDescriptionCompatFactory -->
     <string name="VoiceNoteMediaItemFactory__voice_message">آڈیو پیغام · %1$s</string>
+    <!-- This is a title in a banner describing the conversation sender to receiver placeholders of the currently playing voice memo. -->
     <string name="VoiceNoteMediaItemFactory__s_to_s">%1$sسے%2$s</string>
 
     <!-- StorageUtil -->
@@ -4152,8 +4222,16 @@
     <string name="ReviewCardDialogFragment__review_members">ممبران کا جائزہ لیں</string>
     <!-- Title of a screen where the user will be prompted to review a message request matching the name of someone they already know -->
     <string name="ReviewCardDialogFragment__review_request">نظرثانی کی درخواست</string>
-    <string name="ReviewCardDialogFragment__d_group_members_have_the_same_name">%1$dگروپ ممبران کا ایک ہی نام ہے ، ذیل ممبران کا جائزہ لیں اور کارروائی کرنے کا انتخاب کریں۔</string>
-    <string name="ReviewCardDialogFragment__if_youre_not_sure">اگر آپ کو یقین نہیں ہے کہ درخواست کس کی ہے تو ، نیچے دیئے گئے رابطوں کا جائزہ لیں اور کارروائی کریں۔</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="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 -->
+    <plurals name="ReviewCardDialogFragment__if_youre_not_sure">
+        <item quantity="one">If you\'re not sure who the request is from, review the contact below and take action.</item>
+        <item quantity="other">If you\'re not sure who the request is from, review the contacts below and take action.</item>
+    </plurals>
     <string name="ReviewCardDialogFragment__no_other_groups_in_common">کوئی دوسرا گروہ مشترکہ نہیں۔</string>
     <string name="ReviewCardDialogFragment__no_groups_in_common">مشترکہ طور پر کوئی گروپ نہیں۔</string>
     <plurals name="ReviewCardDialogFragment__d_other_groups_in_common">
@@ -4184,11 +4262,20 @@
     <string name="CallParticipantsListUpdatePopupWindow__s_joined">%1$sشامل ہوئے</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_and_s_joined">%1$sاور %2$s شامل ہو گئے</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_s_and_s_joined">%1$s,%2$sاور%3$s شامل ہو گئے</string>
-    <string name="CallParticipantsListUpdatePopupWindow__s_s_and_d_others_joined">%1$s،%2$s اور%3$d دوسرے شامل ہوئے</string>
+    <!-- Toast message shown in group call when 3 or more people join -->
+    <plurals name="CallParticipantsListUpdatePopupWindow__s_s_and_d_others_joined">
+        <item quantity="one">%1$s, %2$s and %3$d other joined</item>
+        <item quantity="other">%1$s, %2$s and %3$d others joined</item>
+    </plurals>
+    <!-- Toast/popup text shown when someone leaves a group call -->
     <string name="CallParticipantsListUpdatePopupWindow__s_left">%1$sچلے گئے</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_and_s_left">%1$s اور %2$s چلے گئے</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_s_and_s_left">%1$s،%2$s اور%3$s چلے گئے</string>
-    <string name="CallParticipantsListUpdatePopupWindow__s_s_and_d_others_left">%1$s،%2$s اور%3$d دوسرے چلے گئے</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 and %3$d other left</item>
+        <item quantity="other">%1$s, %2$s and %3$d others left</item>
+    </plurals>
 
     <string name="CallParticipant__you">آپ</string>
     <string name="CallParticipant__you_on_another_device">آپ (دوسرے آلے پر)</string>
@@ -4558,10 +4645,15 @@
 
     <!-- PrivacySettingsFragment -->
     <string name="PrivacySettingsFragment__blocked">بلاک کر دیا گیا</string>
-    <string name="PrivacySettingsFragment__d_contacts">%1$dرابطے</string>
+    <!-- Settings label that shows the number blocked contacts -->
+    <plurals name="PrivacySettingsFragment__d_contacts">
+        <item quantity="one">%1$d contact</item>
+        <item quantity="other">%1$d contacts</item>
+    </plurals>
     <string name="PrivacySettingsFragment__messaging">پیغام رسانی</string>
     <string name="PrivacySettingsFragment__disappearing_messages">پیغامات غائب ہو رہے ہیں</string>
     <string name="PrivacySettingsFragment__app_security">ایپ سیکیورٹی</string>
+    <!-- This refers to the multi-tasking overview (recent apps) from the Android operating system.-->
     <string name="PrivacySettingsFragment__block_screenshots_in_the_recents_list_and_inside_the_app">حالیہ فہرست میں اور ایپ کے اندر اسکرین شاٹس کو بلاک کریں</string>
     <string name="PrivacySettingsFragment__signal_message_and_calls">Signal میسجز اور کالز ، ہمیشہ ریلے کالز اور مہر بند مرسل کو</string>
     <string name="PrivacySettingsFragment__default_timer_for_new_changes">نئی چیٹس کے لیے ڈیفالٹ ٹائمر</string>
@@ -4618,11 +4710,14 @@
     <string name="DataAndStorageSettingsFragment__media_quality">میڈیا کوالٹی</string>
     <string name="DataAndStorageSettingsFragment__sent_media_quality">بھیجے گئے میڈیا کی کوالٹی</string>
     <string name="DataAndStorageSettingsFragment__sending_high_quality_media_will_use_more_data">اعلیٰ کوالٹی کے میڈیا کو بھیجنے میں مزید ڈیٹا استعمال ہو گا۔</string>
+    <!-- Setting option that can be selected to default media to be sent as high quality by default -->
     <string name="DataAndStorageSettingsFragment__high">اونچا</string>
+    <!-- Setting option that can be selected to default media to be sent as standard quality by default -->
     <string name="DataAndStorageSettingsFragment__standard">معیار</string>
     <string name="DataAndStorageSettingsFragment__calls">کالز</string>
 
     <!-- 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__use_custom_colors">حسب ضرورت رنگ استعمال کریں</string>
     <string name="ChatColorSelectionFragment__chat_color">چیٹ کا رنگ</string>
@@ -4834,6 +4929,7 @@
     <string name="AvatarPickerFragment__take_a_picture">تصویر کھینچنا</string>
     <string name="AvatarPickerFragment__choose_a_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>
     <string name="AvatarPickerFragment__clear_avatar">واضح اوتار</string>
@@ -4894,7 +4990,7 @@
     <string name="MediaReviewFragment__add_a_message">پیغام شامل کریں</string>
     <string name="MediaReviewFragment__add_a_reply">جواب شامل کریں</string>
     <string name="MediaReviewFragment__send_to">بھیجیں بنام</string>
-    <string name="MediaReviewFragment__view_once_message">پیغام ایک بار دیکھیں</string>
+    <string name="MediaReviewFragment__view_once_message">ایک مرتبہ دیکھا جانے والا میڈیا</string>
     <string name="MediaReviewFragment__one_or_more_items_were_too_large">ایک یا زائد آئٹمز بہت بڑی تھیں</string>
     <string name="MediaReviewFragment__one_or_more_items_were_invalid">ایک یا زائد آئٹمز غلط تھیں</string>
     <string name="MediaReviewFragment__too_many_items_selected">بہت زیادہ آئٹمز منتخب کیے گئے ہیں</string>
@@ -5487,7 +5583,7 @@
     <string name="StoryViewerFragment__s_s">%1$s%2$s</string>
     <!-- Displayed when viewing a post you sent -->
     <string name="StoryViewerPageFragment__you">آپ</string>
-    <!-- Displayed when viewing a post displayed to a group -->
+    <!-- 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 -->
     <string name="StoryViewerPageFragment__reply">جواب دیں</string>
@@ -6704,5 +6800,26 @@
     <!-- Content description for opening the note editor -->
     <string name="ViewNoteSheet__edit_note">نوٹ میں ترمیم کریں</string>
 
+    <!-- BackupProgressService -->
+    <!-- Notification title shown while backup restore job is running -->
+    <string name="BackupProgressService_title">بیک اپ بحال کیا جا رہا ہے…</string>
+    <!-- Notification title shown while downloading backup restore data -->
+    <string name="BackupProgressService_title_downloading">بیک اپ ڈیٹا ڈاؤن لوڈ ہو رہا ہے…</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>
+    <!-- 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 -->
+    <string name="BackupsTypeSettingsFragment__google_pay">Google Pay</string>
+    <!-- Displayed as the user\'s payment method as a label in a preference row -->
+    <string name="BackupsTypeSettingsFragment__bank_transfer">Bank transfer</string>
+    <!-- Displayed as the user\'s payment method as a label in a preference row -->
+    <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>
+
+
     <!-- 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 0ee9c3b16d..8e2f56bbd3 100644
--- a/app/src/main/res/values-vi/strings.xml
+++ b/app/src/main/res/values-vi/strings.xml
@@ -1,6 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- smartling.instruction_comments_enabled = on -->
-<resources>
+<?xml version="1.0" encoding="UTF-8"?><!-- 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> -->
@@ -89,6 +87,16 @@
     <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">Allow access to your location</string>
+    <!-- Dialog description that will explain the steps needed to give location permission -->
+    <string name="AttachmentManager_signal_to_send_location">To send your location:</string>
+    <!-- Alert dialog description asking for location permission -->
+    <string name="AttachmentManager_signal_allow_signal_access_location">Allow Molly access to send your location.</string>
+    <!-- Toast text explaining Signal\'s need for location access -->
+    <string name="AttachmentManager_signal_needs_location_access">Molly needs location access to send your location.</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>
     <!-- Alert dialog description to send the recipient a request to activate payments -->
@@ -240,7 +248,7 @@
     <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>
@@ -383,8 +391,16 @@
     <string name="ConversationActivity_your_request_to_join_has_been_sent_to_the_group_admin">Yêu cầu tham gia nhóm của bạn đã được gửi tới quản trị viên nhóm. Bạn sẽ được thông báo khi họ đưa ra quyết định.</string>
     <string name="ConversationActivity_cancel_request">Hủy yêu cầu</string>
 
-    <string name="ConversationActivity_to_send_audio_messages_allow_signal_access_to_your_microphone">Để gửi tin nhắn âm thanh, hãy cho phép Molly truy cập micro điện thoại.</string>
+    <!-- Dialog title asking users for microphone permission -->
+    <string name="ConversationActivity_allow_access_microphone">Allow access to your microphone</string>
+    <!-- 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>
+    <!-- Toast text explaining Signal\'s need for microphone access -->
+    <string name="ConversationActivity_signal_needs_microphone_access_voice_message">Molly needs microphone access to record a voice message.</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">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>
@@ -408,10 +424,17 @@
     <string name="ConversationActivity_you_will_leave_this_group_and_it_will_be_deleted_from_all_of_your_devices">Bạn sẽ rời nhóm, và lịch sử trò chuyện sẽ bị xóa trên tất cả các thiết bị của bạn.</string>
     <string name="ConversationActivity_delete">Xóa</string>
     <string name="ConversationActivity_delete_and_leave">Xóa và rời khỏi</string>
-    <string name="ConversationActivity__to_call_s_signal_needs_access_to_your_microphone">Để gọi %1$s, Molly cần quyền truy cập micro của bạn</string>
+
+    <!-- Dialog description that will explain the steps needed to give microphone permissions for a voice call -->
+    <string name="ConversationActivity__to_start_call">To start a 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">To start a call, allow Molly access to your microphone.</string>
+    <!-- Toast text explaining Signal\'s need for microphone access for a voice call -->
+    <string name="ConversationActivity_signal_needs_microphone_access_voice_call">Molly needs microphone access to start a call.</string>
 
 
     <string name="ConversationActivity_join">Tham gia</string>
+    <!-- Button text for an active group call but the call is currently full and unjoinable -->
     <string name="ConversationActivity_full">Đầy</string>
 
     <string name="ConversationActivity_error_sending_media">Lỗi gửi tệp đa phương tiện</string>
@@ -597,6 +620,7 @@
     <string name="ConversationListFragment_unarchive">Bỏ lưu trữ</string>
     <string name="ConversationListFragment_delete">Xóa</string>
     <string name="ConversationListFragment_select_all">Chọn tất cả</string>
+    <!-- Screen title shown when selecting multiple items from a list like conversation threads or call logs. -->
     <plurals name="ConversationListFragment_s_selected">
         <item quantity="other">%1$d đã chọn</item>
     </plurals>
@@ -845,6 +869,7 @@
     <plurals name="GroupManagement_invitation_sent">
         <item quantity="other">Đã gửi %1$d lời mời</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">\"%1$s\" không thể được tự động thêm vào nhóm bởi bạn.\n\nHọ đã được mời tham gia và sẽ không thấy tin nhắn trong nhóm cho đến khi họ chấp nhận.</string>
     <string name="GroupManagement_invite_multiple_users">Những người dùng này không thể được tự động thêm vào nhóm bởi bạn.\n\nHọ đã được mời tham gia và sẽ không thấy tin nhắn trong nhóm cho đến khi họ chấp nhận.</string>
 
@@ -1009,7 +1034,9 @@
 
     <string name="ManageGroupActivity_edit_name_and_picture">Sửa tên và ảnh</string>
     <string name="ManageGroupActivity_legacy_group">Nhóm Cũ</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">Đây là Nhóm Cũ. Các tính năng như quản trị viên nhóm chỉ có trong Nhóm Mới.</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">Đây là Nhóm Cũ. Để truy cập các tính năng mới như @nhắc tên và quản trị viên,</string>
     <string name="ManageGroupActivity_legacy_group_too_large">Nhóm Cũ này không thể được nâng cấp thành Nhóm Mới vì nhóm quá lớn. Kích cỡ nhóm tối đa là %1$d.</string>
     <string name="ManageGroupActivity_upgrade_this_group">nâng cấp nhóm này.</string>
@@ -1227,6 +1254,7 @@
         <item quantity="other">Xóa</item>
     </plurals>
 
+    <!-- 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="other">%1$dđã chọn (%2$s)</item>
     </plurals>
@@ -1290,17 +1318,13 @@
     <string name="MessageRecord_left_group">Bạn đã rời nhóm.</string>
     <string name="MessageRecord_you_updated_group">Bạn đã cập nhật nhóm.</string>
     <string name="MessageRecord_the_group_was_updated">Nhóm đã được cập nhật.</string>
-    <!-- Update message shown when placing an outgoing 1:1 voice/audio call and it\'s answered by the other party -->
+    <!-- Update message shown when placing an outgoing 1:1 voice/audio call -->
     <string name="MessageRecord_outgoing_voice_call">Cuộc gọi thoại đi</string>
-    <!-- Update message shown when placing an outgoing 1:1 video call and it\'s answered by the other party -->
+    <!-- Update message shown when placing an outgoing 1:1 video call -->
     <string name="MessageRecord_outgoing_video_call">Cuộc gọi video đi</string>
-    <!-- Update message shown when placing an outgoing 1:1 voice/audio call and it\'s not answered by the other party -->
-    <string name="MessageRecord_unanswered_voice_call">Cuộc gọi thoại không được trả lời</string>
-    <!-- Update message shown when placing an outgoing 1:1 video call and it\'s not answered by the other party -->
-    <string name="MessageRecord_unanswered_video_call">Cuộc gọi video không được trả lời</string>
-    <!-- Update message shown when receiving an incoming 1:1 voice/audio call and it\'s answered -->
+    <!-- Update message shown when receiving an incoming 1:1 voice/audio call and it\'s answered or ringing -->
     <string name="MessageRecord_incoming_voice_call">Cuộc gọi thoại đến</string>
-    <!-- Update message shown when receiving an incoming 1:1 video call and answered -->
+    <!-- Update message shown when receiving an incoming 1:1 video call and answered or ringing -->
     <string name="MessageRecord_incoming_video_call">Cuộc gọi video đến</string>
     <!-- Update message shown when receiving an incoming 1:1 voice/audio call and not answered -->
     <string name="MessageRecord_missed_voice_call">Cuộc gọi thoại bị nhỡ</string>
@@ -1310,10 +1334,6 @@
     <string name="MessageRecord_missed_voice_call_notification_profile">Cuộc gọi thoại bị nhỡ khi cấu hình thông báo được bật</string>
     <!-- Update message shown when receiving an incoming video call and declined due to notification profile -->
     <string name="MessageRecord_missed_video_call_notification_profile">Cuộc gọi video bị nhỡ khi cấu hình thông báo được bật</string>
-    <!-- Update message shown when receiving an incoming 1:1 voice/audio call and explicitly declined -->
-    <string name="MessageRecord_you_declined_a_voice_call">Bạn đã từ chối cuộc gọi thoại</string>
-    <!-- Update message shown when receiving an incoming 1:1 video call and explicitly declined -->
-    <string name="MessageRecord_you_declined_a_video_call">Bạn đã từ chối cuộc gọi video</string>
     <!-- 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 đã cập nhật nhóm.</string>
@@ -1514,27 +1534,52 @@
     <string name="MessageRecord_can_accept_payments">%1$s giờ đã có thể nhận Thanh toán</string>
 
     <!-- Group Calling update messages -->
-    <string name="MessageRecord_s_started_a_group_call_s">%1$s đã bắt đầu cuộc gọi nhóm · %2$s</string>
-    <string name="MessageRecord_you_started_a_group_call_s">Bạn đã bắt đầu cuộc gọi nhóm · %1$s</string>
-    <string name="MessageRecord_s_is_in_the_group_call_s">%1$s đang trong cuộc gọi nhóm · %2$s</string>
-    <string name="MessageRecord_you_are_in_the_group_call_s1">Bạn đang trong cuộc gọi nhóm · %1$s</string>
-    <string name="MessageRecord_s_and_s_are_in_the_group_call_s1">%1$s và %2$s đang trong cuộc gọi nhóm · %3$s</string>
-    <string name="MessageRecord_group_call_s">Cuộc gọi nhóm · %1$s</string>
-
-    <string name="MessageRecord_s_started_a_group_call">%1$s đã bắt đầu cuộc gọi nhóm</string>
-    <string name="MessageRecord_you_started_a_group_call">Bạn đã bắt đầu cuộc gọi nhóm</string>
-    <string name="MessageRecord_s_is_in_the_group_call">%1$s đang trong cuộc gọi nhóm</string>
-    <string name="MessageRecord_you_are_in_the_group_call">Bạn đang trong cuộc gọi nhóm</string>
-    <string name="MessageRecord_s_and_s_are_in_the_group_call">%1$s và %2$s đang trong cuộc gọi nhóm</string>
-    <string name="MessageRecord_group_call">Cuộc gọi nhóm</string>
+    <!-- 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 đang trong cuộc gọi · %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">Bạn đang trong cuộc gọi · %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 và %2$s đang trong cuộc gọi · %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 đang trong cuộc gọi</string>
+    <!-- Chat log text for an ongoing group call only the local user has joined -->
+    <string name="MessageRecord_you_are_in_the_call">Bạn đang trong cuộc gọi</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 và %2$s đang trong cuộc gọi</string>
+    <!-- Chat log text for a group call that ended within the last 5 minutes -->
+    <string name="MessageRecord__the_video_call_has_ended">Cuộc gọi video đã kết thúc</string>
+    <!-- Chat log text for a group call that ended within the last 5 minutes with a placeholder for formatted time -->
+    <string name="MessageRecord__the_video_call_has_ended_s">Cuộc gọi video đã kết thúc · %1$s</string>
+    <!-- Chat log text for a group call that ended more than 5 minutes ago and was missed -->
+    <string name="MessageRecord__missed_video_call">Cuộc gọi video bị nhỡ</string>
+    <!-- Chat log text for a group call that ended more than 5 minutes ago and was missed with a placeholder for formatted time -->
+    <string name="MessageRecord__missed_video_call_s">Cuộc gọi video nhỡ · %1$s</string>
+    <!-- Chat log text for a group call that ended that the local user did not start -->
+    <string name="MessageRecord__incoming_video_call">Cuộc gọi video đến</string>
+    <!-- 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">Cuộc gọi video đến · %1$s</string>
+    <!-- Chat log text for a group call that ended that the local user started -->
+    <string name="MessageRecord__outgoing_video_call">Cuộc gọi video đi</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">Cuộc gọi video đi · %1$s</string>
+    <!-- Chat log text for an ongoing group call that the local user started -->
+    <string name="MessageRecord__you_started_a_video_call">Bạn đã bắt đầu cuộc gọi video</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">Bạn đã bắt đầu cuộc gọi video · %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 đã bắt đầu cuộc gọi video</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 đã bắt đầu cuộc gọi video · %2$s</string>
 
     <string name="MessageRecord_you">Bạn</string>
 
-    <plurals name="MessageRecord_s_s_and_d_others_are_in_the_group_call_s">
+    <!-- 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="other">%1$s, %2$s, và %3$d người khác đang trong cuộc gọi nhóm · %4$s</item>
     </plurals>
 
-    <plurals name="MessageRecord_s_s_and_d_others_are_in_the_group_call">
+    <!-- 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="other">%1$s, %2$s, và %3$d người khác đang trong cuộc gọi nhóm</item>
     </plurals>
 
@@ -1984,6 +2029,7 @@
     <!-- Generic error when the app is unable to request an SMS code for an unknown reason. -->
     <string name="RegistrationActivity_unable_to_request_verification_code">Không thể yêu cầu mã xác minh. Vui lòng kiểm tra kết nối mạng của bạn và thử lại.</string>
     <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">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.-->
@@ -2127,7 +2173,7 @@
     <string name="SubmitDebugLogActivity_this_log_will_be_posted_publicly_online_for_contributors">Nhật kí này sẽ được đăng trực tuyến công khai cho những người đóng góp theo dõi. Bạn có thể kiểm tra nó trước khi gửi đi.</string>
 
     <!-- SupportEmailUtil -->
-  <!-- Removed by excludeNonTranslatables <string name="SupportEmailUtil_support_email" translatable="false">support@molly.im</string> -->
+  <!-- Removed by excludeNonTranslatables <string name="SupportEmailUtil_support_email" translatable="false">support@signal.org</string> -->
     <string name="SupportEmailUtil_filter">Bộ lọc:</string>
     <string name="SupportEmailUtil_device_info">Thông tin thiết bị:</string>
     <string name="SupportEmailUtil_android_version">Phiên bản Android:</string>
@@ -2622,6 +2668,8 @@
     <string name="ConversationUpdateItem_loading">Đang tải…</string>
     <string name="ConversationUpdateItem_learn_more">Tìm hiểu thêm</string>
     <string name="ConversationUpdateItem_join_call">Tham gia cuộc gọi</string>
+    <!-- Action button label for starting a new call in the current conversation -->
+    <string name="ConversationUpdateItem_call_back">Gọi lại</string>
     <string name="ConversationUpdateItem_return_to_call">Quay trở lại cuộc gọi</string>
     <string name="ConversationUpdateItem_call_is_full">Cuộc gọi đã đầy</string>
     <string name="ConversationUpdateItem_invite_friends">Mời bạn bè</string>
@@ -2686,6 +2734,7 @@
     <string name="safety_number_change_dialog__leave_call">Rời cuộc gọi</string>
     <string name="safety_number_change_dialog__the_following_people_may_have_reinstalled_or_changed_devices">Những người này có thể đã cài lại ứng dụng hoặc thay đổi thiết bị. Vui lòng xác minh lại mã số an toàn để đảm bảo riêng tư.</string>
     <string name="safety_number_change_dialog__view">Xem</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">Đã từng được xác minh</string>
 
     <!-- EnableCallNotificationSettingsDialog__call_notifications_checklist -->
@@ -2992,6 +3041,7 @@
 
     <string name="arrays__default">Mặc định</string>
     <string name="arrays__high">Cao</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">Cao nhất</string>
 
     <!-- plurals.xml -->
@@ -3260,7 +3310,7 @@
     <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 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>
@@ -3309,6 +3359,14 @@
     <!-- Storage permission row description -->
     <string name="GrantPermissionsFragment__send_photos_videos_and_files">Gửi ảnh, video và tập tin từ thiết bị của bạn.</string>
 
+    <!-- PermissionDeniedBottomSheet -->
+    <!-- Sheet describing step 1 on how to give permissions by opening settings -->
+    <string name="PermissionDeniedBottomSheet__1_tap_settings_below">1. Tap “Settings” below</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 Allow the permission</string>
+    <!-- Label for button at the bottom of the sheet which opens the system permission settings -->
+    <string name="PermissionDeniedBottomSheet__settings">Settings</string>
+
     <!-- PaymentsSecuritySetupFragment -->
     <!-- Toolbar title -->
     <string name="PaymentsSecuritySetupFragment__security_setup">Thiết lập bảo mật</string>
@@ -3349,6 +3407,7 @@
     <string name="PaymentsDetailsFragment__sent_to_s">Được gửi tới %1$s</string>
     <string name="PaymentsDetailsFragment__you_on_s_at_s">Bạn ở %1$s tại %2$s</string>
     <string name="PaymentsDetailsFragment__s_on_s_at_s">%1$s ở %2$s tại %3$s</string>
+    <!-- Prefix to a name to indicate who a payment was sent to -->
     <string name="PaymentsDetailsFragment__to">Đến</string>
     <string name="PaymentsDetailsFragment__from">Từ</string>
     <string name="PaymentsDetailsFragment__information">Chi tiết giao dịch bao gồm số tiền thanh toán và thời gian giao dịch là một phần của Sổ cái MobileCoin.</string>
@@ -3411,6 +3470,7 @@
     <string name="ConfirmPayment__confirm_payment">Xác nhận thanh toán</string>
     <string name="ConfirmPayment__network_fee">Phía mạng lưới</string>
     <string name="ConfirmPayment__estimated_s">Ước tính %1$s</string>
+    <!-- Prefix to a name to indicate who a payment will be sent to -->
     <string name="ConfirmPayment__to">Đến</string>
     <string name="ConfirmPayment__total_amount">Tổng cộng</string>
     <string name="ConfirmPayment__balance_s">Số dư: %1$s</string>
@@ -3559,6 +3619,14 @@
     <string name="conversation_group_options__conversation">Trò chuyện</string>
     <string name="conversation_group_options__broadcast">Phát rộng</string>
 
+    <!-- DoubleTapEditEducationSheet -->
+    <!-- Displayed as the title of the education bottom sheet -->
+    <string name="DoubleTapEditEducationSheet__double_tap_edit_title">Double tap to edit</string>
+    <!-- Text on the sheet explaining how double tapping on a message will let them edit it -->
+    <string name="DoubleTapEditEducationSheet__quickly_tap_twice">Quickly tap twice on your messages to edit them. You can edit your messages up to 24hrs after they’ve been sent.</string>
+    <!-- Button label to dismiss sheet -->
+    <string name="DoubleTapEditEducationSheet__got_it">Got it</string>
+
     <!-- text_secure_normal -->
     <string name="text_secure_normal__menu_new_group">Tạo nhóm mới</string>
     <string name="text_secure_normal__menu_settings">Cài đặt</string>
@@ -4006,6 +4074,7 @@
     <string name="RecipientBottomSheet_copied_to_clipboard">Đã sao chép vào clipboard</string>
 
     <string name="GroupRecipientListItem_admin">Quản trị viên</string>
+    <!-- Button text to approve a user that has requested to join a group -->
     <string name="GroupRecipientListItem_approve_description">Đồng ý</string>
     <string name="GroupRecipientListItem_deny_description">Từ chôi</string>
 
@@ -4033,6 +4102,7 @@
 
     <!-- VoiceNoteMediaDescriptionCompatFactory -->
     <string name="VoiceNoteMediaItemFactory__voice_message">Tin nhắn thoại · %1$s</string>
+    <!-- This is a title in a banner describing the conversation sender to receiver placeholders of the currently playing voice memo. -->
     <string name="VoiceNoteMediaItemFactory__s_to_s">%1$s đến %2$s</string>
 
     <!-- StorageUtil -->
@@ -4046,8 +4116,14 @@
     <string name="ReviewCardDialogFragment__review_members">Xem lại thành viên</string>
     <!-- Title of a screen where the user will be prompted to review a message request matching the name of someone they already know -->
     <string name="ReviewCardDialogFragment__review_request">Xem lại yêu cầu</string>
-    <string name="ReviewCardDialogFragment__d_group_members_have_the_same_name">%1$d thành viên nhóm có cùng tên, hãy xem các thành viên dưới đây và chọn hành động.</string>
-    <string name="ReviewCardDialogFragment__if_youre_not_sure">Nếu bạn không chắc yêu cầu từ người nào, xem các liên hệ bên dưới và chọn hành động.</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="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 -->
+    <plurals name="ReviewCardDialogFragment__if_youre_not_sure">
+        <item quantity="other">If you\'re not sure who the request is from, review the contacts below and take action.</item>
+    </plurals>
     <string name="ReviewCardDialogFragment__no_other_groups_in_common">Không có nhóm chung nào khác.</string>
     <string name="ReviewCardDialogFragment__no_groups_in_common">Không có nhóm chung.</string>
     <plurals name="ReviewCardDialogFragment__d_other_groups_in_common">
@@ -4076,11 +4152,18 @@
     <string name="CallParticipantsListUpdatePopupWindow__s_joined">%1$s đã tham gia</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_and_s_joined">%1$s và %2$s đã tham gia</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_s_and_s_joined">%1$s, %2$s và %3$s đã tham gia</string>
-    <string name="CallParticipantsListUpdatePopupWindow__s_s_and_d_others_joined">%1$s, %2$s và %3$d người khác đã tham gia</string>
+    <!-- Toast message shown in group call when 3 or more people join -->
+    <plurals name="CallParticipantsListUpdatePopupWindow__s_s_and_d_others_joined">
+        <item quantity="other">%1$s, %2$s and %3$d others joined</item>
+    </plurals>
+    <!-- Toast/popup text shown when someone leaves a group call -->
     <string name="CallParticipantsListUpdatePopupWindow__s_left">Còn lại %1$s</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_and_s_left">Còn lại %1$s và %2$s</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_s_and_s_left">Còn lại %1$s, %2$s và %3$s</string>
-    <string name="CallParticipantsListUpdatePopupWindow__s_s_and_d_others_left">Còn lại %1$s, %2$s và %3$d người khác</string>
+    <!-- Toast message shown in group call when 3 or more people leave -->
+    <plurals name="CallParticipantsListUpdatePopupWindow__s_s_and_d_others_left">
+        <item quantity="other">%1$s, %2$s and %3$d others left</item>
+    </plurals>
 
     <string name="CallParticipant__you">Bạn</string>
     <string name="CallParticipant__you_on_another_device">Bạn (trên một thiết bị khác)</string>
@@ -4448,10 +4531,14 @@
 
     <!-- PrivacySettingsFragment -->
     <string name="PrivacySettingsFragment__blocked">Đã chặn</string>
-    <string name="PrivacySettingsFragment__d_contacts">%1$d liên hệ</string>
+    <!-- Settings label that shows the number blocked contacts -->
+    <plurals name="PrivacySettingsFragment__d_contacts">
+        <item quantity="other">%1$d contacts</item>
+    </plurals>
     <string name="PrivacySettingsFragment__messaging">Nhắn tin</string>
     <string name="PrivacySettingsFragment__disappearing_messages">Tin nhắn tự hủy</string>
     <string name="PrivacySettingsFragment__app_security">Bảo mật ứng dụng</string>
+    <!-- This refers to the multi-tasking overview (recent apps) from the Android operating system.-->
     <string name="PrivacySettingsFragment__block_screenshots_in_the_recents_list_and_inside_the_app">Chặn chụp màn hình trong danh sách gần đây và bên trong ứng dụng</string>
     <string name="PrivacySettingsFragment__signal_message_and_calls">Tin nhắn và cuộc gọi Signal, luôn luôn chuyển tiếp cuộc gọi, và người gửi được niêm phong</string>
     <string name="PrivacySettingsFragment__default_timer_for_new_changes">Đồng hồ mặc định cho tất cả cuộc trò chuyện mới</string>
@@ -4508,11 +4595,14 @@
     <string name="DataAndStorageSettingsFragment__media_quality">Chất lượng tập tin đa phương tiện</string>
     <string name="DataAndStorageSettingsFragment__sent_media_quality">Chất lượng tập tin đa phương tiện đã gửi</string>
     <string name="DataAndStorageSettingsFragment__sending_high_quality_media_will_use_more_data">Việc gửi tập tin đa phương tiện chất lượng cao sẽ tốn nhiều lưu lượng hơn.</string>
+    <!-- Setting option that can be selected to default media to be sent as high quality by default -->
     <string name="DataAndStorageSettingsFragment__high">Cao</string>
+    <!-- Setting option that can be selected to default media to be sent as standard quality by default -->
     <string name="DataAndStorageSettingsFragment__standard">Tiêu chuẩn</string>
     <string name="DataAndStorageSettingsFragment__calls">Cuộc gọi</string>
 
     <!-- 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__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>
@@ -4721,6 +4811,7 @@
     <string name="AvatarPickerFragment__take_a_picture">Chụp hình</string>
     <string name="AvatarPickerFragment__choose_a_photo">Chọn hình</string>
     <string name="AvatarPickerFragment__photo">Ảnh</string>
+    <!-- Button label during avatar selection/creation that when tapped lets you generate an avatar from typed in text. -->
     <string name="AvatarPickerFragment__text">Tin nhắn</string>
     <string name="AvatarPickerFragment__save">Lưu</string>
     <string name="AvatarPickerFragment__clear_avatar">Xóa ảnh đại diện</string>
@@ -4777,7 +4868,7 @@
     <string name="MediaReviewFragment__add_a_message">Thêm vào một tin nhắn</string>
     <string name="MediaReviewFragment__add_a_reply">Thêm trả lời</string>
     <string name="MediaReviewFragment__send_to">Gửi đến</string>
-    <string name="MediaReviewFragment__view_once_message">Hiển thị tin nhắn xem một lần</string>
+    <string name="MediaReviewFragment__view_once_message">Đa phương tiện xem một lần</string>
     <string name="MediaReviewFragment__one_or_more_items_were_too_large">Có một hoặc nhiều tập tin quá nặng</string>
     <string name="MediaReviewFragment__one_or_more_items_were_invalid">Có một hoặc nhiều tập tin bị lỗi</string>
     <string name="MediaReviewFragment__too_many_items_selected">Bạn chọn quá nhiều tập tin</string>
@@ -5365,7 +5456,7 @@
     <string name="StoryViewerFragment__s_s">%1$s%2$s</string>
     <!-- Displayed when viewing a post you sent -->
     <string name="StoryViewerPageFragment__you">Bạn</string>
-    <!-- Displayed when viewing a post displayed to a group -->
+    <!-- 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 đến %2$s</string>
     <!-- Displayed when viewing a post from another user with no replies -->
     <string name="StoryViewerPageFragment__reply">Trả lời</string>
@@ -6558,5 +6649,26 @@
     <!-- Content description for opening the note editor -->
     <string name="ViewNoteSheet__edit_note">Sửa ghi chú</string>
 
+    <!-- BackupProgressService -->
+    <!-- Notification title shown while backup restore job is running -->
+    <string name="BackupProgressService_title">Đang khôi phục bản sao lưu…</string>
+    <!-- Notification title shown while downloading backup restore data -->
+    <string name="BackupProgressService_title_downloading">Đang tải dữ liệu sao lưu…</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>
+    <!-- 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 -->
+    <string name="BackupsTypeSettingsFragment__google_pay">Google Pay</string>
+    <!-- Displayed as the user\'s payment method as a label in a preference row -->
+    <string name="BackupsTypeSettingsFragment__bank_transfer">Bank transfer</string>
+    <!-- Displayed as the user\'s payment method as a label in a preference row -->
+    <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>
+
+
     <!-- 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 43f2d4fc19..acf1371cdd 100644
--- a/app/src/main/res/values-yue/strings.xml
+++ b/app/src/main/res/values-yue/strings.xml
@@ -1,6 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- smartling.instruction_comments_enabled = on -->
-<resources>
+<?xml version="1.0" encoding="UTF-8"?><!-- 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> -->
@@ -89,6 +87,16 @@
     <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">Allow access to your location</string>
+    <!-- Dialog description that will explain the steps needed to give location permission -->
+    <string name="AttachmentManager_signal_to_send_location">To send your location:</string>
+    <!-- Alert dialog description asking for location permission -->
+    <string name="AttachmentManager_signal_allow_signal_access_location">Allow Molly access to send your location.</string>
+    <!-- Toast text explaining Signal\'s need for location access -->
+    <string name="AttachmentManager_signal_needs_location_access">Molly needs location access to send your location.</string>
+
     <!-- Alert dialog title to show the recipient has not activated payments -->
     <string name="AttachmentManager__not_activated_payments">%1$s 未啟動付款 </string>
     <!-- Alert dialog description to send the recipient a request to activate payments -->
@@ -240,7 +248,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 已經 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>
@@ -383,8 +391,16 @@
     <string name="ConversationActivity_your_request_to_join_has_been_sent_to_the_group_admin">已經話咗畀個谷嘅話事人知，您要求加入呢個谷。一有消息會通知您㗎喇。</string>
     <string name="ConversationActivity_cancel_request">取消請求</string>
 
-    <string name="ConversationActivity_to_send_audio_messages_allow_signal_access_to_your_microphone">要傳送語音訊息嘅話，請允許 Molly 存取您部機個咪。</string>
+    <!-- Dialog title asking users for microphone permission -->
+    <string name="ConversationActivity_allow_access_microphone">Allow access to your microphone</string>
+    <!-- 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>
+    <!-- Toast text explaining Signal\'s need for microphone access -->
+    <string name="ConversationActivity_signal_needs_microphone_access_voice_message">Molly needs microphone access to record a voice message.</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">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>
@@ -408,10 +424,17 @@
     <string name="ConversationActivity_you_will_leave_this_group_and_it_will_be_deleted_from_all_of_your_devices">你會退出呢個群組，而呢個群組亦都會喺你所有裝置上面刪除。</string>
     <string name="ConversationActivity_delete">刪除</string>
     <string name="ConversationActivity_delete_and_leave">刪除，然後退出</string>
-    <string name="ConversationActivity__to_call_s_signal_needs_access_to_your_microphone">要同 %1$s 通話嘅話，Molly 需要存取您部機個咪</string>
+
+    <!-- Dialog description that will explain the steps needed to give microphone permissions for a voice call -->
+    <string name="ConversationActivity__to_start_call">To start a 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">To start a call, allow Molly access to your microphone.</string>
+    <!-- Toast text explaining Signal\'s need for microphone access for a voice call -->
+    <string name="ConversationActivity_signal_needs_microphone_access_voice_call">Molly needs microphone access to start a call.</string>
 
 
     <string name="ConversationActivity_join">摻埋我</string>
+    <!-- Button text for an active group call but the call is currently full and unjoinable -->
     <string name="ConversationActivity_full">爆棚</string>
 
     <string name="ConversationActivity_error_sending_media">多媒體檔案傳送唔到</string>
@@ -597,6 +620,7 @@
     <string name="ConversationListFragment_unarchive">取消封存</string>
     <string name="ConversationListFragment_delete">刪除</string>
     <string name="ConversationListFragment_select_all">全部揀晒</string>
+    <!-- Screen title shown when selecting multiple items from a list like conversation threads or call logs. -->
     <plurals name="ConversationListFragment_s_selected">
         <item quantity="other">揀選咗 %1$d 個</item>
     </plurals>
@@ -845,6 +869,7 @@
     <plurals name="GroupManagement_invitation_sent">
         <item quantity="other">%1$d 個邀請已經送出</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">您冇得自動將「%1$s」加入呢個谷度。\n\n已經邀請咗佢加入，喺佢應承之前，唔會見到個谷嘅任何訊息住。</string>
     <string name="GroupManagement_invite_multiple_users">您冇得自動將呢啲使用者加入呢個谷度。\n\n已經邀請咗佢哋加入，喺佢哋應承之前，都唔會見到個谷嘅任何訊息住。</string>
 
@@ -1009,7 +1034,9 @@
 
     <string name="ManageGroupActivity_edit_name_and_picture">改名同相</string>
     <string name="ManageGroupActivity_legacy_group">舊版谷</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">呢個係舊版谷。個谷嘅話事人等功能只有新版谷先用得。</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">呢個係舊版谷。若要用新功能，例如 @點名講 同埋個谷嘅話事人功能，</string>
     <string name="ManageGroupActivity_legacy_group_too_large">呢個舊版谷冇得升級做新版谷，因為人數太多。谷嘅人數上限係 %1$d 人。</string>
     <string name="ManageGroupActivity_upgrade_this_group">升級呢個谷。</string>
@@ -1227,6 +1254,7 @@
         <item quantity="other">刪除</item>
     </plurals>
 
+    <!-- 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="other">揀選咗 %1$d 個 (%2$s)</item>
     </plurals>
@@ -1290,17 +1318,13 @@
     <string name="MessageRecord_left_group">您現已退谷。</string>
     <string name="MessageRecord_you_updated_group">您更新咗呢個谷。</string>
     <string name="MessageRecord_the_group_was_updated">個谷更新咗。</string>
-    <!-- Update message shown when placing an outgoing 1:1 voice/audio call and it\'s answered by the other party -->
+    <!-- Update message shown when placing an outgoing 1:1 voice/audio call -->
     <string name="MessageRecord_outgoing_voice_call">打出嘅語音通話</string>
-    <!-- Update message shown when placing an outgoing 1:1 video call and it\'s answered by the other party -->
+    <!-- Update message shown when placing an outgoing 1:1 video call -->
     <string name="MessageRecord_outgoing_video_call">打出去嘅視像通話</string>
-    <!-- Update message shown when placing an outgoing 1:1 voice/audio call and it\'s not answered by the other party -->
-    <string name="MessageRecord_unanswered_voice_call">未接嘅語音通話</string>
-    <!-- Update message shown when placing an outgoing 1:1 video call and it\'s not answered by the other party -->
-    <string name="MessageRecord_unanswered_video_call">未接嘅視像通話</string>
-    <!-- Update message shown when receiving an incoming 1:1 voice/audio call and it\'s answered -->
+    <!-- Update message shown when receiving an incoming 1:1 voice/audio call and it\'s answered or ringing -->
     <string name="MessageRecord_incoming_voice_call">語音通話來電</string>
-    <!-- Update message shown when receiving an incoming 1:1 video call and answered -->
+    <!-- Update message shown when receiving an incoming 1:1 video call and answered or ringing -->
     <string name="MessageRecord_incoming_video_call">打入嚟嘅視像通話</string>
     <!-- Update message shown when receiving an incoming 1:1 voice/audio call and not answered -->
     <string name="MessageRecord_missed_voice_call">未接嘅語音通話</string>
@@ -1310,10 +1334,6 @@
     <string name="MessageRecord_missed_voice_call_notification_profile">通知設定檔開啟時未接語音通話</string>
     <!-- Update message shown when receiving an incoming video call and declined due to notification profile -->
     <string name="MessageRecord_missed_video_call_notification_profile">通知設定檔開啟時未接視像通話</string>
-    <!-- Update message shown when receiving an incoming 1:1 voice/audio call and explicitly declined -->
-    <string name="MessageRecord_you_declined_a_voice_call">你拒絕咗一個語音通話</string>
-    <!-- Update message shown when receiving an incoming 1:1 video call and explicitly declined -->
-    <string name="MessageRecord_you_declined_a_video_call">你拒絕咗一個視像通話</string>
     <!-- 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>
@@ -1514,27 +1534,52 @@
     <string name="MessageRecord_can_accept_payments">%1$s 而家可以接受付款</string>
 
     <!-- Group Calling update messages -->
-    <string name="MessageRecord_s_started_a_group_call_s">%1$s 已發起成谷通話 · %2$s</string>
-    <string name="MessageRecord_you_started_a_group_call_s">你開始咗一個群組通話 · %1$s</string>
-    <string name="MessageRecord_s_is_in_the_group_call_s">%1$s 嚟到成谷通話 · %2$s</string>
-    <string name="MessageRecord_you_are_in_the_group_call_s1">您嚟到成谷通話 · %1$s</string>
-    <string name="MessageRecord_s_and_s_are_in_the_group_call_s1">%1$s 同 %2$s 嚟到成谷通話 · %3$s</string>
-    <string name="MessageRecord_group_call_s">成谷通話 · %1$s</string>
-
-    <string name="MessageRecord_s_started_a_group_call">%1$s 已發起成谷通話</string>
-    <string name="MessageRecord_you_started_a_group_call">你開始咗一個群組通話</string>
-    <string name="MessageRecord_s_is_in_the_group_call">%1$s 嚟到成谷通話</string>
-    <string name="MessageRecord_you_are_in_the_group_call">您嚟到成谷通話</string>
-    <string name="MessageRecord_s_and_s_are_in_the_group_call">%1$s 同 %2$s 嚟到成谷通話</string>
-    <string name="MessageRecord_group_call">成谷通話</string>
+    <!-- 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 喺通話入面 · %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">你喺通話入面 · %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 同 %2$s 喺通話入面 · %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 喺通話入面</string>
+    <!-- Chat log text for an ongoing group call only the local user has joined -->
+    <string name="MessageRecord_you_are_in_the_call">你喺通話入面</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 同 %2$s 喺通話入面</string>
+    <!-- Chat log text for a group call that ended within the last 5 minutes -->
+    <string name="MessageRecord__the_video_call_has_ended">呢個視像通話已經完咗</string>
+    <!-- Chat log text for a group call that ended within the last 5 minutes with a placeholder for formatted time -->
+    <string name="MessageRecord__the_video_call_has_ended_s">呢個視像通話已經完咗 · %1$s</string>
+    <!-- Chat log text for a group call that ended more than 5 minutes ago and was missed -->
+    <string name="MessageRecord__missed_video_call">未接嘅視像通話</string>
+    <!-- Chat log text for a group call that ended more than 5 minutes ago and was missed with a placeholder for formatted time -->
+    <string name="MessageRecord__missed_video_call_s">未接嘅視像通話 · %1$s</string>
+    <!-- Chat log text for a group call that ended that the local user did not start -->
+    <string name="MessageRecord__incoming_video_call">打入嚟嘅視像通話</string>
+    <!-- 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">視像通話來電· %1$s</string>
+    <!-- Chat log text for a group call that ended that the local user started -->
+    <string name="MessageRecord__outgoing_video_call">打出去嘅視像通話</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">打出嘅視像通話· %1$s</string>
+    <!-- Chat log text for an ongoing group call that the local user started -->
+    <string name="MessageRecord__you_started_a_video_call">你開始咗視像通話</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">你開始咗視像通話 · %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 開始咗視像通話</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 開始咗視像通話 · %2$s</string>
 
     <string name="MessageRecord_you">您</string>
 
-    <plurals name="MessageRecord_s_s_and_d_others_are_in_the_group_call_s">
+    <!-- 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="other">%1$s、%2$s 同其餘 %3$d 人嚟到成谷通話 · %4$s</item>
     </plurals>
 
-    <plurals name="MessageRecord_s_s_and_d_others_are_in_the_group_call">
+    <!-- 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="other">%1$s、%2$s 同其餘 %3$d 人嚟到成谷通話</item>
     </plurals>
 
@@ -1984,6 +2029,7 @@
     <!-- Generic error when the app is unable to request an SMS code for an unknown reason. -->
     <string name="RegistrationActivity_unable_to_request_verification_code">驗證碼要求失敗。請檢查你嘅網絡連線，然後再試多次啦。</string>
     <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">Molly Android - 電話冧把格式</string>
     <!--    Small "toast" notification to the user confirming that they have requested a new code via voice call.-->
@@ -2127,7 +2173,7 @@
     <string name="SubmitDebugLogActivity_this_log_will_be_posted_publicly_online_for_contributors">下低呢個記錄檔將會公開擺上網，畀有心貢獻嘅人睇到。您可以自己睇一次先，上載嘅話先至撳掣。</string>
 
     <!-- SupportEmailUtil -->
-  <!-- Removed by excludeNonTranslatables <string name="SupportEmailUtil_support_email" translatable="false">support@molly.im</string> -->
+  <!-- Removed by excludeNonTranslatables <string name="SupportEmailUtil_support_email" translatable="false">support@signal.org</string> -->
     <string name="SupportEmailUtil_filter">篩選：</string>
     <string name="SupportEmailUtil_device_info">部機嘅資訊：</string>
     <string name="SupportEmailUtil_android_version">Android 版本：</string>
@@ -2622,6 +2668,8 @@
     <string name="ConversationUpdateItem_loading">載入緊</string>
     <string name="ConversationUpdateItem_learn_more">講多啲畀我聽</string>
     <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_call_is_full">通話已滿座</string>
     <string name="ConversationUpdateItem_invite_friends">誠邀好友</string>
@@ -2686,6 +2734,7 @@
     <string name="safety_number_change_dialog__leave_call">退出通話</string>
     <string name="safety_number_change_dialog__the_following_people_may_have_reinstalled_or_changed_devices">下列嘅人可能已重新裝過 Signal 或者換咗部機。同佢哋驗證下您嘅安全碼，可以確保私隱。</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>
 
     <!-- EnableCallNotificationSettingsDialog__call_notifications_checklist -->
@@ -2992,6 +3041,7 @@
 
     <string name="arrays__default">預設</string>
     <string name="arrays__high">高</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">最高</string>
 
     <!-- plurals.xml -->
@@ -3260,7 +3310,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">你可以用 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">Molly 付款已經曲終人散。您仍然可以將款項轉移去交易平台，但唔再能夠傳送或接收付款，又或增加款項。</string>
@@ -3309,6 +3359,14 @@
     <!-- Storage permission row description -->
     <string name="GrantPermissionsFragment__send_photos_videos_and_files">由你部機傳送相片、影片同檔案。</string>
 
+    <!-- PermissionDeniedBottomSheet -->
+    <!-- Sheet describing step 1 on how to give permissions by opening settings -->
+    <string name="PermissionDeniedBottomSheet__1_tap_settings_below">1. Tap “Settings” below</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 Allow the permission</string>
+    <!-- Label for button at the bottom of the sheet which opens the system permission settings -->
+    <string name="PermissionDeniedBottomSheet__settings">Settings</string>
+
     <!-- PaymentsSecuritySetupFragment -->
     <!-- Toolbar title -->
     <string name="PaymentsSecuritySetupFragment__security_setup">安全設定</string>
@@ -3349,6 +3407,7 @@
     <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__information">交易詳情包括付款金額同交易時間，係 MobileCoin Ledger 嘅一部份。</string>
@@ -3411,6 +3470,7 @@
     <string name="ConfirmPayment__confirm_payment">確認付款</string>
     <string name="ConfirmPayment__network_fee">網絡費</string>
     <string name="ConfirmPayment__estimated_s">估算 %1$s</string>
+    <!-- Prefix to a name to indicate who a payment will be sent to -->
     <string name="ConfirmPayment__to">收款人：</string>
     <string name="ConfirmPayment__total_amount">總數金額</string>
     <string name="ConfirmPayment__balance_s">結餘：%1$s</string>
@@ -3559,6 +3619,14 @@
     <string name="conversation_group_options__conversation">聊天</string>
     <string name="conversation_group_options__broadcast">廣播</string>
 
+    <!-- DoubleTapEditEducationSheet -->
+    <!-- Displayed as the title of the education bottom sheet -->
+    <string name="DoubleTapEditEducationSheet__double_tap_edit_title">Double tap to edit</string>
+    <!-- Text on the sheet explaining how double tapping on a message will let them edit it -->
+    <string name="DoubleTapEditEducationSheet__quickly_tap_twice">Quickly tap twice on your messages to edit them. You can edit your messages up to 24hrs after they’ve been sent.</string>
+    <!-- Button label to dismiss sheet -->
+    <string name="DoubleTapEditEducationSheet__got_it">Got it</string>
+
     <!-- text_secure_normal -->
     <string name="text_secure_normal__menu_new_group">開個新谷</string>
     <string name="text_secure_normal__menu_settings">設定</string>
@@ -4006,6 +4074,7 @@
     <string name="RecipientBottomSheet_copied_to_clipboard">複製咗去剪貼簿</string>
 
     <string name="GroupRecipientListItem_admin">話事人</string>
+    <!-- Button text to approve a user that has requested to join a group -->
     <string name="GroupRecipientListItem_approve_description">批准</string>
     <string name="GroupRecipientListItem_deny_description">拒絕</string>
 
@@ -4033,6 +4102,7 @@
 
     <!-- VoiceNoteMediaDescriptionCompatFactory -->
     <string name="VoiceNoteMediaItemFactory__voice_message">語音訊息 · %1$s</string>
+    <!-- This is a title in a banner describing the conversation sender to receiver placeholders of the currently playing voice memo. -->
     <string name="VoiceNoteMediaItemFactory__s_to_s">%1$s 畀 %2$s</string>
 
     <!-- StorageUtil -->
@@ -4046,8 +4116,14 @@
     <string name="ReviewCardDialogFragment__review_members">檢查吓成員名單</string>
     <!-- Title of a screen where the user will be prompted to review a message request matching the name of someone they already know -->
     <string name="ReviewCardDialogFragment__review_request">審查請求</string>
-    <string name="ReviewCardDialogFragment__d_group_members_have_the_same_name">個谷嘅 %1$d 位成員撞名，請批閱下列成員並視乎情況做要做嘅嘢。</string>
-    <string name="ReviewCardDialogFragment__if_youre_not_sure">假如您唔肯定係邊個發出請求，請批閱下列嘅聯絡人並去做要做嘅嘢。</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="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 -->
+    <plurals name="ReviewCardDialogFragment__if_youre_not_sure">
+        <item quantity="other">If you\'re not sure who the request is from, review the contacts below and take action.</item>
+    </plurals>
     <string name="ReviewCardDialogFragment__no_other_groups_in_common">無其他有緣相遇嘅谷。</string>
     <string name="ReviewCardDialogFragment__no_groups_in_common">無有緣相遇嘅谷。</string>
     <plurals name="ReviewCardDialogFragment__d_other_groups_in_common">
@@ -4076,11 +4152,18 @@
     <string name="CallParticipantsListUpdatePopupWindow__s_joined">%1$s 已加入</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_and_s_joined">%1$s 同 %2$s 已加入</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_s_and_s_joined">%1$s、%2$s 同 %3$s 已加入</string>
-    <string name="CallParticipantsListUpdatePopupWindow__s_s_and_d_others_joined">%1$s、%2$s 同另外 %3$d 人已加入</string>
+    <!-- Toast message shown in group call when 3 or more people join -->
+    <plurals name="CallParticipantsListUpdatePopupWindow__s_s_and_d_others_joined">
+        <item quantity="other">%1$s, %2$s and %3$d others joined</item>
+    </plurals>
+    <!-- Toast/popup text shown when someone leaves a group call -->
     <string name="CallParticipantsListUpdatePopupWindow__s_left">%1$s 已退出</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_and_s_left">%1$s 同 %2$s 已退出</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_s_and_s_left">%1$s、%2$s 同 %3$s 已退出</string>
-    <string name="CallParticipantsListUpdatePopupWindow__s_s_and_d_others_left">%1$s、%2$s 同另外 %3$d 人已退出</string>
+    <!-- Toast message shown in group call when 3 or more people leave -->
+    <plurals name="CallParticipantsListUpdatePopupWindow__s_s_and_d_others_left">
+        <item quantity="other">%1$s, %2$s and %3$d others left</item>
+    </plurals>
 
     <string name="CallParticipant__you">您</string>
     <string name="CallParticipant__you_on_another_device">您 (用另一部機)</string>
@@ -4448,10 +4531,14 @@
 
     <!-- PrivacySettingsFragment -->
     <string name="PrivacySettingsFragment__blocked">封鎖咗</string>
-    <string name="PrivacySettingsFragment__d_contacts">%1$d 位仁兄</string>
+    <!-- Settings label that shows the number blocked contacts -->
+    <plurals name="PrivacySettingsFragment__d_contacts">
+        <item quantity="other">%1$d contacts</item>
+    </plurals>
     <string name="PrivacySettingsFragment__messaging">發訊息</string>
     <string name="PrivacySettingsFragment__disappearing_messages">過眼雲煙訊息</string>
     <string name="PrivacySettingsFragment__app_security">App 保安措施</string>
+    <!-- This refers to the multi-tasking overview (recent apps) from the Android operating system.-->
     <string name="PrivacySettingsFragment__block_screenshots_in_the_recents_list_and_inside_the_app">封鎖最近清單同埋應用程式入面嘅螢幕截圖</string>
     <string name="PrivacySettingsFragment__signal_message_and_calls">Signal 訊息同通話、一律轉駁通話同封密發送人</string>
     <string name="PrivacySettingsFragment__default_timer_for_new_changes">為新嘅傾偈預設倒數限期</string>
@@ -4508,11 +4595,14 @@
     <string name="DataAndStorageSettingsFragment__media_quality">多媒體檔案嘅畫質</string>
     <string name="DataAndStorageSettingsFragment__sent_media_quality">發送多媒體檔案嘅畫質</string>
     <string name="DataAndStorageSettingsFragment__sending_high_quality_media_will_use_more_data">發送高畫質嘅多媒體檔案會用多啲數據。</string>
+    <!-- Setting option that can be selected to default media to be sent as high quality by default -->
     <string name="DataAndStorageSettingsFragment__high">高</string>
+    <!-- Setting option that can be selected to default media to be sent as standard quality by default -->
     <string name="DataAndStorageSettingsFragment__standard">標準</string>
     <string name="DataAndStorageSettingsFragment__calls">通話</string>
 
     <!-- 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__use_custom_colors">用自訂嘅顏色</string>
     <string name="ChatColorSelectionFragment__chat_color">傾偈顏色</string>
@@ -4721,6 +4811,7 @@
     <string name="AvatarPickerFragment__take_a_picture">影返幅相</string>
     <string name="AvatarPickerFragment__choose_a_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>
     <string name="AvatarPickerFragment__clear_avatar">清走個頭像</string>
@@ -4777,7 +4868,7 @@
     <string name="MediaReviewFragment__add_a_message">寫返句訊息</string>
     <string name="MediaReviewFragment__add_a_reply">寫返句回覆</string>
     <string name="MediaReviewFragment__send_to">傳送至</string>
-    <string name="MediaReviewFragment__view_once_message">流聲掠影訊息</string>
+    <string name="MediaReviewFragment__view_once_message">閱後即焚媒體</string>
     <string name="MediaReviewFragment__one_or_more_items_were_too_large">有啲項目大得滯</string>
     <string name="MediaReviewFragment__one_or_more_items_were_invalid">有啲項目無效</string>
     <string name="MediaReviewFragment__too_many_items_selected">揀選嘅項目多得滯</string>
@@ -5365,7 +5456,7 @@
     <string name="StoryViewerFragment__s_s">%1$s %2$s</string>
     <!-- Displayed when viewing a post you sent -->
     <string name="StoryViewerPageFragment__you">您</string>
-    <!-- Displayed when viewing a post displayed to a group -->
+    <!-- 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 -->
     <string name="StoryViewerPageFragment__reply">回覆</string>
@@ -6558,5 +6649,26 @@
     <!-- Content description for opening the note editor -->
     <string name="ViewNoteSheet__edit_note">編輯備註</string>
 
+    <!-- BackupProgressService -->
+    <!-- Notification title shown while backup restore job is running -->
+    <string name="BackupProgressService_title">還原緊備份…</string>
+    <!-- Notification title shown while downloading backup restore data -->
+    <string name="BackupProgressService_title_downloading">下載緊備份資料…</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>
+    <!-- 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 -->
+    <string name="BackupsTypeSettingsFragment__google_pay">Google Pay</string>
+    <!-- Displayed as the user\'s payment method as a label in a preference row -->
+    <string name="BackupsTypeSettingsFragment__bank_transfer">Bank transfer</string>
+    <!-- Displayed as the user\'s payment method as a label in a preference row -->
+    <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>
+
+
     <!-- 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 19d63ea553..c8b2de8e34 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -1,6 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- smartling.instruction_comments_enabled = on -->
-<resources>
+<?xml version="1.0" encoding="UTF-8"?><!-- 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> -->
@@ -89,6 +87,16 @@
     <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">Allow access to your location</string>
+    <!-- Dialog description that will explain the steps needed to give location permission -->
+    <string name="AttachmentManager_signal_to_send_location">To send your location:</string>
+    <!-- Alert dialog description asking for location permission -->
+    <string name="AttachmentManager_signal_allow_signal_access_location">Allow Molly access to send your location.</string>
+    <!-- Toast text explaining Signal\'s need for location access -->
+    <string name="AttachmentManager_signal_needs_location_access">Molly needs location access to send your location.</string>
+
     <!-- Alert dialog title to show the recipient has not activated payments -->
     <string name="AttachmentManager__not_activated_payments">%1$s还未激活付款 </string>
     <!-- Alert dialog description to send the recipient a request to activate payments -->
@@ -240,7 +248,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 版本已过期，目前您只能查看消息记录，并且在升级 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>
@@ -383,8 +391,16 @@
     <string name="ConversationActivity_your_request_to_join_has_been_sent_to_the_group_admin">您的入群申请已发送给群组管理员，您将在管理员作出决定后收到通知。</string>
     <string name="ConversationActivity_cancel_request">撤回申请</string>
 
-    <string name="ConversationActivity_to_send_audio_messages_allow_signal_access_to_your_microphone">如需发送语音，请允许 Molly 使用麦克风。</string>
+    <!-- Dialog title asking users for microphone permission -->
+    <string name="ConversationActivity_allow_access_microphone">Allow access to your microphone</string>
+    <!-- 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>
+    <!-- Toast text explaining Signal\'s need for microphone access -->
+    <string name="ConversationActivity_signal_needs_microphone_access_voice_message">Molly needs microphone access to record a voice message.</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">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>
@@ -408,10 +424,17 @@
     <string name="ConversationActivity_you_will_leave_this_group_and_it_will_be_deleted_from_all_of_your_devices">你将离开这个组，它将从你所有的设备中删除。</string>
     <string name="ConversationActivity_delete">删除</string>
     <string name="ConversationActivity_delete_and_leave">删除并离开</string>
-    <string name="ConversationActivity__to_call_s_signal_needs_access_to_your_microphone">Molly 需要访问您的麦克风来呼叫 %1$s</string>
+
+    <!-- Dialog description that will explain the steps needed to give microphone permissions for a voice call -->
+    <string name="ConversationActivity__to_start_call">To start a 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">To start a call, allow Molly access to your microphone.</string>
+    <!-- Toast text explaining Signal\'s need for microphone access for a voice call -->
+    <string name="ConversationActivity_signal_needs_microphone_access_voice_call">Molly needs microphone access to start a call.</string>
 
 
     <string name="ConversationActivity_join">加入</string>
+    <!-- Button text for an active group call but the call is currently full and unjoinable -->
     <string name="ConversationActivity_full">已满</string>
 
     <string name="ConversationActivity_error_sending_media">媒体发送失败</string>
@@ -597,6 +620,7 @@
     <string name="ConversationListFragment_unarchive">取消存档</string>
     <string name="ConversationListFragment_delete">删除</string>
     <string name="ConversationListFragment_select_all">选择全部</string>
+    <!-- Screen title shown when selecting multiple items from a list like conversation threads or call logs. -->
     <plurals name="ConversationListFragment_s_selected">
         <item quantity="other">已选择 %1$d</item>
     </plurals>
@@ -845,6 +869,7 @@
     <plurals name="GroupManagement_invitation_sent">
         <item quantity="other">已发送%1$d个邀请</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">“%1$s”不能直接被您邀请入群。\n\n对方已收到入群邀请，但在他同意入群前他将无法看到群消息。</string>
     <string name="GroupManagement_invite_multiple_users">这些用户不能直接被你邀请入群组。\n\n他们已经收到入群邀请，但在他们同意之前无法收到来自该群组的任何消息。</string>
 
@@ -1009,7 +1034,9 @@
 
     <string name="ManageGroupActivity_edit_name_and_picture">编辑昵称和头像</string>
     <string name="ManageGroupActivity_legacy_group">旧版群组</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">这是个旧版群组，管理员等功能支持新版群组。</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">这是一个旧版群组，要是使用@提醒和管理员功能，</string>
     <string name="ManageGroupActivity_legacy_group_too_large">由于人数太多，此旧版群组无法升级成新版群组。升级要求人数在%1$d以下。</string>
     <string name="ManageGroupActivity_upgrade_this_group">升级此群组。</string>
@@ -1227,6 +1254,7 @@
         <item quantity="other">删除</item>
     </plurals>
 
+    <!-- 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="other">%1$d 已选择（%2$s）</item>
     </plurals>
@@ -1290,17 +1318,13 @@
     <string name="MessageRecord_left_group">您已离开该群组。</string>
     <string name="MessageRecord_you_updated_group">您已更新该群组</string>
     <string name="MessageRecord_the_group_was_updated">群组已更新。</string>
-    <!-- Update message shown when placing an outgoing 1:1 voice/audio call and it\'s answered by the other party -->
+    <!-- Update message shown when placing an outgoing 1:1 voice/audio call -->
     <string name="MessageRecord_outgoing_voice_call">拨出语音通话</string>
-    <!-- Update message shown when placing an outgoing 1:1 video call and it\'s answered by the other party -->
+    <!-- Update message shown when placing an outgoing 1:1 video call -->
     <string name="MessageRecord_outgoing_video_call">拨出视频通话</string>
-    <!-- Update message shown when placing an outgoing 1:1 voice/audio call and it\'s not answered by the other party -->
-    <string name="MessageRecord_unanswered_voice_call">未接语音通话</string>
-    <!-- Update message shown when placing an outgoing 1:1 video call and it\'s not answered by the other party -->
-    <string name="MessageRecord_unanswered_video_call">未接视频通话</string>
-    <!-- Update message shown when receiving an incoming 1:1 voice/audio call and it\'s answered -->
+    <!-- Update message shown when receiving an incoming 1:1 voice/audio call and it\'s answered or ringing -->
     <string name="MessageRecord_incoming_voice_call">语音来电</string>
-    <!-- Update message shown when receiving an incoming 1:1 video call and answered -->
+    <!-- Update message shown when receiving an incoming 1:1 video call and answered or ringing -->
     <string name="MessageRecord_incoming_video_call">视频来电</string>
     <!-- Update message shown when receiving an incoming 1:1 voice/audio call and not answered -->
     <string name="MessageRecord_missed_voice_call">未接语音来电</string>
@@ -1310,10 +1334,6 @@
     <string name="MessageRecord_missed_voice_call_notification_profile">语音通话由于开启通知配置而未接通</string>
     <!-- Update message shown when receiving an incoming video call and declined due to notification profile -->
     <string name="MessageRecord_missed_video_call_notification_profile">视频通话由于开启通知配置而未接通</string>
-    <!-- Update message shown when receiving an incoming 1:1 voice/audio call and explicitly declined -->
-    <string name="MessageRecord_you_declined_a_voice_call">您拒接了语音通话</string>
-    <!-- Update message shown when receiving an incoming 1:1 video call and explicitly declined -->
-    <string name="MessageRecord_you_declined_a_video_call">您拒接了视频通话</string>
     <!-- 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>
@@ -1514,27 +1534,52 @@
     <string name="MessageRecord_can_accept_payments">%1$s现在可以接受付款啦</string>
 
     <!-- Group Calling update messages -->
-    <string name="MessageRecord_s_started_a_group_call_s">%1$s发起了群组通话 · %2$s</string>
-    <string name="MessageRecord_you_started_a_group_call_s">您发起了一个群组通话 · %1$s</string>
-    <string name="MessageRecord_s_is_in_the_group_call_s">%1$s 在群通话中 · %2$s</string>
-    <string name="MessageRecord_you_are_in_the_group_call_s1">您在群通话中 · %1$s</string>
-    <string name="MessageRecord_s_and_s_are_in_the_group_call_s1">%1$s 和 %2$s 在群通话中 · %3$s</string>
-    <string name="MessageRecord_group_call_s">群组通话 · %1$s</string>
-
-    <string name="MessageRecord_s_started_a_group_call">%1$s发起了群通话</string>
-    <string name="MessageRecord_you_started_a_group_call">您发起了一个群组通话</string>
-    <string name="MessageRecord_s_is_in_the_group_call">%1$s 在群通话中</string>
-    <string name="MessageRecord_you_are_in_the_group_call">您在此群组通话中</string>
-    <string name="MessageRecord_s_and_s_are_in_the_group_call">%1$s 和 %2$s 在群通话中</string>
-    <string name="MessageRecord_group_call">群组通话</string>
+    <!-- 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在通话中 · %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">你在通话中 · %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和%2$s在通话中 · %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在通话中</string>
+    <!-- Chat log text for an ongoing group call only the local user has joined -->
+    <string name="MessageRecord_you_are_in_the_call">你在通话中</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和%2$s在通话中</string>
+    <!-- Chat log text for a group call that ended within the last 5 minutes -->
+    <string name="MessageRecord__the_video_call_has_ended">视频通话已结束</string>
+    <!-- Chat log text for a group call that ended within the last 5 minutes with a placeholder for formatted time -->
+    <string name="MessageRecord__the_video_call_has_ended_s">视频通话已结束 · %1$s</string>
+    <!-- Chat log text for a group call that ended more than 5 minutes ago and was missed -->
+    <string name="MessageRecord__missed_video_call">未接视频来电</string>
+    <!-- Chat log text for a group call that ended more than 5 minutes ago and was missed with a placeholder for formatted time -->
+    <string name="MessageRecord__missed_video_call_s">未接视频来电 · %1$s</string>
+    <!-- Chat log text for a group call that ended that the local user did not start -->
+    <string name="MessageRecord__incoming_video_call">视频来电</string>
+    <!-- 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">视频来电 · %1$s</string>
+    <!-- Chat log text for a group call that ended that the local user started -->
+    <string name="MessageRecord__outgoing_video_call">拨出视频通话</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">拨出视频通话 · %1$s</string>
+    <!-- Chat log text for an ongoing group call that the local user started -->
+    <string name="MessageRecord__you_started_a_video_call">你发起了视频通话</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">你发起了视频通话 · %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发起了视频通话</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发起了视频通话 · %2$s</string>
 
     <string name="MessageRecord_you">您</string>
 
-    <plurals name="MessageRecord_s_s_and_d_others_are_in_the_group_call_s">
+    <!-- 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="other">%1$s，%2$s 和其他%3$d位成员在群组通话中 · %4$s</item>
     </plurals>
 
-    <plurals name="MessageRecord_s_s_and_d_others_are_in_the_group_call">
+    <!-- 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="other">%1$s，%2$s 和其他%3$d位成员在群组通话中</item>
     </plurals>
 
@@ -1984,6 +2029,7 @@
     <!-- Generic error when the app is unable to request an SMS code for an unknown reason. -->
     <string name="RegistrationActivity_unable_to_request_verification_code">无法请求验证码。请检查互联网连接并重试。</string>
     <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">Molly Android - 手机号码格式</string>
     <!--    Small "toast" notification to the user confirming that they have requested a new code via voice call.-->
@@ -2127,7 +2173,7 @@
     <string name="SubmitDebugLogActivity_this_log_will_be_posted_publicly_online_for_contributors">此日志将会在线上公开发布，供赞助人查看。您可以先仔细检查再上传。</string>
 
     <!-- SupportEmailUtil -->
-  <!-- Removed by excludeNonTranslatables <string name="SupportEmailUtil_support_email" translatable="false">support@molly.im</string> -->
+  <!-- Removed by excludeNonTranslatables <string name="SupportEmailUtil_support_email" translatable="false">support@signal.org</string> -->
     <string name="SupportEmailUtil_filter">筛选器：</string>
     <string name="SupportEmailUtil_device_info">设备信息：</string>
     <string name="SupportEmailUtil_android_version">Android版本：</string>
@@ -2622,6 +2668,8 @@
     <string name="ConversationUpdateItem_loading">正在加载</string>
     <string name="ConversationUpdateItem_learn_more">了解更多</string>
     <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_call_is_full">通话人数已满</string>
     <string name="ConversationUpdateItem_invite_friends">邀请好友</string>
@@ -2686,6 +2734,7 @@
     <string name="safety_number_change_dialog__leave_call">离开通话</string>
     <string name="safety_number_change_dialog__the_following_people_may_have_reinstalled_or_changed_devices">以下用户可能重新安装了 Signal 或更换了设备，请重新与之验证安全码以保护您的隐私。</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>
 
     <!-- EnableCallNotificationSettingsDialog__call_notifications_checklist -->
@@ -2992,6 +3041,7 @@
 
     <string name="arrays__default">默认</string>
     <string name="arrays__high">高</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">最大</string>
 
     <!-- plurals.xml -->
@@ -3260,7 +3310,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">您可以使用 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">Molly 的付款不再可用，不过您仍可将资金转移至交易平台，但是不再能够收发付款或添加资金。</string>
@@ -3309,6 +3359,14 @@
     <!-- Storage permission row description -->
     <string name="GrantPermissionsFragment__send_photos_videos_and_files">用于从您的设备中发送照片、视频和文件。</string>
 
+    <!-- PermissionDeniedBottomSheet -->
+    <!-- Sheet describing step 1 on how to give permissions by opening settings -->
+    <string name="PermissionDeniedBottomSheet__1_tap_settings_below">1. Tap “Settings” below</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 Allow the permission</string>
+    <!-- Label for button at the bottom of the sheet which opens the system permission settings -->
+    <string name="PermissionDeniedBottomSheet__settings">Settings</string>
+
     <!-- PaymentsSecuritySetupFragment -->
     <!-- Toolbar title -->
     <string name="PaymentsSecuritySetupFragment__security_setup">安全设置</string>
@@ -3349,6 +3407,7 @@
     <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__information">交易详情（包括付款金额和交易时间）是 MobileCoin 账簿的一部分。</string>
@@ -3411,6 +3470,7 @@
     <string name="ConfirmPayment__confirm_payment">确认付款</string>
     <string name="ConfirmPayment__network_fee">网络费</string>
     <string name="ConfirmPayment__estimated_s">估计 %1$s</string>
+    <!-- Prefix to a name to indicate who a payment will be sent to -->
     <string name="ConfirmPayment__to">至</string>
     <string name="ConfirmPayment__total_amount">总金额</string>
     <string name="ConfirmPayment__balance_s">余额：%1$s</string>
@@ -3559,6 +3619,14 @@
     <string name="conversation_group_options__conversation">聊天</string>
     <string name="conversation_group_options__broadcast">广播</string>
 
+    <!-- DoubleTapEditEducationSheet -->
+    <!-- Displayed as the title of the education bottom sheet -->
+    <string name="DoubleTapEditEducationSheet__double_tap_edit_title">Double tap to edit</string>
+    <!-- Text on the sheet explaining how double tapping on a message will let them edit it -->
+    <string name="DoubleTapEditEducationSheet__quickly_tap_twice">Quickly tap twice on your messages to edit them. You can edit your messages up to 24hrs after they’ve been sent.</string>
+    <!-- Button label to dismiss sheet -->
+    <string name="DoubleTapEditEducationSheet__got_it">Got it</string>
+
     <!-- text_secure_normal -->
     <string name="text_secure_normal__menu_new_group">新建群组</string>
     <string name="text_secure_normal__menu_settings">设置</string>
@@ -4006,6 +4074,7 @@
     <string name="RecipientBottomSheet_copied_to_clipboard">已复制到剪切板</string>
 
     <string name="GroupRecipientListItem_admin">管理员</string>
+    <!-- Button text to approve a user that has requested to join a group -->
     <string name="GroupRecipientListItem_approve_description">批准</string>
     <string name="GroupRecipientListItem_deny_description">拒绝</string>
 
@@ -4033,6 +4102,7 @@
 
     <!-- VoiceNoteMediaDescriptionCompatFactory -->
     <string name="VoiceNoteMediaItemFactory__voice_message">语音消息 · %1$s</string>
+    <!-- This is a title in a banner describing the conversation sender to receiver placeholders of the currently playing voice memo. -->
     <string name="VoiceNoteMediaItemFactory__s_to_s">%1$s 至 %2$s</string>
 
     <!-- StorageUtil -->
@@ -4046,8 +4116,14 @@
     <string name="ReviewCardDialogFragment__review_members">查看成员</string>
     <!-- Title of a screen where the user will be prompted to review a message request matching the name of someone they already know -->
     <string name="ReviewCardDialogFragment__review_request">审查请求</string>
-    <string name="ReviewCardDialogFragment__d_group_members_have_the_same_name">%1$d 位群组成员的名字相同，请审查以下成员并采取相应措施。</string>
-    <string name="ReviewCardDialogFragment__if_youre_not_sure">如果您不确定此请求的来源，请审查以下联系人并采取相应措施。</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="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 -->
+    <plurals name="ReviewCardDialogFragment__if_youre_not_sure">
+        <item quantity="other">If you\'re not sure who the request is from, review the contacts below and take action.</item>
+    </plurals>
     <string name="ReviewCardDialogFragment__no_other_groups_in_common">没有其它共同群组。</string>
     <string name="ReviewCardDialogFragment__no_groups_in_common">无共同群组。</string>
     <plurals name="ReviewCardDialogFragment__d_other_groups_in_common">
@@ -4076,11 +4152,18 @@
     <string name="CallParticipantsListUpdatePopupWindow__s_joined">%1$s已加入</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_and_s_joined">%1$s与%2$s已加入</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_s_and_s_joined">%1$s、%2$s和 %3$s已加入</string>
-    <string name="CallParticipantsListUpdatePopupWindow__s_s_and_d_others_joined">%1$s、%2$s 及其它 %3$d 位用户已加入</string>
+    <!-- Toast message shown in group call when 3 or more people join -->
+    <plurals name="CallParticipantsListUpdatePopupWindow__s_s_and_d_others_joined">
+        <item quantity="other">%1$s, %2$s and %3$d others joined</item>
+    </plurals>
+    <!-- Toast/popup text shown when someone leaves a group call -->
     <string name="CallParticipantsListUpdatePopupWindow__s_left">%1$s 已离开</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_and_s_left">%1$s和%2$s已离开</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_s_and_s_left">%1$s、%2$s和%3$s已离开</string>
-    <string name="CallParticipantsListUpdatePopupWindow__s_s_and_d_others_left">%1$s、%2$s 及其它 %3$d 位用户已离开</string>
+    <!-- Toast message shown in group call when 3 or more people leave -->
+    <plurals name="CallParticipantsListUpdatePopupWindow__s_s_and_d_others_left">
+        <item quantity="other">%1$s, %2$s and %3$d others left</item>
+    </plurals>
 
     <string name="CallParticipant__you">您</string>
     <string name="CallParticipant__you_on_another_device">您（其它设备）</string>
@@ -4448,10 +4531,14 @@
 
     <!-- PrivacySettingsFragment -->
     <string name="PrivacySettingsFragment__blocked">已屏蔽</string>
-    <string name="PrivacySettingsFragment__d_contacts">%1$d 个联系人</string>
+    <!-- Settings label that shows the number blocked contacts -->
+    <plurals name="PrivacySettingsFragment__d_contacts">
+        <item quantity="other">%1$d contacts</item>
+    </plurals>
     <string name="PrivacySettingsFragment__messaging">消息传输</string>
     <string name="PrivacySettingsFragment__disappearing_messages">限时消息</string>
     <string name="PrivacySettingsFragment__app_security">应用安全</string>
+    <!-- This refers to the multi-tasking overview (recent apps) from the Android operating system.-->
     <string name="PrivacySettingsFragment__block_screenshots_in_the_recents_list_and_inside_the_app">阻止在最近聊天和应用内进行截图</string>
     <string name="PrivacySettingsFragment__signal_message_and_calls">Signal 消息和通话，总是转发通话以及密封发送人</string>
     <string name="PrivacySettingsFragment__default_timer_for_new_changes">新聊天的默认计时器</string>
@@ -4508,11 +4595,14 @@
     <string name="DataAndStorageSettingsFragment__media_quality">媒体质量</string>
     <string name="DataAndStorageSettingsFragment__sent_media_quality">已发送媒体质量</string>
     <string name="DataAndStorageSettingsFragment__sending_high_quality_media_will_use_more_data">发送高质量媒体将会使用更多数据。</string>
+    <!-- Setting option that can be selected to default media to be sent as high quality by default -->
     <string name="DataAndStorageSettingsFragment__high">高</string>
+    <!-- Setting option that can be selected to default media to be sent as standard quality by default -->
     <string name="DataAndStorageSettingsFragment__standard">标准</string>
     <string name="DataAndStorageSettingsFragment__calls">通话</string>
 
     <!-- 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__use_custom_colors">使用自定义颜色</string>
     <string name="ChatColorSelectionFragment__chat_color">聊天颜色</string>
@@ -4721,6 +4811,7 @@
     <string name="AvatarPickerFragment__take_a_picture">拍照</string>
     <string name="AvatarPickerFragment__choose_a_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>
     <string name="AvatarPickerFragment__clear_avatar">清除头像</string>
@@ -4777,7 +4868,7 @@
     <string name="MediaReviewFragment__add_a_message">添加消息</string>
     <string name="MediaReviewFragment__add_a_reply">添加回复</string>
     <string name="MediaReviewFragment__send_to">发送给</string>
-    <string name="MediaReviewFragment__view_once_message">一次性消息</string>
+    <string name="MediaReviewFragment__view_once_message">阅后即焚媒体</string>
     <string name="MediaReviewFragment__one_or_more_items_were_too_large">一个或多个项目过大</string>
     <string name="MediaReviewFragment__one_or_more_items_were_invalid">一个或多个项目无效</string>
     <string name="MediaReviewFragment__too_many_items_selected">选择的项目过多</string>
@@ -5365,7 +5456,7 @@
     <string name="StoryViewerFragment__s_s">%1$s %2$s</string>
     <!-- Displayed when viewing a post you sent -->
     <string name="StoryViewerPageFragment__you">您</string>
-    <!-- Displayed when viewing a post displayed to a group -->
+    <!-- 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 -->
     <string name="StoryViewerPageFragment__reply">回复</string>
@@ -6558,5 +6649,26 @@
     <!-- Content description for opening the note editor -->
     <string name="ViewNoteSheet__edit_note">编辑备注</string>
 
+    <!-- BackupProgressService -->
+    <!-- Notification title shown while backup restore job is running -->
+    <string name="BackupProgressService_title">正在恢复备份…</string>
+    <!-- Notification title shown while downloading backup restore data -->
+    <string name="BackupProgressService_title_downloading">正在下载备份数据…</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>
+    <!-- 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 -->
+    <string name="BackupsTypeSettingsFragment__google_pay">Google Pay</string>
+    <!-- Displayed as the user\'s payment method as a label in a preference row -->
+    <string name="BackupsTypeSettingsFragment__bank_transfer">Bank transfer</string>
+    <!-- Displayed as the user\'s payment method as a label in a preference row -->
+    <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>
+
+
     <!-- 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 2f8e5c11d4..47ca497088 100644
--- a/app/src/main/res/values-zh-rHK/strings.xml
+++ b/app/src/main/res/values-zh-rHK/strings.xml
@@ -1,6 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- smartling.instruction_comments_enabled = on -->
-<resources>
+<?xml version="1.0" encoding="UTF-8"?><!-- 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> -->
@@ -89,6 +87,16 @@
     <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">Allow access to your location</string>
+    <!-- Dialog description that will explain the steps needed to give location permission -->
+    <string name="AttachmentManager_signal_to_send_location">To send your location:</string>
+    <!-- Alert dialog description asking for location permission -->
+    <string name="AttachmentManager_signal_allow_signal_access_location">Allow Molly access to send your location.</string>
+    <!-- Toast text explaining Signal\'s need for location access -->
+    <string name="AttachmentManager_signal_needs_location_access">Molly needs location access to send your location.</string>
+
     <!-- Alert dialog title to show the recipient has not activated payments -->
     <string name="AttachmentManager__not_activated_payments">%1$s 尚未啟動付款 </string>
     <!-- Alert dialog description to send the recipient a request to activate payments -->
@@ -240,7 +248,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>
@@ -383,8 +391,16 @@
     <string name="ConversationActivity_your_request_to_join_has_been_sent_to_the_group_admin">您欲加入群組的請求已傳送至此群組的管理員。一經處理，將會通知您。</string>
     <string name="ConversationActivity_cancel_request">取消請求</string>
 
-    <string name="ConversationActivity_to_send_audio_messages_allow_signal_access_to_your_microphone">如要傳送語音訊息，請允許Molly存取您的咪高峰。</string>
+    <!-- Dialog title asking users for microphone permission -->
+    <string name="ConversationActivity_allow_access_microphone">Allow access to your microphone</string>
+    <!-- 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>
+    <!-- Toast text explaining Signal\'s need for microphone access -->
+    <string name="ConversationActivity_signal_needs_microphone_access_voice_message">Molly needs microphone access to record a voice message.</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">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>
@@ -408,10 +424,17 @@
     <string name="ConversationActivity_you_will_leave_this_group_and_it_will_be_deleted_from_all_of_your_devices">您將退出此群組，並從您所有的裝置上刪除此群組。</string>
     <string name="ConversationActivity_delete">刪除</string>
     <string name="ConversationActivity_delete_and_leave">刪除並退出</string>
-    <string name="ConversationActivity__to_call_s_signal_needs_access_to_your_microphone">Molly 需要存取您的咪高峰，以便與 %1$s 通話。</string>
+
+    <!-- Dialog description that will explain the steps needed to give microphone permissions for a voice call -->
+    <string name="ConversationActivity__to_start_call">To start a 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">To start a call, allow Molly access to your microphone.</string>
+    <!-- Toast text explaining Signal\'s need for microphone access for a voice call -->
+    <string name="ConversationActivity_signal_needs_microphone_access_voice_call">Molly needs microphone access to start a call.</string>
 
 
     <string name="ConversationActivity_join">加入</string>
+    <!-- Button text for an active group call but the call is currently full and unjoinable -->
     <string name="ConversationActivity_full">已滿</string>
 
     <string name="ConversationActivity_error_sending_media">傳送媒體時發生錯誤</string>
@@ -597,6 +620,7 @@
     <string name="ConversationListFragment_unarchive">解除封存</string>
     <string name="ConversationListFragment_delete">刪除</string>
     <string name="ConversationListFragment_select_all">全選</string>
+    <!-- Screen title shown when selecting multiple items from a list like conversation threads or call logs. -->
     <plurals name="ConversationListFragment_s_selected">
         <item quantity="other">%1$d 個已選取</item>
     </plurals>
@@ -845,6 +869,7 @@
     <plurals name="GroupManagement_invitation_sent">
         <item quantity="other">%1$d 個邀請已送出</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">您不可自動將「%1$s」加入此群組。\n\n對方已獲邀加入，而且在對方接受之前，不會看見任何群組訊息。</string>
     <string name="GroupManagement_invite_multiple_users">您不可自動將這些使用者加入此群組。\n\n他們已獲邀加入群組，而且各人在接受之前，不會看見任何群組訊息。</string>
 
@@ -1009,7 +1034,9 @@
 
     <string name="ManageGroupActivity_edit_name_and_picture">編輯名稱和圖片</string>
     <string name="ManageGroupActivity_legacy_group">舊版群組</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">這是「舊版群組」。諸如群組管理員的功能僅限「新版群組」可用。</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">這是「舊版群組」。若要存取新功能，諸如 @提及 和管理員，</string>
     <string name="ManageGroupActivity_legacy_group_too_large">此「舊版群組」無法升級至「新版群組」，因為人數太多。群組人數上限為 %1$d 人。</string>
     <string name="ManageGroupActivity_upgrade_this_group">升級此群組。</string>
@@ -1227,6 +1254,7 @@
         <item quantity="other">刪除</item>
     </plurals>
 
+    <!-- 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="other">%1$d 個已選取 (%2$s)</item>
     </plurals>
@@ -1290,17 +1318,13 @@
     <string name="MessageRecord_left_group">您已退出此群組。</string>
     <string name="MessageRecord_you_updated_group">您已更新此群組。</string>
     <string name="MessageRecord_the_group_was_updated">此群組已更新。</string>
-    <!-- Update message shown when placing an outgoing 1:1 voice/audio call and it\'s answered by the other party -->
+    <!-- Update message shown when placing an outgoing 1:1 voice/audio call -->
     <string name="MessageRecord_outgoing_voice_call">撥打語音通話</string>
-    <!-- Update message shown when placing an outgoing 1:1 video call and it\'s answered by the other party -->
+    <!-- Update message shown when placing an outgoing 1:1 video call -->
     <string name="MessageRecord_outgoing_video_call">撥打視訊通話</string>
-    <!-- Update message shown when placing an outgoing 1:1 voice/audio call and it\'s not answered by the other party -->
-    <string name="MessageRecord_unanswered_voice_call">未接的語音通話</string>
-    <!-- Update message shown when placing an outgoing 1:1 video call and it\'s not answered by the other party -->
-    <string name="MessageRecord_unanswered_video_call">未接的視訊通話</string>
-    <!-- Update message shown when receiving an incoming 1:1 voice/audio call and it\'s answered -->
+    <!-- Update message shown when receiving an incoming 1:1 voice/audio call and it\'s answered or ringing -->
     <string name="MessageRecord_incoming_voice_call">語音通話來電</string>
-    <!-- Update message shown when receiving an incoming 1:1 video call and answered -->
+    <!-- Update message shown when receiving an incoming 1:1 video call and answered or ringing -->
     <string name="MessageRecord_incoming_video_call">視訊通話來電</string>
     <!-- Update message shown when receiving an incoming 1:1 voice/audio call and not answered -->
     <string name="MessageRecord_missed_voice_call">未接的語音通話</string>
@@ -1310,10 +1334,6 @@
     <string name="MessageRecord_missed_voice_call_notification_profile">通知設定檔開啟時有未接語音通話</string>
     <!-- Update message shown when receiving an incoming video call and declined due to notification profile -->
     <string name="MessageRecord_missed_video_call_notification_profile">通知設定檔開啟時未接視訊通話</string>
-    <!-- Update message shown when receiving an incoming 1:1 voice/audio call and explicitly declined -->
-    <string name="MessageRecord_you_declined_a_voice_call">你拒絕了一個語音通話</string>
-    <!-- Update message shown when receiving an incoming 1:1 video call and explicitly declined -->
-    <string name="MessageRecord_you_declined_a_video_call">你拒絕了一個視訊通話</string>
     <!-- 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>
@@ -1514,27 +1534,52 @@
     <string name="MessageRecord_can_accept_payments">%1$s 現在可以接受付款</string>
 
     <!-- Group Calling update messages -->
-    <string name="MessageRecord_s_started_a_group_call_s">%1$s 開展了群組通話 · %2$s</string>
-    <string name="MessageRecord_you_started_a_group_call_s">你發起了群組通話 · %1$s</string>
-    <string name="MessageRecord_s_is_in_the_group_call_s">%1$s 加入了群組通話 · %2$s</string>
-    <string name="MessageRecord_you_are_in_the_group_call_s1">您現已在群組通話中 · %1$s</string>
-    <string name="MessageRecord_s_and_s_are_in_the_group_call_s1">%1$s 和 %2$s 現已在群組通話中 · %3$s</string>
-    <string name="MessageRecord_group_call_s">群組通話 · %1$s</string>
-
-    <string name="MessageRecord_s_started_a_group_call">%1$s 已開始群組通話</string>
-    <string name="MessageRecord_you_started_a_group_call">你發起了群組通話</string>
-    <string name="MessageRecord_s_is_in_the_group_call">%1$s 加入了群組通話</string>
-    <string name="MessageRecord_you_are_in_the_group_call">您加入了群組通話</string>
-    <string name="MessageRecord_s_and_s_are_in_the_group_call">%1$s 和 %2$s 加入了群組通話</string>
-    <string name="MessageRecord_group_call">群組通話</string>
+    <!-- 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 現已在通話中 · %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">你現已在通話中 · %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 和 %2$s 現已在通話中 · %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 現已在通話中</string>
+    <!-- Chat log text for an ongoing group call only the local user has joined -->
+    <string name="MessageRecord_you_are_in_the_call">你現已在通話中</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 和 %2$s 現已在通話中</string>
+    <!-- Chat log text for a group call that ended within the last 5 minutes -->
+    <string name="MessageRecord__the_video_call_has_ended">視訊通話已結束</string>
+    <!-- Chat log text for a group call that ended within the last 5 minutes with a placeholder for formatted time -->
+    <string name="MessageRecord__the_video_call_has_ended_s">視訊通話已結束 · %1$s</string>
+    <!-- Chat log text for a group call that ended more than 5 minutes ago and was missed -->
+    <string name="MessageRecord__missed_video_call">未接的視訊通話</string>
+    <!-- Chat log text for a group call that ended more than 5 minutes ago and was missed with a placeholder for formatted time -->
+    <string name="MessageRecord__missed_video_call_s">已錯過視像通話 · %1$s</string>
+    <!-- Chat log text for a group call that ended that the local user did not start -->
+    <string name="MessageRecord__incoming_video_call">視訊通話來電</string>
+    <!-- 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">視訊通話來電 · %1$s</string>
+    <!-- Chat log text for a group call that ended that the local user started -->
+    <string name="MessageRecord__outgoing_video_call">撥打視訊通話</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">撥打視訊通話 · %1$s</string>
+    <!-- Chat log text for an ongoing group call that the local user started -->
+    <string name="MessageRecord__you_started_a_video_call">你開始了視訊通話</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">你開始了視訊通話 · %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 開始了視訊通話</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 開始了視訊通話 · %2$s</string>
 
     <string name="MessageRecord_you">您</string>
 
-    <plurals name="MessageRecord_s_s_and_d_others_are_in_the_group_call_s">
+    <!-- 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="other">%1$s、%2$s 和另 %3$d 人現已在群組通話中 · %4$s</item>
     </plurals>
 
-    <plurals name="MessageRecord_s_s_and_d_others_are_in_the_group_call">
+    <!-- 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="other">%1$s、%2$s 和另 %3$d 人現已在群組通話中</item>
     </plurals>
 
@@ -1984,6 +2029,7 @@
     <!-- Generic error when the app is unable to request an SMS code for an unknown reason. -->
     <string name="RegistrationActivity_unable_to_request_verification_code">無法要求驗證碼。請檢查你的網路連線，然後再試一次。</string>
     <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">Molly Android - 電話號碼格式</string>
     <!--    Small "toast" notification to the user confirming that they have requested a new code via voice call.-->
@@ -2127,7 +2173,7 @@
     <string name="SubmitDebugLogActivity_this_log_will_be_posted_publicly_online_for_contributors">此記錄檔將會在線上公開張貼，以供各貢獻者查看。您可先行檢閱，然後才上載。</string>
 
     <!-- SupportEmailUtil -->
-  <!-- Removed by excludeNonTranslatables <string name="SupportEmailUtil_support_email" translatable="false">support@molly.im</string> -->
+  <!-- Removed by excludeNonTranslatables <string name="SupportEmailUtil_support_email" translatable="false">support@signal.org</string> -->
     <string name="SupportEmailUtil_filter">篩選：</string>
     <string name="SupportEmailUtil_device_info">裝置資訊：</string>
     <string name="SupportEmailUtil_android_version">Android 版本：</string>
@@ -2622,6 +2668,8 @@
     <string name="ConversationUpdateItem_loading">正在載入</string>
     <string name="ConversationUpdateItem_learn_more">了解更多</string>
     <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_call_is_full">通話已滿座</string>
     <string name="ConversationUpdateItem_invite_friends">邀請好友</string>
@@ -2686,6 +2734,7 @@
     <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>
 
     <!-- EnableCallNotificationSettingsDialog__call_notifications_checklist -->
@@ -2992,6 +3041,7 @@
 
     <string name="arrays__default">預設值</string>
     <string name="arrays__high">高</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">最高</string>
 
     <!-- plurals.xml -->
@@ -3260,7 +3310,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">你可使用 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">付款已不再在 Molly 上可用。您仍可轉移款項至交易平台，惟您不再能發送和接收付款或增加款項。</string>
@@ -3309,6 +3359,14 @@
     <!-- Storage permission row description -->
     <string name="GrantPermissionsFragment__send_photos_videos_and_files">從你的裝置發送照片、影片和檔案。</string>
 
+    <!-- PermissionDeniedBottomSheet -->
+    <!-- Sheet describing step 1 on how to give permissions by opening settings -->
+    <string name="PermissionDeniedBottomSheet__1_tap_settings_below">1. Tap “Settings” below</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 Allow the permission</string>
+    <!-- Label for button at the bottom of the sheet which opens the system permission settings -->
+    <string name="PermissionDeniedBottomSheet__settings">Settings</string>
+
     <!-- PaymentsSecuritySetupFragment -->
     <!-- Toolbar title -->
     <string name="PaymentsSecuritySetupFragment__security_setup">安全設定</string>
@@ -3349,6 +3407,7 @@
     <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__information">付款金額及交易時間等交易詳情屬於 MobileCoin 帳目的一部分。</string>
@@ -3411,6 +3470,7 @@
     <string name="ConfirmPayment__confirm_payment">確認付款</string>
     <string name="ConfirmPayment__network_fee">網絡費用</string>
     <string name="ConfirmPayment__estimated_s">估算 %1$s</string>
+    <!-- Prefix to a name to indicate who a payment will be sent to -->
     <string name="ConfirmPayment__to">收款人：</string>
     <string name="ConfirmPayment__total_amount">總金額</string>
     <string name="ConfirmPayment__balance_s">餘額：%1$s</string>
@@ -3559,6 +3619,14 @@
     <string name="conversation_group_options__conversation">聊天</string>
     <string name="conversation_group_options__broadcast">廣播</string>
 
+    <!-- DoubleTapEditEducationSheet -->
+    <!-- Displayed as the title of the education bottom sheet -->
+    <string name="DoubleTapEditEducationSheet__double_tap_edit_title">Double tap to edit</string>
+    <!-- Text on the sheet explaining how double tapping on a message will let them edit it -->
+    <string name="DoubleTapEditEducationSheet__quickly_tap_twice">Quickly tap twice on your messages to edit them. You can edit your messages up to 24hrs after they’ve been sent.</string>
+    <!-- Button label to dismiss sheet -->
+    <string name="DoubleTapEditEducationSheet__got_it">Got it</string>
+
     <!-- text_secure_normal -->
     <string name="text_secure_normal__menu_new_group">建立新群組</string>
     <string name="text_secure_normal__menu_settings">設定</string>
@@ -4006,6 +4074,7 @@
     <string name="RecipientBottomSheet_copied_to_clipboard">已複製至剪貼簿</string>
 
     <string name="GroupRecipientListItem_admin">管理員</string>
+    <!-- Button text to approve a user that has requested to join a group -->
     <string name="GroupRecipientListItem_approve_description">核准</string>
     <string name="GroupRecipientListItem_deny_description">拒絕</string>
 
@@ -4033,6 +4102,7 @@
 
     <!-- VoiceNoteMediaDescriptionCompatFactory -->
     <string name="VoiceNoteMediaItemFactory__voice_message">語音訊息 · %1$s</string>
+    <!-- This is a title in a banner describing the conversation sender to receiver placeholders of the currently playing voice memo. -->
     <string name="VoiceNoteMediaItemFactory__s_to_s">由 %1$s 發給 %2$s</string>
 
     <!-- StorageUtil -->
@@ -4046,8 +4116,14 @@
     <string name="ReviewCardDialogFragment__review_members">審查成員</string>
     <!-- Title of a screen where the user will be prompted to review a message request matching the name of someone they already know -->
     <string name="ReviewCardDialogFragment__review_request">檢查要求</string>
-    <string name="ReviewCardDialogFragment__d_group_members_have_the_same_name">%1$d 個群組成員的名稱相同，請檢閱下列成員並選擇要採取的動作。</string>
-    <string name="ReviewCardDialogFragment__if_youre_not_sure">若您不確定此請求來自誰人，請檢閱下列聯絡人並採取動作。</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="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 -->
+    <plurals name="ReviewCardDialogFragment__if_youre_not_sure">
+        <item quantity="other">If you\'re not sure who the request is from, review the contacts below and take action.</item>
+    </plurals>
     <string name="ReviewCardDialogFragment__no_other_groups_in_common">無其他共同群組。</string>
     <string name="ReviewCardDialogFragment__no_groups_in_common">無共同群組。</string>
     <plurals name="ReviewCardDialogFragment__d_other_groups_in_common">
@@ -4076,11 +4152,18 @@
     <string name="CallParticipantsListUpdatePopupWindow__s_joined">%1$s 已加入</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_and_s_joined">%1$s 和 %2$s 已加入</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_s_and_s_joined">%1$s、%2$s 和 %3$s 已加入</string>
-    <string name="CallParticipantsListUpdatePopupWindow__s_s_and_d_others_joined">%1$s、%2$s 和另 %3$d 人已加入</string>
+    <!-- Toast message shown in group call when 3 or more people join -->
+    <plurals name="CallParticipantsListUpdatePopupWindow__s_s_and_d_others_joined">
+        <item quantity="other">%1$s, %2$s and %3$d others joined</item>
+    </plurals>
+    <!-- Toast/popup text shown when someone leaves a group call -->
     <string name="CallParticipantsListUpdatePopupWindow__s_left">%1$s 已退出</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_and_s_left">%1$s 和 %2$s 已退出</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_s_and_s_left">%1$s、%2$s 和 %3$s 已退出</string>
-    <string name="CallParticipantsListUpdatePopupWindow__s_s_and_d_others_left">%1$s、%2$s 和另 %3$d 人已退出</string>
+    <!-- Toast message shown in group call when 3 or more people leave -->
+    <plurals name="CallParticipantsListUpdatePopupWindow__s_s_and_d_others_left">
+        <item quantity="other">%1$s, %2$s and %3$d others left</item>
+    </plurals>
 
     <string name="CallParticipant__you">您</string>
     <string name="CallParticipant__you_on_another_device">您 (在另一台裝置上)</string>
@@ -4448,10 +4531,14 @@
 
     <!-- PrivacySettingsFragment -->
     <string name="PrivacySettingsFragment__blocked">已封鎖</string>
-    <string name="PrivacySettingsFragment__d_contacts">%1$d 個聯絡人</string>
+    <!-- Settings label that shows the number blocked contacts -->
+    <plurals name="PrivacySettingsFragment__d_contacts">
+        <item quantity="other">%1$d contacts</item>
+    </plurals>
     <string name="PrivacySettingsFragment__messaging">傳訊</string>
     <string name="PrivacySettingsFragment__disappearing_messages">限時訊息</string>
     <string name="PrivacySettingsFragment__app_security">應用程式安全性</string>
+    <!-- This refers to the multi-tasking overview (recent apps) from the Android operating system.-->
     <string name="PrivacySettingsFragment__block_screenshots_in_the_recents_list_and_inside_the_app">封鎖最近的清單以及此應用程式中的畫面截圖</string>
     <string name="PrivacySettingsFragment__signal_message_and_calls">Signal 訊息與通話、一律轉送通話和密封寄件人</string>
     <string name="PrivacySettingsFragment__default_timer_for_new_changes">新聊天的預設計時器</string>
@@ -4508,11 +4595,14 @@
     <string name="DataAndStorageSettingsFragment__media_quality">媒體的品質</string>
     <string name="DataAndStorageSettingsFragment__sent_media_quality">送出媒體的品質</string>
     <string name="DataAndStorageSettingsFragment__sending_high_quality_media_will_use_more_data">傳送高品質的媒體將會使用較多數據。</string>
+    <!-- Setting option that can be selected to default media to be sent as high quality by default -->
     <string name="DataAndStorageSettingsFragment__high">高品質</string>
+    <!-- Setting option that can be selected to default media to be sent as standard quality by default -->
     <string name="DataAndStorageSettingsFragment__standard">標準</string>
     <string name="DataAndStorageSettingsFragment__calls">通話</string>
 
     <!-- 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__use_custom_colors">使用自訂色彩</string>
     <string name="ChatColorSelectionFragment__chat_color">聊天色彩</string>
@@ -4721,6 +4811,7 @@
     <string name="AvatarPickerFragment__take_a_picture">拍照</string>
     <string name="AvatarPickerFragment__choose_a_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>
     <string name="AvatarPickerFragment__clear_avatar">清除頭像</string>
@@ -4777,7 +4868,7 @@
     <string name="MediaReviewFragment__add_a_message">新增訊息</string>
     <string name="MediaReviewFragment__add_a_reply">新增回覆</string>
     <string name="MediaReviewFragment__send_to">傳送給</string>
-    <string name="MediaReviewFragment__view_once_message">閱後即焚訊息</string>
+    <string name="MediaReviewFragment__view_once_message">閱後即焚媒體檔案</string>
     <string name="MediaReviewFragment__one_or_more_items_were_too_large">部分項目太大</string>
     <string name="MediaReviewFragment__one_or_more_items_were_invalid">部分項目無效</string>
     <string name="MediaReviewFragment__too_many_items_selected">已選取太多項目</string>
@@ -5365,7 +5456,7 @@
     <string name="StoryViewerFragment__s_s">%1$s %2$s</string>
     <!-- Displayed when viewing a post you sent -->
     <string name="StoryViewerPageFragment__you">您</string>
-    <!-- Displayed when viewing a post displayed to a group -->
+    <!-- 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 -->
     <string name="StoryViewerPageFragment__reply">回覆</string>
@@ -6558,5 +6649,26 @@
     <!-- Content description for opening the note editor -->
     <string name="ViewNoteSheet__edit_note">編輯備註</string>
 
+    <!-- BackupProgressService -->
+    <!-- Notification title shown while backup restore job is running -->
+    <string name="BackupProgressService_title">正在還原備份…</string>
+    <!-- Notification title shown while downloading backup restore data -->
+    <string name="BackupProgressService_title_downloading">正在下載備份資料…</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>
+    <!-- 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 -->
+    <string name="BackupsTypeSettingsFragment__google_pay">Google Pay</string>
+    <!-- Displayed as the user\'s payment method as a label in a preference row -->
+    <string name="BackupsTypeSettingsFragment__bank_transfer">Bank transfer</string>
+    <!-- Displayed as the user\'s payment method as a label in a preference row -->
+    <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>
+
+
     <!-- 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 cbd84b1e4c..9a4e6fbdfd 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -1,6 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- smartling.instruction_comments_enabled = on -->
-<resources>
+<?xml version="1.0" encoding="UTF-8"?><!-- 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> -->
@@ -89,6 +87,16 @@
     <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">Allow access to your location</string>
+    <!-- Dialog description that will explain the steps needed to give location permission -->
+    <string name="AttachmentManager_signal_to_send_location">To send your location:</string>
+    <!-- Alert dialog description asking for location permission -->
+    <string name="AttachmentManager_signal_allow_signal_access_location">Allow Molly access to send your location.</string>
+    <!-- Toast text explaining Signal\'s need for location access -->
+    <string name="AttachmentManager_signal_needs_location_access">Molly needs location access to send your location.</string>
+
     <!-- Alert dialog title to show the recipient has not activated payments -->
     <string name="AttachmentManager__not_activated_payments">%1$s 尚未啟動付款 </string>
     <!-- Alert dialog description to send the recipient a request to activate payments -->
@@ -240,7 +248,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>
@@ -383,8 +391,16 @@
     <string name="ConversationActivity_your_request_to_join_has_been_sent_to_the_group_admin">你的加入要求已傳送到群組管理員。 他們採取行動時會通知你。</string>
     <string name="ConversationActivity_cancel_request">取消要求</string>
 
-    <string name="ConversationActivity_to_send_audio_messages_allow_signal_access_to_your_microphone">若要傳送語音訊息，請允許 Molly 使用您的麥克風</string>
+    <!-- Dialog title asking users for microphone permission -->
+    <string name="ConversationActivity_allow_access_microphone">Allow access to your microphone</string>
+    <!-- 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>
+    <!-- Toast text explaining Signal\'s need for microphone access -->
+    <string name="ConversationActivity_signal_needs_microphone_access_voice_message">Molly needs microphone access to record a voice message.</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">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>
@@ -408,10 +424,17 @@
     <string name="ConversationActivity_you_will_leave_this_group_and_it_will_be_deleted_from_all_of_your_devices">你將離開此群組，及它將從你所有的裝置上被刪除。</string>
     <string name="ConversationActivity_delete">刪除</string>
     <string name="ConversationActivity_delete_and_leave">刪除並離開</string>
-    <string name="ConversationActivity__to_call_s_signal_needs_access_to_your_microphone">如要與 %1$s 通話，Molly 需要存取你的麥克風</string>
+
+    <!-- Dialog description that will explain the steps needed to give microphone permissions for a voice call -->
+    <string name="ConversationActivity__to_start_call">To start a 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">To start a call, allow Molly access to your microphone.</string>
+    <!-- Toast text explaining Signal\'s need for microphone access for a voice call -->
+    <string name="ConversationActivity_signal_needs_microphone_access_voice_call">Molly needs microphone access to start a call.</string>
 
 
     <string name="ConversationActivity_join">加入</string>
+    <!-- Button text for an active group call but the call is currently full and unjoinable -->
     <string name="ConversationActivity_full">已滿</string>
 
     <string name="ConversationActivity_error_sending_media">傳送媒體檔時出錯</string>
@@ -597,6 +620,7 @@
     <string name="ConversationListFragment_unarchive">解除封存</string>
     <string name="ConversationListFragment_delete">刪除</string>
     <string name="ConversationListFragment_select_all">全選</string>
+    <!-- Screen title shown when selecting multiple items from a list like conversation threads or call logs. -->
     <plurals name="ConversationListFragment_s_selected">
         <item quantity="other">%1$d 已選擇</item>
     </plurals>
@@ -845,6 +869,7 @@
     <plurals name="GroupManagement_invitation_sent">
         <item quantity="other">%1$d 個邀請已送出</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">「%1$s」不能由你自動新增到此群組中。\n\n他們已獲邀請加入，並且在他們接受之前不會看到任何群組訊息。</string>
     <string name="GroupManagement_invite_multiple_users">你無法將這些使用者自動新增到此群組。\n\n他們已被邀請加入群組，並且在他們接受之前不會看到任何群組訊息。</string>
 
@@ -1009,7 +1034,9 @@
 
     <string name="ManageGroupActivity_edit_name_and_picture">編輯名稱及圖片</string>
     <string name="ManageGroupActivity_legacy_group">舊版群組</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">這是一個舊版群組。群組管理員之類的功能僅適用於新群組。</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">這是一個舊版群組。 要連結@提及和管理員等新功能，</string>
     <string name="ManageGroupActivity_legacy_group_too_large">這個舊版群組太大，因此無法升級為新版群組。 最大群組大小為%1$d。</string>
     <string name="ManageGroupActivity_upgrade_this_group">升級此群組。</string>
@@ -1227,6 +1254,7 @@
         <item quantity="other">刪除</item>
     </plurals>
 
+    <!-- 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="other">%1$d 已選擇 (%2$s)</item>
     </plurals>
@@ -1290,17 +1318,13 @@
     <string name="MessageRecord_left_group">您已經離開了此群組。</string>
     <string name="MessageRecord_you_updated_group">你已更新群組。</string>
     <string name="MessageRecord_the_group_was_updated">該群組已更新。</string>
-    <!-- Update message shown when placing an outgoing 1:1 voice/audio call and it\'s answered by the other party -->
+    <!-- Update message shown when placing an outgoing 1:1 voice/audio call -->
     <string name="MessageRecord_outgoing_voice_call">撥打語音通話</string>
-    <!-- Update message shown when placing an outgoing 1:1 video call and it\'s answered by the other party -->
+    <!-- Update message shown when placing an outgoing 1:1 video call -->
     <string name="MessageRecord_outgoing_video_call">撥出視訊電話</string>
-    <!-- Update message shown when placing an outgoing 1:1 voice/audio call and it\'s not answered by the other party -->
-    <string name="MessageRecord_unanswered_voice_call">未接的語音通話</string>
-    <!-- Update message shown when placing an outgoing 1:1 video call and it\'s not answered by the other party -->
-    <string name="MessageRecord_unanswered_video_call">未接的視訊電話</string>
-    <!-- Update message shown when receiving an incoming 1:1 voice/audio call and it\'s answered -->
+    <!-- Update message shown when receiving an incoming 1:1 voice/audio call and it\'s answered or ringing -->
     <string name="MessageRecord_incoming_voice_call">語音通話來電</string>
-    <!-- Update message shown when receiving an incoming 1:1 video call and answered -->
+    <!-- Update message shown when receiving an incoming 1:1 video call and answered or ringing -->
     <string name="MessageRecord_incoming_video_call">視訊電話來電</string>
     <!-- Update message shown when receiving an incoming 1:1 voice/audio call and not answered -->
     <string name="MessageRecord_missed_voice_call">未接的語音通話</string>
@@ -1310,10 +1334,6 @@
     <string name="MessageRecord_missed_voice_call_notification_profile">通知設定檔開啟時有未接語音通話</string>
     <!-- Update message shown when receiving an incoming video call and declined due to notification profile -->
     <string name="MessageRecord_missed_video_call_notification_profile">通知設定檔開啟時未接視訊通話</string>
-    <!-- Update message shown when receiving an incoming 1:1 voice/audio call and explicitly declined -->
-    <string name="MessageRecord_you_declined_a_voice_call">你拒絕了一個語音通話</string>
-    <!-- Update message shown when receiving an incoming 1:1 video call and explicitly declined -->
-    <string name="MessageRecord_you_declined_a_video_call">你已拒絕一通視訊電話</string>
     <!-- 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>
@@ -1514,27 +1534,52 @@
     <string name="MessageRecord_can_accept_payments">%1$s 現在可以接受付款</string>
 
     <!-- Group Calling update messages -->
-    <string name="MessageRecord_s_started_a_group_call_s">%1$s 已開始群組通話 · %2$s</string>
-    <string name="MessageRecord_you_started_a_group_call_s">你發起了群組通話 · %1$s</string>
-    <string name="MessageRecord_s_is_in_the_group_call_s">%1$s 在群組通話中 · %2$s</string>
-    <string name="MessageRecord_you_are_in_the_group_call_s1">你正在群組通話中 · %1$s</string>
-    <string name="MessageRecord_s_and_s_are_in_the_group_call_s1">%1$s 和 %2$s 在群組通話中 · %3$s</string>
-    <string name="MessageRecord_group_call_s">群組通話 · %1$s</string>
-
-    <string name="MessageRecord_s_started_a_group_call">%1$s 發起了群組通話</string>
-    <string name="MessageRecord_you_started_a_group_call">你發起了群組通話</string>
-    <string name="MessageRecord_s_is_in_the_group_call">%1$s 在群組通話中</string>
-    <string name="MessageRecord_you_are_in_the_group_call">你正在群組通話中</string>
-    <string name="MessageRecord_s_and_s_are_in_the_group_call">%1$s 及 %2$s 在群組通話中</string>
-    <string name="MessageRecord_group_call">群組通話</string>
+    <!-- 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 現已在通話中 · %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">你現已在通話中 · %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 和 %2$s 現已在通話中 · %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 現已在通話中</string>
+    <!-- Chat log text for an ongoing group call only the local user has joined -->
+    <string name="MessageRecord_you_are_in_the_call">你現已在通話中</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 和 %2$s 現已在通話中</string>
+    <!-- Chat log text for a group call that ended within the last 5 minutes -->
+    <string name="MessageRecord__the_video_call_has_ended">視訊通話已結束</string>
+    <!-- Chat log text for a group call that ended within the last 5 minutes with a placeholder for formatted time -->
+    <string name="MessageRecord__the_video_call_has_ended_s">視訊通話已結束 · %1$s</string>
+    <!-- Chat log text for a group call that ended more than 5 minutes ago and was missed -->
+    <string name="MessageRecord__missed_video_call">錯過視訊電話</string>
+    <!-- Chat log text for a group call that ended more than 5 minutes ago and was missed with a placeholder for formatted time -->
+    <string name="MessageRecord__missed_video_call_s">錯過的視訊電話· %1$s</string>
+    <!-- Chat log text for a group call that ended that the local user did not start -->
+    <string name="MessageRecord__incoming_video_call">視訊電話來電</string>
+    <!-- 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">視訊通話來電 · %1$s</string>
+    <!-- Chat log text for a group call that ended that the local user started -->
+    <string name="MessageRecord__outgoing_video_call">撥出視訊電話</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">撥打視訊通話 · %1$s</string>
+    <!-- Chat log text for an ongoing group call that the local user started -->
+    <string name="MessageRecord__you_started_a_video_call">你開始了視訊通話</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">你開始了視訊通話 · %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 開始了視訊通話</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 開始了視訊通話 · %2$s</string>
 
     <string name="MessageRecord_you">你</string>
 
-    <plurals name="MessageRecord_s_s_and_d_others_are_in_the_group_call_s">
+    <!-- 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="other">%1$s、%2$s 和另外 %3$d 人在群組通話中 · %4$s</item>
     </plurals>
 
-    <plurals name="MessageRecord_s_s_and_d_others_are_in_the_group_call">
+    <!-- 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="other">%1$s, %2$s, 及 %3$d 及其他人在群組通話中</item>
     </plurals>
 
@@ -1984,6 +2029,7 @@
     <!-- Generic error when the app is unable to request an SMS code for an unknown reason. -->
     <string name="RegistrationActivity_unable_to_request_verification_code">無法要求驗證碼。請檢查你的網路連線，然後再試一次。</string>
     <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">Molly Android - 電話號碼格式</string>
     <!--    Small "toast" notification to the user confirming that they have requested a new code via voice call.-->
@@ -2127,7 +2173,7 @@
     <string name="SubmitDebugLogActivity_this_log_will_be_posted_publicly_online_for_contributors">此日誌將在網上公開發布，供貢獻者查看。 你可以在上傳前檢查它。</string>
 
     <!-- SupportEmailUtil -->
-  <!-- Removed by excludeNonTranslatables <string name="SupportEmailUtil_support_email" translatable="false">support@molly.im</string> -->
+  <!-- Removed by excludeNonTranslatables <string name="SupportEmailUtil_support_email" translatable="false">support@signal.org</string> -->
     <string name="SupportEmailUtil_filter">過濾:</string>
     <string name="SupportEmailUtil_device_info">裝置資訊:</string>
     <string name="SupportEmailUtil_android_version">Android 版本:</string>
@@ -2622,6 +2668,8 @@
     <string name="ConversationUpdateItem_loading">載入中</string>
     <string name="ConversationUpdateItem_learn_more">了解更多</string>
     <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_call_is_full">通話人數已滿</string>
     <string name="ConversationUpdateItem_invite_friends">邀請好友</string>
@@ -2686,6 +2734,7 @@
     <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>
 
     <!-- EnableCallNotificationSettingsDialog__call_notifications_checklist -->
@@ -2992,6 +3041,7 @@
 
     <string name="arrays__default">預設</string>
     <string name="arrays__high">高</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">最高</string>
 
     <!-- plurals.xml -->
@@ -3260,7 +3310,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">你可使用 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">Molly中的付款不再可用。 你仍然可以將資金轉帳到交易所，但不能再傳送和接收付款或增加資金。</string>
@@ -3309,6 +3359,14 @@
     <!-- Storage permission row description -->
     <string name="GrantPermissionsFragment__send_photos_videos_and_files">從你的裝置發送照片、影片和檔案。</string>
 
+    <!-- PermissionDeniedBottomSheet -->
+    <!-- Sheet describing step 1 on how to give permissions by opening settings -->
+    <string name="PermissionDeniedBottomSheet__1_tap_settings_below">1. Tap “Settings” below</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 Allow the permission</string>
+    <!-- Label for button at the bottom of the sheet which opens the system permission settings -->
+    <string name="PermissionDeniedBottomSheet__settings">Settings</string>
+
     <!-- PaymentsSecuritySetupFragment -->
     <!-- Toolbar title -->
     <string name="PaymentsSecuritySetupFragment__security_setup">安全設定</string>
@@ -3349,6 +3407,7 @@
     <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__information">包括付款金額和交易時間在內的交易詳細資訊是MobileCoin Ledger的一部分。</string>
@@ -3411,6 +3470,7 @@
     <string name="ConfirmPayment__confirm_payment">確認付款</string>
     <string name="ConfirmPayment__network_fee">網路費</string>
     <string name="ConfirmPayment__estimated_s">估計 %1$s</string>
+    <!-- Prefix to a name to indicate who a payment will be sent to -->
     <string name="ConfirmPayment__to">至</string>
     <string name="ConfirmPayment__total_amount">總金額</string>
     <string name="ConfirmPayment__balance_s">餘額: %1$s</string>
@@ -3559,6 +3619,14 @@
     <string name="conversation_group_options__conversation">聊天</string>
     <string name="conversation_group_options__broadcast">訊息廣播</string>
 
+    <!-- DoubleTapEditEducationSheet -->
+    <!-- Displayed as the title of the education bottom sheet -->
+    <string name="DoubleTapEditEducationSheet__double_tap_edit_title">Double tap to edit</string>
+    <!-- Text on the sheet explaining how double tapping on a message will let them edit it -->
+    <string name="DoubleTapEditEducationSheet__quickly_tap_twice">Quickly tap twice on your messages to edit them. You can edit your messages up to 24hrs after they’ve been sent.</string>
+    <!-- Button label to dismiss sheet -->
+    <string name="DoubleTapEditEducationSheet__got_it">Got it</string>
+
     <!-- text_secure_normal -->
     <string name="text_secure_normal__menu_new_group">新增群組</string>
     <string name="text_secure_normal__menu_settings">設定</string>
@@ -4006,6 +4074,7 @@
     <string name="RecipientBottomSheet_copied_to_clipboard">已複製到剪貼簿</string>
 
     <string name="GroupRecipientListItem_admin">管理員</string>
+    <!-- Button text to approve a user that has requested to join a group -->
     <string name="GroupRecipientListItem_approve_description">批准</string>
     <string name="GroupRecipientListItem_deny_description">拒絕</string>
 
@@ -4033,6 +4102,7 @@
 
     <!-- VoiceNoteMediaDescriptionCompatFactory -->
     <string name="VoiceNoteMediaItemFactory__voice_message">語音訊息 · %1$s</string>
+    <!-- This is a title in a banner describing the conversation sender to receiver placeholders of the currently playing voice memo. -->
     <string name="VoiceNoteMediaItemFactory__s_to_s">%1$s 傳送給 %2$s</string>
 
     <!-- StorageUtil -->
@@ -4046,8 +4116,14 @@
     <string name="ReviewCardDialogFragment__review_members">審查成員</string>
     <!-- Title of a screen where the user will be prompted to review a message request matching the name of someone they already know -->
     <string name="ReviewCardDialogFragment__review_request">檢查要求</string>
-    <string name="ReviewCardDialogFragment__d_group_members_have_the_same_name">%1$d 個群組成員的名字相同，請查看以下成員並選擇採取措施。</string>
-    <string name="ReviewCardDialogFragment__if_youre_not_sure">如果你不確定請求來自誰，請查看下面的聯絡人並採取措施。</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="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 -->
+    <plurals name="ReviewCardDialogFragment__if_youre_not_sure">
+        <item quantity="other">If you\'re not sure who the request is from, review the contacts below and take action.</item>
+    </plurals>
     <string name="ReviewCardDialogFragment__no_other_groups_in_common">沒有其他共同的群組。</string>
     <string name="ReviewCardDialogFragment__no_groups_in_common">沒有共同的群組。</string>
     <plurals name="ReviewCardDialogFragment__d_other_groups_in_common">
@@ -4076,11 +4152,18 @@
     <string name="CallParticipantsListUpdatePopupWindow__s_joined">%1$s 已加入</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_and_s_joined">%1$s 和 %2$s 已加入</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_s_and_s_joined">%1$s, %2$s 和 %3$s已加入</string>
-    <string name="CallParticipantsListUpdatePopupWindow__s_s_and_d_others_joined">%1$s, %2$s 和 %3$d 及其他人已加入</string>
+    <!-- Toast message shown in group call when 3 or more people join -->
+    <plurals name="CallParticipantsListUpdatePopupWindow__s_s_and_d_others_joined">
+        <item quantity="other">%1$s, %2$s and %3$d others joined</item>
+    </plurals>
+    <!-- Toast/popup text shown when someone leaves a group call -->
     <string name="CallParticipantsListUpdatePopupWindow__s_left">%1$s 離開了</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_and_s_left">%1$s 和 %2$s 已離開</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_s_and_s_left">%1$s, %2$s 和 %3$s 已離開</string>
-    <string name="CallParticipantsListUpdatePopupWindow__s_s_and_d_others_left">%1$s, %2$s 和 %3$d 及其他人已離開</string>
+    <!-- Toast message shown in group call when 3 or more people leave -->
+    <plurals name="CallParticipantsListUpdatePopupWindow__s_s_and_d_others_left">
+        <item quantity="other">%1$s, %2$s and %3$d others left</item>
+    </plurals>
 
     <string name="CallParticipant__you">你</string>
     <string name="CallParticipant__you_on_another_device">你 (在其他的裝置上)</string>
@@ -4448,10 +4531,14 @@
 
     <!-- PrivacySettingsFragment -->
     <string name="PrivacySettingsFragment__blocked">已封鎖</string>
-    <string name="PrivacySettingsFragment__d_contacts">%1$d 個聯絡人</string>
+    <!-- Settings label that shows the number blocked contacts -->
+    <plurals name="PrivacySettingsFragment__d_contacts">
+        <item quantity="other">%1$d contacts</item>
+    </plurals>
     <string name="PrivacySettingsFragment__messaging">傳訊</string>
     <string name="PrivacySettingsFragment__disappearing_messages">自動銷毀訊息</string>
     <string name="PrivacySettingsFragment__app_security">應用程式安全性</string>
+    <!-- This refers to the multi-tasking overview (recent apps) from the Android operating system.-->
     <string name="PrivacySettingsFragment__block_screenshots_in_the_recents_list_and_inside_the_app">在對話清單或應用程式內停用畫面擷取功能</string>
     <string name="PrivacySettingsFragment__signal_message_and_calls">Signal 訊息和電話，永遠轉發通話和密封發件人</string>
     <string name="PrivacySettingsFragment__default_timer_for_new_changes">新聊天的預設計時器</string>
@@ -4508,11 +4595,14 @@
     <string name="DataAndStorageSettingsFragment__media_quality">媒體檔品質</string>
     <string name="DataAndStorageSettingsFragment__sent_media_quality">已傳送媒體檔品質</string>
     <string name="DataAndStorageSettingsFragment__sending_high_quality_media_will_use_more_data">傳送高畫質的媒體檔將會使用較多數據。</string>
+    <!-- Setting option that can be selected to default media to be sent as high quality by default -->
     <string name="DataAndStorageSettingsFragment__high">高</string>
+    <!-- Setting option that can be selected to default media to be sent as standard quality by default -->
     <string name="DataAndStorageSettingsFragment__standard">標準</string>
     <string name="DataAndStorageSettingsFragment__calls">通話</string>
 
     <!-- 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__use_custom_colors">使用自定義顏色</string>
     <string name="ChatColorSelectionFragment__chat_color">聊天的顏色</string>
@@ -4721,6 +4811,7 @@
     <string name="AvatarPickerFragment__take_a_picture">拍照</string>
     <string name="AvatarPickerFragment__choose_a_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>
     <string name="AvatarPickerFragment__clear_avatar">清除頭像</string>
@@ -4777,7 +4868,7 @@
     <string name="MediaReviewFragment__add_a_message">新增訊息</string>
     <string name="MediaReviewFragment__add_a_reply">新增回覆</string>
     <string name="MediaReviewFragment__send_to">傳送給</string>
-    <string name="MediaReviewFragment__view_once_message">查看一次訊息</string>
+    <string name="MediaReviewFragment__view_once_message">一次性多媒體內容</string>
     <string name="MediaReviewFragment__one_or_more_items_were_too_large">一件或多件項目容量太大</string>
     <string name="MediaReviewFragment__one_or_more_items_were_invalid">一項或多項無效</string>
     <string name="MediaReviewFragment__too_many_items_selected">選擇的項目太多</string>
@@ -5365,7 +5456,7 @@
     <string name="StoryViewerFragment__s_s">%1$s %2$s</string>
     <!-- Displayed when viewing a post you sent -->
     <string name="StoryViewerPageFragment__you">你</string>
-    <!-- Displayed when viewing a post displayed to a group -->
+    <!-- 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 -->
     <string name="StoryViewerPageFragment__reply">回覆</string>
@@ -6558,5 +6649,26 @@
     <!-- Content description for opening the note editor -->
     <string name="ViewNoteSheet__edit_note">編輯備註</string>
 
+    <!-- BackupProgressService -->
+    <!-- Notification title shown while backup restore job is running -->
+    <string name="BackupProgressService_title">正在還原備份…</string>
+    <!-- Notification title shown while downloading backup restore data -->
+    <string name="BackupProgressService_title_downloading">正在下載備份資料…</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>
+    <!-- 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 -->
+    <string name="BackupsTypeSettingsFragment__google_pay">Google Pay</string>
+    <!-- Displayed as the user\'s payment method as a label in a preference row -->
+    <string name="BackupsTypeSettingsFragment__bank_transfer">Bank transfer</string>
+    <!-- Displayed as the user\'s payment method as a label in a preference row -->
+    <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>
+
+
     <!-- EOF -->
-</resources>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 8c18177393..477f8877b5 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -38,12 +38,12 @@
     <string name="AlbumThumbnailView_plus" translatable="false">\+%d</string>
 
     <!-- ApplicationMigrationActivity -->
-    <string name="ApplicationMigrationActivity__signal_is_updating">Molly is updating…</string>
+    <string mollyify="true" name="ApplicationMigrationActivity__signal_is_updating">Molly is updating…</string>
 
     <!-- ApplicationPreferencesActivity -->
     <string name="ApplicationPreferenceActivity_you_havent_set_a_passphrase_yet">You haven\'t set a passphrase yet!</string>
     <string name="ApplicationPreferencesActivity_disable_passphrase">Disable passphrase?</string>
-    <string name="ApplicationPreferencesActivity_this_will_permanently_unlock_signal_and_message_notifications">This will permanently unlock Molly and message notifications.</string>
+    <string mollyify="true" name="ApplicationPreferencesActivity_this_will_permanently_unlock_signal_and_message_notifications">This will permanently unlock Molly and message notifications.</string>
     <string name="ApplicationPreferencesActivity_disable">Disable</string>
     <string name="ApplicationPreferencesActivity_error_connecting_to_server">Error connecting to server!</string>
     <string name="ApplicationPreferencesActivity_pins_are_required_for_registration_lock">PINs are required for registration lock. To disable PINs, please first disable registration lock.</string>
@@ -80,15 +80,24 @@
     <string name="AttachmentKeyboard_file">File</string>
     <string name="AttachmentKeyboard_contact">Contact</string>
     <string name="AttachmentKeyboard_location">Location</string>
-    <string name="AttachmentKeyboard_Signal_needs_permission_to_show_your_photos_and_videos">Molly needs permission to show your photos and videos.</string>
+    <string mollyify="true" name="AttachmentKeyboard_Signal_needs_permission_to_show_your_photos_and_videos">Molly needs permission to show your photos and videos.</string>
     <string name="AttachmentKeyboard_give_access">Give Access</string>
     <string name="AttachmentKeyboard_payment">Payment</string>
 
     <!-- AttachmentManager -->
     <string name="AttachmentManager_cant_open_media_selection">Can\'t find an app to select media.</string>
-    <string name="AttachmentManager_signal_requires_the_external_storage_permission_in_order_to_attach_photos_videos_or_audio">Molly requires the Storage permission in order to attach photos, videos, or audio, but it has been permanently denied. Please continue to the app settings menu, select \"Permissions\", and enable \"Storage\".</string>
-    <string name="AttachmentManager_signal_requires_contacts_permission_in_order_to_attach_contact_information">Molly requires Contacts permission in order to attach contact information, but it has been permanently denied. Please continue to the app settings menu, select \"Permissions\", and enable \"Contacts\".</string>
-    <string name="AttachmentManager_signal_requires_location_information_in_order_to_attach_a_location">Molly requires Location permission in order to attach a location, but it has been permanently denied. Please continue to the app settings menu, select \"Permissions\", and enable \"Location\".</string>
+    <string mollyify="true" name="AttachmentManager_signal_requires_the_external_storage_permission_in_order_to_attach_photos_videos_or_audio">Molly requires the Storage permission in order to attach photos, videos, or audio, but it has been permanently denied. Please continue to the app settings menu, select \"Permissions\", and enable \"Storage\".</string>
+    <string mollyify="true" name="AttachmentManager_signal_requires_contacts_permission_in_order_to_attach_contact_information">Molly requires Contacts permission in order to attach contact information, but it has been permanently denied. Please continue to the app settings menu, select \"Permissions\", and enable \"Contacts\".</string>
+    <string mollyify="true" name="AttachmentManager_signal_requires_location_information_in_order_to_attach_a_location">Molly requires Location permission in order to attach a location, but it has been permanently denied. Please continue to the app settings menu, select \"Permissions\", and enable \"Location\".</string>
+
+    <!-- Dialog title asking users for location permission -->
+    <string name="AttachmentManager_signal_allow_access_location">Allow access to your location</string>
+    <!-- Dialog description that will explain the steps needed to give location permission -->
+    <string name="AttachmentManager_signal_to_send_location">To send your location:</string>
+    <!-- Alert dialog description asking for location permission -->
+    <string mollyify="true" name="AttachmentManager_signal_allow_signal_access_location">Allow Molly access to send your location.</string>
+    <!-- Toast text explaining Signal\'s need for location access -->
+    <string mollyify="true" name="AttachmentManager_signal_needs_location_access">Molly needs location access to send your location.</string>
     <!-- Alert dialog title to show the recipient has not activated payments -->
     <string name="AttachmentManager__not_activated_payments">%1$s hasn\'t activated Payments </string>
     <!-- Alert dialog description to send the recipient a request to activate payments -->
@@ -222,7 +231,7 @@
     <string name="CameraContacts_no_signal_contacts">No Signal contacts</string>
     <string name="CameraContacts_you_can_only_use_the_camera_button">You can only use the camera button to send photos to Signal contacts. </string>
     <string name="CameraContacts_cant_find_who_youre_looking_for">Can\'t find who you\'re looking for?</string>
-    <string name="CameraContacts_invite_a_contact_to_join_signal">Invite a contact to join Molly</string>
+    <string mollyify="true" name="CameraContacts_invite_a_contact_to_join_signal">Invite a contact to join Molly</string>
     <string name="CameraContacts__menu_search">Search</string>
 
     <!-- Censorship Circumvention Megaphone -->
@@ -236,12 +245,12 @@
     <string name="CensorshipCircumventionMegaphone_no_thanks">No thanks</string>
 
     <!-- ClientDeprecatedActivity -->
-    <string name="ClientDeprecatedActivity_update_signal">Update Molly</string>
+    <string mollyify="true" name="ClientDeprecatedActivity_update_signal">Update Molly</string>
     <string name="ClientDeprecatedActivity_this_version_of_the_app_is_no_longer_supported">This version of the app is no longer supported. To continue sending and receiving messages, update to the latest version.</string>
     <string name="ClientDeprecatedActivity_update">Update</string>
     <string name="ClientDeprecatedActivity_dont_update">Don\'t Update</string>
     <string name="ClientDeprecatedActivity_warning">Warning</string>
-    <string name="ClientDeprecatedActivity_your_version_of_signal_has_expired_you_can_view_your_message_history">Your version of Signal has expired. You can view your message history but you won\'t be able to send or receive messages until you update.</string>
+    <string mollyify="true" name="ClientDeprecatedActivity_your_version_of_signal_has_expired_you_can_view_your_message_history">Your version of Molly has expired. You can view your message history but you won\'t be able to send or receive messages until you update.</string>
 
     <!-- CommunicationActions -->
     <string name="CommunicationActions_no_browser_found">No web browser found.</string>
@@ -372,7 +381,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">Send message</string>
-    <string name="ConversationActivity_lets_switch_to_signal">Let\'s switch to Molly %1$s</string>
+    <string mollyify="true" name="ConversationActivity_lets_switch_to_signal">Let\'s switch to Molly %1$s</string>
     <string name="ConversationActivity_specify_recipient">Please choose a contact</string>
     <string name="ConversationActivity_attachment_exceeds_size_limits">Attachment exceeds size limits for the type of message you\'re sending.</string>
     <string name="ConversationActivity_unable_to_record_audio">Unable to record audio!</string>
@@ -386,15 +395,23 @@
     <string name="ConversationActivity_your_request_to_join_has_been_sent_to_the_group_admin">Your request to join has been sent to the group admin. You\'ll be notified when they take action.</string>
     <string name="ConversationActivity_cancel_request">Cancel Request</string>
 
-    <string name="ConversationActivity_to_send_audio_messages_allow_signal_access_to_your_microphone">To send audio messages, allow Molly access to your microphone.</string>
-    <string 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>
-    <string name="ConversationActivity_signal_needs_the_microphone_and_camera_permissions_in_order_to_call_s">Molly needs the Microphone and Camera permissions in order to call %s, but they have been permanently denied. Please continue to app settings, select \"Permissions\", and enable \"Microphone\" and \"Camera\".</string>
-    <string name="ConversationActivity_to_capture_photos_and_video_allow_signal_access_to_the_camera">To capture photos and video, allow Molly access to the camera.</string>
-    <string name="ConversationActivity_signal_needs_the_camera_permission_to_take_photos_or_video">Molly needs the Camera permission to take photos or video, but it has been permanently denied. Please continue to app settings, select \"Permissions\", and enable \"Camera\".</string>
-    <string name="ConversationActivity_signal_needs_camera_permissions_to_take_photos_or_video">Molly needs Camera permissions to take photos or video</string>
+    <!-- Dialog title asking users for microphone permission -->
+    <string name="ConversationActivity_allow_access_microphone">Allow access to your microphone</string>
+    <!-- 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>
+    <!-- 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>
+
+    <string mollyify="true" name="ConversationActivity_signal_needs_the_microphone_and_camera_permissions_in_order_to_call_s">Molly needs the Microphone and Camera permissions in order to call %s, but they have been permanently denied. Please continue to app settings, select \"Permissions\", and enable \"Microphone\" and \"Camera\".</string>
+    <string mollyify="true" name="ConversationActivity_to_capture_photos_and_video_allow_signal_access_to_the_camera">To capture photos and video, allow Molly access to the camera.</string>
+    <string mollyify="true" name="ConversationActivity_signal_needs_the_camera_permission_to_take_photos_or_video">Molly needs the Camera permission to take photos or video, but it has been permanently denied. Please continue to app settings, select \"Permissions\", and enable \"Camera\".</string>
+    <string mollyify="true" name="ConversationActivity_signal_needs_camera_permissions_to_take_photos_or_video">Molly needs Camera permissions to take photos or video</string>
     <string name="ConversationActivity_enable_the_microphone_permission_to_capture_videos_with_sound">Enable the microphone permission to capture videos with sound.</string>
-    <string name="ConversationActivity_signal_needs_the_recording_permissions_to_capture_video">Molly needs microphone permissions to record videos, but they have been denied. Please continue to app settings, select \"Permissions\", and enable \"Microphone\" and \"Camera\".</string>
-    <string name="ConversationActivity_signal_needs_recording_permissions_to_capture_video">Molly needs microphone permissions to record videos.</string>
+    <string mollyify="true" name="ConversationActivity_signal_needs_the_recording_permissions_to_capture_video">Molly needs microphone permissions to record videos, but they have been denied. Please continue to app settings, select \"Permissions\", and enable \"Microphone\" and \"Camera\".</string>
+    <string mollyify="true" name="ConversationActivity_signal_needs_recording_permissions_to_capture_video">Molly needs microphone permissions to record videos.</string>
 
     <string name="ConversationActivity_quoted_contact_message">%1$s %2$s</string>
     <string name="ConversationActivity_no">No</string>
@@ -411,10 +428,17 @@
     <string name="ConversationActivity_you_will_leave_this_group_and_it_will_be_deleted_from_all_of_your_devices">You will leave this group, and it will be deleted from all your devices.</string>
     <string name="ConversationActivity_delete">Delete</string>
     <string name="ConversationActivity_delete_and_leave">Delete and leave</string>
-    <string name="ConversationActivity__to_call_s_signal_needs_access_to_your_microphone">To call %1$s, Molly needs access to your microphone</string>
+
+    <!-- Dialog description that will explain the steps needed to give microphone permissions for a voice call -->
+    <string name="ConversationActivity__to_start_call">To start a call:</string>
+    <!-- Alert dialog description asking for microphone permission in order to start a voice call -->
+    <string mollyify="true" name="ConversationActivity__to_call_signal_needs_access_to_your_microphone">To start a call, allow Molly access to your microphone.</string>
+    <!-- Toast text explaining Signal\'s need for microphone access for a voice call -->
+    <string mollyify="true" name="ConversationActivity_signal_needs_microphone_access_voice_call">Molly needs microphone access to start a call.</string>
 
 
     <string name="ConversationActivity_join">Join</string>
+    <!-- Button text for an active group call but the call is currently full and unjoinable -->
     <string name="ConversationActivity_full">Full</string>
 
     <string name="ConversationActivity_error_sending_media">Error sending media</string>
@@ -424,9 +448,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 messaging is no longer supported in Signal. Invite %1$s to Signal to keep the conversation here.</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">This person is no longer using Molly. Invite them to Molly to keep the conversation here.</string>
+    <string mollyify="true" name="ConversationActivity__this_person_is_no_longer_using_signal">This person is no longer using Molly. Invite them to Molly to keep the conversation here.</string>
     <!-- Action button shown when opening an SMS conversation with SMS disabled and there are no exported messages -->
-    <string name="ConversationActivity__invite_to_signal">Invite to Molly</string>
+    <string mollyify="true" name="ConversationActivity__invite_to_signal">Invite to 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">You will be reminded again soon.</string>
 
@@ -511,13 +535,13 @@
     <!-- Message shown after successfully blocking join requests for a user -->
     <string name="ConversationFragment__blocked">Blocked</string>
     <!-- Action shown to allow a user to update their application because it has expired -->
-    <string name="ConversationFragment__update_build">Update Molly</string>
+    <string mollyify="true" name="ConversationFragment__update_build">Update Molly</string>
     <!-- Action shown to allow a user to re-register as they are no longer registered -->
-    <string name="ConversationFragment__reregister_signal">Re-register Molly</string>
+    <string mollyify="true" name="ConversationFragment__reregister_signal">Re-register Molly</string>
     <!-- Label for a button displayed in the conversation toolbar to return to the previous screen. -->
     <string name="ConversationFragment__content_description_back_button">Navigate back.</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">Open Molly</string>
+    <string mollyify="true" name="ConversationFragment__content_description_launch_signal_button">Open Molly</string>
     <!-- Dialog title shown when more than one contact in a group conversation is no longer verified -->
     <string name="ConversationFragment__no_longer_verified">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 -->
@@ -613,6 +637,7 @@
     <string name="ConversationListFragment_unarchive">Unarchive</string>
     <string name="ConversationListFragment_delete">Delete</string>
     <string name="ConversationListFragment_select_all">Select all</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">%d selected</item>
         <item quantity="other">%d selected</item>
@@ -706,7 +731,7 @@
     <string name="BackupsPreferenceFragment__test_your_backup_passphrase">Test your backup passphrase and verify that it matches</string>
     <string name="BackupsPreferenceFragment__turn_on">Turn on</string>
     <string name="BackupsPreferenceFragment__turn_off">Turn off</string>
-    <string name="BackupsPreferenceFragment__to_restore_a_backup">To restore a backup, install a new copy of Molly. Open the app and tap "Restore backup", then locate a backup file. %1$s</string>
+    <string mollyify="true" name="BackupsPreferenceFragment__to_restore_a_backup">To restore a backup, install a new copy of Molly. Open the app and tap "Restore backup", then locate a backup file. %1$s</string>
     <string name="BackupsPreferenceFragment__learn_more">Learn more</string>
     <string name="BackupsPreferenceFragment__in_progress">In progress…</string>
     <!-- Status text shown in backup preferences when verifying a backup -->
@@ -714,7 +739,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">Molly requires external storage permission in order to create backups, but it has been permanently denied. Please continue to app settings, select \"Permissions\" and enable \"Storage\".</string>
+    <string mollyify="true" name="BackupsPreferenceFragment_signal_requires_external_storage_permission_in_order_to_create_backups">Molly requires external storage permission in order to create backups, but it has been permanently denied. Please continue to app settings, select \"Permissions\" and enable \"Storage\".</string>
     <!-- Title of dialog shown when picking the time to perform a chat backup -->
     <string name="BackupsPreferenceFragment__set_backup_time">Set backup time</string>
 
@@ -803,7 +828,7 @@
 
     <!-- DozeReminder -->
     <string name="DozeReminder_optimize_for_missing_play_services">Optimize for missing Play Services</string>
-    <string 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>
+    <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>
@@ -817,8 +842,8 @@
     <string name="PendingGroupJoinRequestsReminder_view">View</string>
 
     <!-- GcmRefreshJob -->
-    <string name="GcmRefreshJob_Permanent_Signal_communication_failure">Permanent Molly communication failure!</string>
-    <string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">Molly was unable to register with Google Play Services. Molly messages and calls have been disabled, please try re-registering in Settings &gt; Advanced.</string>
+    <string mollyify="true" name="GcmRefreshJob_Permanent_Signal_communication_failure">Permanent Molly communication failure!</string>
+    <string mollyify="true" name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">Molly was unable to register with Google Play Services. Molly messages and calls have been disabled, please try re-registering in Settings &gt; Advanced.</string>
 
 
     <!-- GiphyActivity -->
@@ -864,6 +889,7 @@
         <item quantity="one">Invitation sent</item>
         <item quantity="other">%d invitations sent</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">“%1$s” can’t be automatically added to this group by you.\n\nThey’ve been invited to join, and won’t see any group messages until they accept.</string>
     <string name="GroupManagement_invite_multiple_users">These users can’t be automatically added to this group by you.\n\nThey’ve been invited to join the group, and won’t see any group messages until they accept.</string>
 
@@ -956,12 +982,12 @@
     <!-- Message for dialog asking user to submit logs for debugging a crash -->
     <string name="PromptLogsSlowNotificationsDialog__message">Debug logs helps us diagnose and fix the issue, and do not contain identifying information.</string>
     <!-- Title for dialog asking user to submit logs for debugging slow notification issues -->
-    <string name="PromptLogsSlowNotificationsDialog__title_crash">Molly encountered a problem. Submit debug log?</string>
+    <string mollyify="true" name="PromptLogsSlowNotificationsDialog__title_crash">Molly encountered a problem. Submit debug log?</string>
 
     <!-- Title for dialog asking user to submit logs for debugging slow notification issues -->
     <string name="PromptBatterySaverBottomSheet__title">Notifications may be delayed due to battery optimizations</string>
     <!-- Message explaining that battery saver may delay notifications -->
-    <string name="PromptBatterySaverBottomSheet__message">You can disable battery optimizations for Molly to ensure that message notifications will not be delayed.</string>
+    <string mollyify="true" name="PromptBatterySaverBottomSheet__message">You can disable battery optimizations for Molly to ensure that message notifications will not be delayed.</string>
 
     <!-- Button to continue to try and disable battery saver -->
     <string name="PromptBatterySaverBottomSheet__continue">Continue</string>
@@ -1044,7 +1070,9 @@
 
     <string name="ManageGroupActivity_edit_name_and_picture">Edit name and picture</string>
     <string name="ManageGroupActivity_legacy_group">Legacy Group</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">This is a Legacy Group. Features like group admins are only available for New Groups.</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">This is a Legacy Group. To access new features like @mentions and admins,</string>
     <string name="ManageGroupActivity_legacy_group_too_large">This Legacy Group can’t be upgraded to a New Group because it is too large. The maximum group size is %1$d.</string>
     <string name="ManageGroupActivity_upgrade_this_group">upgrade this group.</string>
@@ -1214,13 +1242,13 @@
     <string name="InviteActivity_cancel">Cancel</string>
     <string name="InviteActivity_sending">Sending…</string>
     <string name="InviteActivity_invitations_sent">Invitations sent!</string>
-    <string name="InviteActivity_invite_to_signal">Invite to Molly</string>
+    <string mollyify="true" name="InviteActivity_invite_to_signal">Invite to Molly</string>
     <string name="InviteActivity_send_sms">Send SMS (%d)</string>
     <plurals name="InviteActivity_send_sms_invites">
         <item quantity="one">Send %d SMS invite?</item>
         <item quantity="other">Send %d SMS invites?</item>
     </plurals>
-    <string name="InviteActivity_lets_switch_to_signal">Let\'s switch to Molly: %1$s</string>
+    <string mollyify="true" name="InviteActivity_lets_switch_to_signal">Let\'s switch to Molly: %1$s</string>
     <string name="InviteActivity_no_app_to_share_to">It looks like you don\'t have any apps to share to.</string>
 
     <!-- LearnMoreTextView -->
@@ -1234,7 +1262,7 @@
     <string name="LongMessageActivity_your_message">Your message</string>
 
     <!-- MessageRetrievalService -->
-    <string name="MessageRetrievalService_signal">Molly</string>
+    <string mollyify="true" name="MessageRetrievalService_signal">Molly</string>
     <string name="MessageRetrievalService_background_connection_enabled">Background connection enabled</string>
 
     <!-- MediaOverviewActivity -->
@@ -1271,6 +1299,7 @@
         <item quantity="other">Delete</item>
     </plurals>
 
+    <!-- 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 selected (%2$s)</item>
         <item quantity="other">%1$d selected (%2$s)</item>
@@ -1304,8 +1333,8 @@
     <!-- NotificationBarManager -->
     <string name="NotificationBarManager__establishing_signal_call">Establishing Signal call</string>
     <!-- Temporary notification shown when starting the calling service -->
-    <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 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>
     <string name="NotificationBarManager__cancel_call">Cancel call</string>
 
     <!-- NotificationsMegaphone -->
@@ -1335,17 +1364,13 @@
     <string name="MessageRecord_left_group">You have left the group.</string>
     <string name="MessageRecord_you_updated_group">You updated the group.</string>
     <string name="MessageRecord_the_group_was_updated">The group was updated.</string>
-    <!-- Update message shown when placing an outgoing 1:1 voice/audio call and it\'s answered by the other party -->
+    <!-- Update message shown when placing an outgoing 1:1 voice/audio call -->
     <string name="MessageRecord_outgoing_voice_call">Outgoing voice call</string>
-    <!-- Update message shown when placing an outgoing 1:1 video call and it\'s answered by the other party -->
+    <!-- Update message shown when placing an outgoing 1:1 video call -->
     <string name="MessageRecord_outgoing_video_call">Outgoing video call</string>
-    <!-- Update message shown when placing an outgoing 1:1 voice/audio call and it\'s not answered by the other party -->
-    <string name="MessageRecord_unanswered_voice_call">Unanswered voice call</string>
-    <!-- Update message shown when placing an outgoing 1:1 video call and it\'s not answered by the other party -->
-    <string name="MessageRecord_unanswered_video_call">Unanswered video call</string>
-    <!-- Update message shown when receiving an incoming 1:1 voice/audio call and it\'s answered -->
+    <!-- Update message shown when receiving an incoming 1:1 voice/audio call and it\'s answered or ringing -->
     <string name="MessageRecord_incoming_voice_call">Incoming voice call</string>
-    <!-- Update message shown when receiving an incoming 1:1 video call and answered -->
+    <!-- Update message shown when receiving an incoming 1:1 video call and answered or ringing -->
     <string name="MessageRecord_incoming_video_call">Incoming video call</string>
     <!-- Update message shown when receiving an incoming 1:1 voice/audio call and not answered -->
     <string name="MessageRecord_missed_voice_call">Missed voice call</string>
@@ -1355,10 +1380,6 @@
     <string name="MessageRecord_missed_voice_call_notification_profile">Missed voice call while notification profile on</string>
     <!-- Update message shown when receiving an incoming video call and declined due to notification profile -->
     <string name="MessageRecord_missed_video_call_notification_profile">Missed video call while notification profile on</string>
-    <!-- Update message shown when receiving an incoming 1:1 voice/audio call and explicitly declined -->
-    <string name="MessageRecord_you_declined_a_voice_call">You declined a voice call</string>
-    <!-- Update message shown when receiving an incoming 1:1 video call and explicitly declined -->
-    <string name="MessageRecord_you_declined_a_video_call">You declined a video call</string>
     <!-- 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">%s updated the group.</string>
@@ -1567,28 +1588,53 @@
     <string name="MessageRecord_can_accept_payments">%s can now accept Payments</string>
 
     <!-- Group Calling update messages -->
-    <string name="MessageRecord_s_started_a_group_call_s">%1$s started a group call · %2$s</string>
-    <string name="MessageRecord_you_started_a_group_call_s">You started a group call · %1$s</string>
-    <string name="MessageRecord_s_is_in_the_group_call_s">%1$s is in the group call · %2$s</string>
-    <string name="MessageRecord_you_are_in_the_group_call_s1">You are in the group call · %1$s</string>
-    <string name="MessageRecord_s_and_s_are_in_the_group_call_s1">%1$s and %2$s are in the group call · %3$s</string>
-    <string name="MessageRecord_group_call_s">Group call · %1$s</string>
-
-    <string name="MessageRecord_s_started_a_group_call">%1$s started a group call</string>
-    <string name="MessageRecord_you_started_a_group_call">You started a group call</string>
-    <string name="MessageRecord_s_is_in_the_group_call">%1$s is in the group call</string>
-    <string name="MessageRecord_you_are_in_the_group_call">You are in the group call</string>
-    <string name="MessageRecord_s_and_s_are_in_the_group_call">%1$s and %2$s are in the group call</string>
-    <string name="MessageRecord_group_call">Group call</string>
+    <!-- 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 is in the call · %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">You are in the call · %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 and %2$s are in the call · %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 is in the call</string>
+    <!-- Chat log text for an ongoing group call only the local user has joined -->
+    <string name="MessageRecord_you_are_in_the_call">You are in the call</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 and %2$s are in the call</string>
+    <!-- Chat log text for a group call that ended within the last 5 minutes -->
+    <string name="MessageRecord__the_video_call_has_ended">The video call has ended</string>
+    <!-- Chat log text for a group call that ended within the last 5 minutes with a placeholder for formatted time -->
+    <string name="MessageRecord__the_video_call_has_ended_s">The video call has ended · %1$s</string>
+    <!-- Chat log text for a group call that ended more than 5 minutes ago and was missed -->
+    <string name="MessageRecord__missed_video_call">Missed video call</string>
+    <!-- Chat log text for a group call that ended more than 5 minutes ago and was missed with a placeholder for formatted time -->
+    <string name="MessageRecord__missed_video_call_s">Missed video call · %1$s</string>
+    <!-- Chat log text for a group call that ended that the local user did not start -->
+    <string name="MessageRecord__incoming_video_call">Incoming video call</string>
+    <!-- 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">Incoming video call · %1$s</string>
+    <!-- Chat log text for a group call that ended that the local user started -->
+    <string name="MessageRecord__outgoing_video_call">Outgoing video call</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">Outgoing video call · %1$s</string>
+    <!-- Chat log text for an ongoing group call that the local user started -->
+    <string name="MessageRecord__you_started_a_video_call">You started a video call</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">You started a video call · %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 started a video call</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 started a video call · %2$s</string>
 
     <string name="MessageRecord_you">You</string>
 
-    <plurals name="MessageRecord_s_s_and_d_others_are_in_the_group_call_s">
+    <!-- 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, and %3$d other are in the group call · %4$s</item>
         <item quantity="other">%1$s, %2$s, and %3$d others are in the group call · %4$s</item>
     </plurals>
 
-    <plurals name="MessageRecord_s_s_and_d_others_are_in_the_group_call">
+    <!-- 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, and %3$d other are in the group call</item>
         <item quantity="other">%1$s, %2$s, and %3$d others are in the group call</item>
     </plurals>
@@ -1596,7 +1642,7 @@
     <!-- 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">You will no longer be able to send SMS messages from Signal soon. Invite %1$s to Signal to keep the conversation here.</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">You can no longer send SMS messages in Molly. Invite %1$s to Molly to keep the conversation here.</string>
+    <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>
     <!-- Update message shown in chat after reporting it as spam -->
@@ -1677,7 +1723,7 @@
     <string name="DeviceProvisioningActivity_link_a_signal_device">Link a Signal device?</string>
     <string name="DeviceProvisioningActivity_it_looks_like_youre_trying_to_link_a_signal_device_using_a_3rd_party_scanner">It looks like you\'re trying to link a Signal device using a 3rd party scanner.  For your protection, please scan the code again from within Signal.</string>
 
-    <string name="DeviceActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code">Molly needs the Camera permission in order to scan a QR code, but it has been permanently denied. Please continue to app settings, select \"Permissions\", and enable \"Camera\".</string>
+    <string mollyify="true" name="DeviceActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code">Molly needs the Camera permission in order to scan a QR code, but it has been permanently denied. Please continue to app settings, select \"Permissions\", and enable \"Camera\".</string>
     <string name="DeviceActivity_unable_to_scan_a_qr_code_without_the_camera_permission">Unable to scan a QR code without the Camera permission</string>
 
     <!-- OutdatedBuildReminder -->
@@ -1690,11 +1736,11 @@
 
     <!-- PassphrasePromptActivity -->
     <string name="PassphrasePromptActivity_enter_passphrase">Enter passphrase</string>
-    <string name="PassphrasePromptActivity_watermark_content_description">Molly icon</string>
+    <string mollyify="true" name="PassphrasePromptActivity_watermark_content_description">Molly icon</string>
     <string name="PassphrasePromptActivity_ok_button_content_description">Submit passphrase</string>
     <string name="PassphrasePromptActivity_invalid_passphrase_exclamation">Invalid passphrase!</string>
-    <string name="PassphrasePromptActivity_unlock_signal">Unlock Molly</string>
-    <string name="PassphrasePromptActivity_signal_android_lock_screen">Molly Android - Lock Screen</string>
+    <string mollyify="true" name="PassphrasePromptActivity_unlock_signal">Unlock Molly</string>
+    <string mollyify="true" name="PassphrasePromptActivity_signal_android_lock_screen">Molly Android - Lock Screen</string>
 
     <!-- PlacePickerActivity -->
     <string name="PlacePickerActivity_title">Map</string>
@@ -1761,7 +1807,7 @@
 
     <!-- RecaptchaRequiredBottomSheetFragment -->
     <string name="RecaptchaRequiredBottomSheetFragment_verify_to_continue_messaging">Verify to continue messaging</string>
-    <string name="RecaptchaRequiredBottomSheetFragment_to_help_prevent_spam_on_signal">To help prevent spam on Molly, please complete verification.</string>
+    <string mollyify="true" name="RecaptchaRequiredBottomSheetFragment_to_help_prevent_spam_on_signal">To help prevent spam on Molly, please complete verification.</string>
     <string name="RecaptchaRequiredBottomSheetFragment_after_verifying_you_can_continue_messaging">After verifying, you can continue messaging. Any paused messages will automatically be sent.</string>
 
     <!-- Recipient -->
@@ -1769,7 +1815,7 @@
     <!-- Name of recipient representing user\'s \'My Story\' -->
     <string name="Recipient_my_story">My Story</string>
     <!-- Name of recipient for a call link without a name -->
-    <string name="Recipient_signal_call">Molly call</string>
+    <string mollyify="true" name="Recipient_signal_call">Molly call</string>
 
     <!-- RecipientPreferencesActivity -->
     <string name="RecipientPreferenceActivity_block">Block</string>
@@ -1794,8 +1840,8 @@
 
     <!-- WebRtcCallActivity -->
     <string name="WebRtcCallActivity__tap_here_to_turn_on_your_video">Tap here to turn on your video</string>
-    <string name="WebRtcCallActivity__to_call_s_signal_needs_access_to_your_camera">To call %1$s, Molly needs access to your camera</string>
-    <string name="WebRtcCallActivity__signal_s">Molly %1$s</string>
+    <string mollyify="true" name="WebRtcCallActivity__to_call_s_signal_needs_access_to_your_camera">To call %1$s, Molly needs access to your camera</string>
+    <string mollyify="true" 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">Reconnecting…</string>
@@ -2050,13 +2096,13 @@
     <string name="RegistrationActivity_you_will_receive_a_call_to_verify_this_number">You\'ll receive a call to verify this number.</string>
     <string name="RegistrationActivity_edit_number">Edit number</string>
     <string name="RegistrationActivity_missing_google_play_services">Missing Google Play Services</string>
-    <string name="RegistrationActivity_this_device_is_missing_google_play_services">This device is missing Google Play Services. You can still use Molly, but this configuration may result in reduced reliability or performance.\n\nIf you are not an advanced user, are not running an aftermarket Android ROM, or believe that you are seeing this in error, please contact support@molly.im for help troubleshooting.</string>
+    <string mollyify="true" name="RegistrationActivity_this_device_is_missing_google_play_services">This device is missing Google Play Services. You can still use Molly, but this configuration may result in reduced reliability or performance.\n\nIf you are not an advanced user, are not running an aftermarket Android ROM, or believe that you are seeing this in error, please contact support@molly.im for help troubleshooting.</string>
     <string name="RegistrationActivity_i_understand">I understand</string>
     <string name="RegistrationActivity_play_services_error">Play Services Error</string>
     <string name="RegistrationActivity_google_play_services_is_updating_or_unavailable">Google Play Services is updating or temporarily unavailable. Please try again.</string>
     <string name="RegistrationActivity_terms_and_privacy">Terms &amp; Privacy Policy</string>
-    <string name="RegistrationActivity_signal_needs_access_to_your_contacts_and_media_in_order_to_connect_with_friends">Signal needs the contacts and media permissions to help you connect with 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_signal_needs_access_to_your_contacts_in_order_to_connect_with_friends">Signal needs the contacts permission to help you connect with 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="RegistrationActivity_signal_needs_access_to_your_contacts_and_media_in_order_to_connect_with_friends">Molly needs the contacts and media permissions to help you connect with 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_signal_needs_access_to_your_contacts_in_order_to_connect_with_friends">Molly needs the contacts permission to help you connect with 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="RegistrationActivity_rate_limited_to_service">You\'ve made too many attempts to register this number. Please try again later.</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">You\'ve made too many attempts to register this number. Please try again in %s.</string>
@@ -2066,8 +2112,9 @@
     <!-- Generic error when the app is unable to request an SMS code for an unknown reason. -->
     <string name="RegistrationActivity_unable_to_request_verification_code">Unable to request a verification code. Please check network connection and try again.</string>
     <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">The number you entered (%1$s) appears to be a non-standard format.\n\nDid you mean %2$s?</string>
-    <string name="RegistrationActivity_signal_android_phone_number_format">Molly Android - Phone Number Format</string>
+    <string mollyify="true" 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.-->
@@ -2140,13 +2187,13 @@
 
     <!-- SharedContactDetailsActivity -->
     <string name="SharedContactDetailsActivity_add_to_contacts">Add to Contacts</string>
-    <string name="SharedContactDetailsActivity_invite_to_signal">Invite to Molly</string>
+    <string mollyify="true" name="SharedContactDetailsActivity_invite_to_signal">Invite to Molly</string>
     <string name="SharedContactDetailsActivity_signal_message">Signal Message</string>
     <string name="SharedContactDetailsActivity_signal_call">Signal Call</string>
 
     <!-- SharedContactView -->
     <string name="SharedContactView_add_to_contacts">Add to Contacts</string>
-    <string name="SharedContactView_invite_to_signal">Invite to Molly</string>
+    <string mollyify="true" name="SharedContactView_invite_to_signal">Invite to Molly</string>
     <string name="SharedContactView_message">Signal Message</string>
 
     <!-- SignalBottomActionBar -->
@@ -2210,12 +2257,12 @@
     <string name="SubmitDebugLogActivity_this_log_will_be_posted_publicly_online_for_contributors">This log will be posted publicly online for contributors to view. You may examine it before uploading.</string>
 
     <!-- SupportEmailUtil -->
-    <string name="SupportEmailUtil_support_email" translatable="false">support@molly.im</string>
+    <string mollyify="true" name="SupportEmailUtil_support_email" translatable="false">support@molly.im</string>
     <string name="SupportEmailUtil_filter">Filter:</string>
     <string name="SupportEmailUtil_device_info">Device info:</string>
     <string name="SupportEmailUtil_android_version">Android version:</string>
-    <string name="SupportEmailUtil_signal_version">Molly version:</string>
-    <string name="SupportEmailUtil_signal_package">Molly package:</string>
+    <string mollyify="true" name="SupportEmailUtil_signal_version">Molly version:</string>
+    <string mollyify="true" name="SupportEmailUtil_signal_package">Molly package:</string>
     <string name="SupportEmailUtil_registration_lock">Registration lock:</string>
     <string name="SupportEmailUtil_locale">Locale:</string>
 
@@ -2277,11 +2324,11 @@
     <string name="ThreadRecord_s_belongs_to_s">%1$s belongs to %2$s</string>
 
     <!-- ApkUpdateNotifications -->
-    <string name="ApkUpdateNotifications_prompt_install_title">Molly update</string>
-    <string name="ApkUpdateNotifications_prompt_install_body">A new version of Molly is available. Tap to update.</string>
-    <string name="ApkUpdateNotifications_failed_general_title">Molly failed to update</string>
+    <string mollyify="true" name="ApkUpdateNotifications_prompt_install_title">Molly update</string>
+    <string mollyify="true" name="ApkUpdateNotifications_prompt_install_body">A new version of Molly is available. Tap to update.</string>
+    <string mollyify="true" name="ApkUpdateNotifications_failed_general_title">Molly failed to update</string>
     <string name="ApkUpdateNotifications_failed_general_body">We will try again later.</string>
-    <string name="ApkUpdateNotifications_auto_update_success_title">Molly successfully updated</string>
+    <string mollyify="true" name="ApkUpdateNotifications_auto_update_success_title">Molly successfully updated</string>
     <string name="ApkUpdateNotifications_auto_update_success_body">You were automatically updated to version %1$s.</string>
 
     <!-- UntrustedSendDialog -->
@@ -2352,7 +2399,7 @@
     <string name="VerifyIdentityActivity_our_signal_safety_number">Our Signal safety number:</string>
     <string name="VerifyIdentityActivity_no_app_to_share_to">It looks like you don\'t have any apps to share to.</string>
     <string name="VerifyIdentityActivity_no_safety_number_to_compare_was_found_in_the_clipboard">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">Molly needs the Camera permission in order to scan a QR code, but it has been permanently denied. Please continue to app settings, select \"Permissions\", and enable \"Camera\".</string>
+    <string mollyify="true" name="VerifyIdentityActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code_but_it_has_been_permanently_denied">Molly needs the Camera permission in order to scan a QR code, but it has been permanently denied. Please continue to app settings, select \"Permissions\", and enable \"Camera\".</string>
     <string name="VerifyIdentityActivity_unable_to_scan_qr_code_without_camera_permission">Unable to scan QR code without Camera permission</string>
     <string name="VerifyIdentityActivity_you_must_first_exchange_messages_in_order_to_view">You must first exchange messages in order to view %1$s\'s safety number.</string>
     <!-- Dialog message explaining to user they must exchange messages first to create a safety number -->
@@ -2382,14 +2429,14 @@
 
     <!-- KeyCachingService -->
     <string name="KeyCachingService_signal_passphrase_cached">Touch to open.</string>
-    <string name="KeyCachingService_passphrase_cached">Molly is unlocked</string>
-    <string name="KeyCachingService_lock">Lock Molly</string>
+    <string mollyify="true" name="KeyCachingService_passphrase_cached">Molly is unlocked</string>
+    <string mollyify="true" name="KeyCachingService_lock">Lock Molly</string>
 
     <!-- MediaPreviewActivity -->
     <string name="MediaPreviewActivity_you">You</string>
     <string name="MediaPreviewActivity_unssuported_media_type">Unsupported media type</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">Molly needs the Storage permission in order to save to external storage, but it has been permanently denied. Please continue to app settings, select \"Permissions\", and enable \"Storage\".</string>
+    <string mollyify="true" name="MediaPreviewActivity_signal_needs_the_storage_permission_in_order_to_write_to_external_storage_but_it_has_been_permanently_denied">Molly needs the Storage permission in order to save to external storage, but it has been permanently denied. Please continue to app settings, select \"Permissions\", and enable \"Storage\".</string>
     <string name="MediaPreviewActivity_unable_to_write_to_external_storage_without_permission">Unable to save to external storage without permissions</string>
     <string name="MediaPreviewActivity_media_delete_confirmation_title">Delete message?</string>
     <string name="MediaPreviewActivity_media_delete_confirmation_message">This will permanently delete this message.</string>
@@ -2433,7 +2480,7 @@
     <string name="MessageNotifier_failed_to_deliver_message">Failed to deliver message.</string>
     <string name="MessageNotifier_error_delivering_message">Error delivering message.</string>
     <string name="MessageNotifier_message_delivery_paused">Message delivery paused.</string>
-    <string name="MessageNotifier_verify_to_continue_messaging_on_signal">Verify to continue messaging on Molly.</string>
+    <string mollyify="true" name="MessageNotifier_verify_to_continue_messaging_on_signal">Verify to continue messaging on Molly.</string>
     <string name="MessageNotifier_mark_all_as_read">Mark all as read</string>
     <string name="MessageNotifier_mark_read">Mark read</string>
     <string name="MessageNotifier_turn_off_these_notifications">Turn off these notifications</string>
@@ -2494,7 +2541,7 @@
     <!-- ProfileEditNameFragment -->
 
     <!-- QuickResponseService -->
-    <string name="QuickResponseService_quick_response_unavailable_when_Signal_is_locked">Quick response unavailable when Molly is locked!</string>
+    <string mollyify="true" name="QuickResponseService_quick_response_unavailable_when_Signal_is_locked">Quick response unavailable when Molly is locked!</string>
     <string name="QuickResponseService_problem_sending_message">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. -->
@@ -2514,7 +2561,7 @@
     <string name="ShortcutLauncherActivity_invalid_shortcut">Invalid shortcut</string>
 
     <!-- SingleRecipientNotificationBuilder -->
-    <string name="SingleRecipientNotificationBuilder_signal">Molly</string>
+    <string mollyify="true" name="SingleRecipientNotificationBuilder_signal">Molly</string>
     <string name="SingleRecipientNotificationBuilder_new_message">New message</string>
     <string name="SingleRecipientNotificationBuilder_message_request">Message request</string>
     <string name="SingleRecipientNotificationBuilder_you">You</string>
@@ -2560,7 +2607,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">This device is no longer registered. This is likely because you registered your phone number with Molly on a different device.</string>
+    <string mollyify="true" name="UnauthorizedReminder_this_is_likely_because_you_registered_your_phone_number_with_Signal_on_a_different_device">This device is no longer registered. This is likely because you registered your phone number with Molly on a different device.</string>
     <!-- Action in reminder banner that will take user to re-register -->
     <string name="UnauthorizedReminder_reregister_action">Re-register device</string>
 
@@ -2573,10 +2620,10 @@
     <!-- Banner button to update now -->
 
     <!-- WebRtcCallActivity -->
-    <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone">To answer the call, give Molly access to your microphone.</string>
+    <string mollyify="true" name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone">To answer the call, give Molly 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">To answer the video call, give Molly access to your microphone and camera.</string>
-    <string name="WebRtcCallActivity_signal_requires_microphone_and_camera_permissions_in_order_to_make_or_receive_calls">Molly requires Microphone and Camera permissions in order to make or receive calls, but they have been permanently denied. Please continue to app settings, select \"Permissions\", and enable \"Microphone\" and \"Camera\".</string>
+    <string mollyify="true" name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone_and_camera">To answer the video call, give Molly access to your microphone and camera.</string>
+    <string mollyify="true" name="WebRtcCallActivity_signal_requires_microphone_and_camera_permissions_in_order_to_make_or_receive_calls">Molly requires Microphone and Camera permissions in order to make or receive calls, but they have been permanently denied. Please continue to app settings, select \"Permissions\", and enable \"Microphone\" and \"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>
@@ -2621,7 +2668,7 @@
     <string name="change_passphrase_activity__repeat_new_passphrase">Repeat new passphrase</string>
 
     <!-- contact_selection_activity -->
-    <string name="contact_selection_activity__invite_to_signal">Invite to Molly</string>
+    <string mollyify="true" name="contact_selection_activity__invite_to_signal">Invite to Molly</string>
     <string name="contact_selection_activity__new_group">New group</string>
     <!-- Row item title for refreshing contacts -->
     <string name="contact_selection_activity__refresh_contacts">Refresh contacts</string>
@@ -2643,7 +2690,7 @@
     <string name="SingleContactSelectionActivity_contact_photo">Contact Photo</string>
 
     <!-- ContactSelectionListFragment-->
-    <string name="ContactSelectionListFragment_signal_requires_the_contacts_permission_in_order_to_display_your_contacts">Molly requires the Contacts permission in order to display your contacts, but it has been permanently denied. Please continue to the app settings menu, select \"Permissions\", and enable \"Contacts\".</string>
+    <string mollyify="true" name="ContactSelectionListFragment_signal_requires_the_contacts_permission_in_order_to_display_your_contacts">Molly requires the Contacts permission in order to display your contacts, but it has been permanently denied. Please continue to the app settings menu, select \"Permissions\", and enable \"Contacts\".</string>
     <string name="ContactSelectionListFragment_error_retrieving_contacts_check_your_network_connection">Error retrieving contacts, check your network connection</string>
     <string name="ContactSelectionListFragment_username_not_found">Username not found</string>
     <string name="ContactSelectionListFragment_s_is_not_a_signal_user">"%1$s" is not a Signal user. Please check the username and try again.</string>
@@ -2662,7 +2709,7 @@
     <string name="ContactSelectionListFragment__find_by_username">Find by username</string>
 
     <!-- contact_selection_list_fragment -->
-    <string name="contact_selection_list_fragment__signal_needs_access_to_your_contacts_in_order_to_display_them">Molly needs access to your contacts in order to display them.</string>
+    <string mollyify="true" name="contact_selection_list_fragment__signal_needs_access_to_your_contacts_in_order_to_display_them">Molly needs access to your contacts in order to display them.</string>
     <string name="contact_selection_list_fragment__show_contacts">Show Contacts</string>
 
     <!-- contact_selection_list_item -->
@@ -2712,6 +2759,8 @@
     <string name="ConversationUpdateItem_loading">Loading</string>
     <string name="ConversationUpdateItem_learn_more">Learn more</string>
     <string name="ConversationUpdateItem_join_call">Join call</string>
+    <!-- Action button label for starting a new call in the current conversation -->
+    <string name="ConversationUpdateItem_call_back">Call back</string>
     <string name="ConversationUpdateItem_return_to_call">Return to call</string>
     <string name="ConversationUpdateItem_call_is_full">Call is full</string>
     <string name="ConversationUpdateItem_invite_friends">Invite friends</string>
@@ -2761,7 +2810,7 @@
 
     <!-- BubbleOptOutTooltip -->
     <!-- Message to inform the user of what Android chat bubbles are -->
-    <string name="BubbleOptOutTooltip__description">Bubbles are an Android feature that you can turn off for Molly chats.</string>
+    <string mollyify="true" name="BubbleOptOutTooltip__description">Bubbles are an Android feature that you can turn off for Molly chats.</string>
     <!-- Button to dismiss the tooltip for opting out of using Android bubbles -->
     <string name="BubbleOptOutTooltip__not_now">Not now</string>
     <!-- Button to move to the system settings to control the use of Android bubbles -->
@@ -2776,6 +2825,7 @@
     <string name="safety_number_change_dialog__leave_call">Leave call</string>
     <string name="safety_number_change_dialog__the_following_people_may_have_reinstalled_or_changed_devices">The following people may have reinstalled or changed devices. Verify your safety number with them to ensure privacy.</string>
     <string name="safety_number_change_dialog__view">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">Previous verified</string>
 
     <!-- EnableCallNotificationSettingsDialog__call_notifications_checklist -->
@@ -2928,9 +2978,9 @@
     <string name="EditProfileFragment__group_description">Group description</string>
     <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">Update Molly</string>
+    <string mollyify="true" name="EditProfileFragment_deprecated_dialog_title">Update Molly</string>
     <!-- The body of a dialog prompting user to update to the latest version of Signal. -->
-    <string name="EditProfileFragment_deprecated_dialog_body">This version of Molly has expired. Update now to continue using Molly.</string>
+    <string mollyify="true" name="EditProfileFragment_deprecated_dialog_body">This version of Molly has expired. Update now to continue using 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">Update</string>
     <!-- The title of a dialog informing the user that they cannot use this app feature when they are unregistered. -->
@@ -3087,6 +3137,7 @@
 
     <string name="arrays__default">Default</string>
     <string name="arrays__high">High</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">Max</string>
 
     <!-- plurals.xml -->
@@ -3144,7 +3195,7 @@
     <string name="preferences__slow">Slow</string>
     <string name="preferences__help">Help</string>
     <string name="preferences__advanced">Advanced</string>
-    <string name="preferences__donate_to_signal">Donate to Molly</string>
+    <string mollyify="true" name="preferences__donate_to_signal">Donate to Molly</string>
     <!-- Preference label for making one-time donations to Signal -->
     <string name="preferences__privacy">Privacy</string>
     <!-- Preference label for stories -->
@@ -3181,13 +3232,13 @@
     <!-- Title for the confirmation dialog of changing the app icon. -->
     <string name="preferences__app_icon_dialog_title">Change app icon and name to \"%1$s\"</string>
     <!-- Description for the confirmation dialog of changing the app icon. -->
-    <string name="preferences__app_icon_dialog_description">Molly will need to close to change the app icon and name. Notifications will always display the default Molly icon and name.</string>
+    <string mollyify="true" name="preferences__app_icon_dialog_description">Molly will need to close to change the app icon and name. Notifications will always display the default Molly icon and name.</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">Select an app icon and name, which will be visible on your phone\'s home screen and app drawer. Notifications will always display the default Molly icon and name. Learn\u00A0more</string>
+    <string mollyify="true" name="preferences__app_icon_warning_learn_more">Select an app icon and name, which will be visible on your phone\'s home screen and app drawer. Notifications will always display the default Molly icon and name. Learn\u00A0more</string>
     <!-- Visible warning label for the limitations of changing the app icon. -->
     <string name="preferences__app_icon_warning">App icons and names are visible on the home screen and 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">Notifications will always display the default Molly icon and name.</string>
+    <string mollyify="true" name="preferences__app_icon_notification_warning">Notifications will always display the default Molly icon and name.</string>
     <!--Call to action to get more information about the limitations of the change app icon functionality. -->
     <string name="preferences__app_icon_learn_more">Learn\u00A0more</string>
     <!--Text description of a graphic illustrating the limitations of the app icon change. -->
@@ -3271,7 +3322,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">If enabled, Molly will attempt to circumvent censorship. Do not enable this feature unless you are in a location where Molly is censored.</string>
+    <string mollyify="true" name="preferences_communication__censorship_circumvention_if_enabled_signal_will_attempt_to_circumvent_censorship">If enabled, Molly will attempt to circumvent censorship. Do not enable this feature unless you are in a location where Molly is censored.</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">Censorship circumvention has been activated based on your account\'s phone number.</string>
     <!-- Summary text for \'censorship circumvention\' toggle. Indicates that you disabled it even though we believe you\'re in a censored country -->
@@ -3323,7 +3374,7 @@
 
     <!-- Displayed on a welcome screen for payments -->
     <string name="PaymentsHomeFragment_introducing_payments">Introducing payments</string>
-    <string name="PaymentsHomeFragment__use_signal_to_send_and_receive">Use Molly to send and receive MobileCoin, a new privacy focused digital currency. Activate to get started.</string>
+    <string mollyify="true" name="PaymentsHomeFragment__use_signal_to_send_and_receive">Use Molly to send and receive MobileCoin, a new privacy focused digital currency. Activate to get started.</string>
     <string name="PaymentsHomeFragment__activate_payments">Activate Payments</string>
     <string name="PaymentsHomeFragment__activating_payments">Activating payments…</string>
     <string name="PaymentsHomeFragment__restore_payments_account">Restore payments account</string>
@@ -3349,7 +3400,7 @@
     <string name="PaymentsHomeFragment__payments_is_not_available_in_your_region">Payments is not available in your region.</string>
     <string name="PaymentsHomeFragment__could_not_enable_payments">Could not enable payments. Try again later.</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 Molly if you deactivate payments.</string>
+    <string mollyify="true" 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">Deactivate</string>
     <string name="PaymentsHomeFragment__continue">Continue</string>
     <string name="PaymentsHomeFragment__balance_is_not_currently_available">Balance is not currently available.</string>
@@ -3358,10 +3409,10 @@
     <string name="PaymentsHomeFragment__details">Details</string>
     <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">You can use Signal to send and receive MobileCoin. All payments are subject to the Terms of Use for MobileCoins and the MobileCoin Wallet. You may encounter some issues and payments or balances you may lose can\'t be recovered. </string>
+    <string mollyify="true" name="PaymentsHomeFragment__you_can_use_signal_to_send_and">You can use Molly to send and receive MobileCoin. All payments are subject to the Terms of Use for MobileCoins and the MobileCoin Wallet. You may encounter some issues and payments or balances you may lose can\'t be recovered. </string>
     <string name="PaymentsHomeFragment__activate">Activate</string>
     <string name="PaymentsHomeFragment__view_mobile_coin_terms">View MobileCoin terms</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>
+    <string mollyify="true" 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>
 
     <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 -->
@@ -3389,7 +3440,7 @@
     <!-- Displayed as a title at the top of the screen -->
     <string name="GrantPermissionsFragment__allow_permissions">Allow permissions</string>
     <!-- Displayed as a subtitle at the top of the screen -->
-    <string name="GrantPermissionsFragment__to_help_you_message_people_you_know">To help you message people you know, Molly will request these permissions. </string>
+    <string mollyify="true" name="GrantPermissionsFragment__to_help_you_message_people_you_know">To help you message people you know, Molly will request these permissions. </string>
     <!-- Notifications permission row title -->
     <string name="GrantPermissionsFragment__notifications">Notifications</string>
     <!-- Notifications permission row description -->
@@ -3407,6 +3458,14 @@
     <!-- Storage permission row description -->
     <string name="GrantPermissionsFragment__send_photos_videos_and_files">Send photos, videos and files from your device.</string>
 
+    <!-- PermissionDeniedBottomSheet -->
+    <!-- Sheet describing step 1 on how to give permissions by opening settings -->
+    <string name="PermissionDeniedBottomSheet__1_tap_settings_below">1. Tap “Settings” below</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. %s Allow the permission</string>
+    <!-- Label for button at the bottom of the sheet which opens the system permission settings -->
+    <string name="PermissionDeniedBottomSheet__settings">Settings</string>
+
     <!-- PaymentsSecuritySetupFragment -->
     <!-- Toolbar title -->
     <string name="PaymentsSecuritySetupFragment__security_setup">Security setup</string>
@@ -3447,6 +3506,7 @@
     <string name="PaymentsDetailsFragment__sent_to_s">Sent to %1$s</string>
     <string name="PaymentsDetailsFragment__you_on_s_at_s">You on %1$s at %2$s</string>
     <string name="PaymentsDetailsFragment__s_on_s_at_s">%1$s on %2$s at %3$s</string>
+    <!-- Prefix to a name to indicate who a payment was sent to -->
     <string name="PaymentsDetailsFragment__to">To</string>
     <string name="PaymentsDetailsFragment__from">From</string>
     <string name="PaymentsDetailsFragment__information">Transaction details including the payment amount and time of transaction are part of the MobileCoin Ledger.</string>
@@ -3468,10 +3528,10 @@
     <string name="PaymentsTransferFragment__next">Next</string>
     <string name="PaymentsTransferFragment__invalid_address">Invalid address</string>
     <string name="PaymentsTransferFragment__check_the_wallet_address">Check the wallet address you\'re attempting to transfer to and try again.</string>
-    <string name="PaymentsTransferFragment__you_cant_transfer_to_your_own_signal_wallet_address">You can\'t transfer to your own Molly wallet address. Enter the wallet address from your account at a supported exchange.</string>
-    <string name="PaymentsTransferFragment__to_scan_a_qr_code_signal_needs">To scan a QR code, Molly needs access to the camera.</string>
-    <string name="PaymentsTransferFragment__signal_needs_the_camera_permission_to_capture_qr_code_go_to_settings">Molly needs the Camera permission to capture a QR code. Go to settings, select \"Permissions\", and enable \"Camera\".</string>
-    <string name="PaymentsTransferFragment__to_scan_a_qr_code_signal_needs_access_to_the_camera">To scan a QR code, Molly needs access to the camera.</string>
+    <string mollyify="true" name="PaymentsTransferFragment__you_cant_transfer_to_your_own_signal_wallet_address">You can\'t transfer to your own Molly wallet address. Enter the wallet address from your account at a supported exchange.</string>
+    <string mollyify="true" name="PaymentsTransferFragment__to_scan_a_qr_code_signal_needs">To scan a QR code, Molly needs access to the camera.</string>
+    <string mollyify="true" name="PaymentsTransferFragment__signal_needs_the_camera_permission_to_capture_qr_code_go_to_settings">Molly needs the Camera permission to capture a QR code. Go to settings, select \"Permissions\", and enable \"Camera\".</string>
+    <string mollyify="true" name="PaymentsTransferFragment__to_scan_a_qr_code_signal_needs_access_to_the_camera">To scan a QR code, Molly needs access to the camera.</string>
     <string name="PaymentsTransferFragment__settings">Settings</string>
 
     <!-- PaymentsTransferQrScanFragment -->
@@ -3509,6 +3569,7 @@
     <string name="ConfirmPayment__confirm_payment">Confirm payment</string>
     <string name="ConfirmPayment__network_fee">Network fee</string>
     <string name="ConfirmPayment__estimated_s">Estimated %1$s</string>
+    <!-- Prefix to a name to indicate who a payment will be sent to -->
     <string name="ConfirmPayment__to">To</string>
     <string name="ConfirmPayment__total_amount">Total amount</string>
     <string name="ConfirmPayment__balance_s">Balance: %1$s</string>
@@ -3659,10 +3720,18 @@
     <string name="conversation_group_options__conversation">Chat</string>
     <string name="conversation_group_options__broadcast">Broadcast</string>
 
+    <!-- DoubleTapEditEducationSheet -->
+    <!-- Displayed as the title of the education bottom sheet -->
+    <string name="DoubleTapEditEducationSheet__double_tap_edit_title">Double tap to edit</string>
+    <!-- Text on the sheet explaining how double tapping on a message will let them edit it -->
+    <string name="DoubleTapEditEducationSheet__quickly_tap_twice">Quickly tap twice on your messages to edit them. You can edit your messages up to 24hrs after they’ve been sent.</string>
+    <!-- Button label to dismiss sheet -->
+    <string name="DoubleTapEditEducationSheet__got_it">Got it</string>
+
     <!-- text_secure_normal -->
     <string name="text_secure_normal__menu_new_group">New group</string>
     <string name="text_secure_normal__menu_settings">Settings</string>
-    <string name="text_secure_normal__menu_clear_passphrase">Lock</string>
+    <string mollyify="true" name="text_secure_normal__menu_clear_passphrase">Lock</string>
     <string name="text_secure_normal__mark_all_as_read">Mark all read</string>
     <string name="text_secure_normal__invite_friends">Invite friends</string>
     <!-- Overflow menu entry to filter unread chats -->
@@ -3810,17 +3879,17 @@
 
     <!-- CallNotificationBuilder -->
     <!-- Displayed in a notification when a Signal voice call is ringing -->
-    <string name="CallNotificationBuilder__incoming_signal_voice_call">Incoming Molly voice call</string>
+    <string mollyify="true" 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 Molly video call</string>
+    <string mollyify="true" 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 Molly group call</string>
+    <string mollyify="true" 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 Molly voice call</string>
+    <string mollyify="true" 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 Molly video call</string>
+    <string mollyify="true" 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 Molly group call</string>
+    <string mollyify="true" name="CallNotificationBuilder__ongoing_signal_group_call">Ongoing Molly group call</string>
 
     <!-- transport_selection_list_item -->
     <string name="ConversationListFragment_loading">Loading…</string>
@@ -3867,9 +3936,9 @@
     <string name="BackupDialog_verify">Verify</string>
     <string name="BackupDialog_you_successfully_entered_your_backup_passphrase">You successfully entered your backup passphrase</string>
     <string name="BackupDialog_passphrase_was_not_correct">Passphrase was not correct</string>
-    <string name="LocalBackupJob_creating_signal_backup">Creating Molly backup…</string>
+    <string mollyify="true" 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">Verifying Molly backup…</string>
+    <string mollyify="true" name="LocalBackupJob_verifying_signal_backup">Verifying Molly backup…</string>
     <string name="LocalBackupJobApi29_backup_failed">Backup failed</string>
     <string name="LocalBackupJobApi29_your_backup_directory_has_been_deleted_or_moved">Your backup directory has been deleted or moved.</string>
     <string name="LocalBackupJobApi29_your_backup_file_is_too_large">Your backup file is too large to store on this volume.</string>
@@ -3884,15 +3953,15 @@
     <string name="RegistrationActivity_call_me_instead_available_in">Call 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">Resend Code (%1$02d:%2$02d)</string>
-    <string name="RegistrationActivity_contact_signal_support">Contact Molly Support</string>
-    <string name="RegistrationActivity_code_support_subject">Molly Registration - Verification Code for Android</string>
+    <string mollyify="true" name="RegistrationActivity_contact_signal_support">Contact Molly Support</string>
+    <string mollyify="true" name="RegistrationActivity_code_support_subject">Molly Registration - Verification Code for Android</string>
     <string name="RegistrationActivity_incorrect_code">Incorrect code</string>
     <string name="BackupUtil_never">Never</string>
     <string name="BackupUtil_unknown">Unknown</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">Choose who can see your phone number and who can contact you on Molly with it.</string>
+    <string mollyify="true" name="preferences_app_protection__choose_who_can_see">Choose who can see your phone number and who can contact you on Molly with it.</string>
     <!-- Section title above two radio buttons for enabling and disabling phone number display -->
     <string name="PhoneNumberPrivacySettingsFragment_who_can_see_my_number_heading">Who can see my number</string>
     <!-- Subtext below radio buttons when who can see my number is set to everybody -->
@@ -3940,7 +4009,7 @@
     <string name="RegistrationActivity_you_have_made_too_many_attempts_please_try_again_later">You\'ve made too many attempts. Please try again later.</string>
     <string name="RegistrationActivity_error_connecting_to_service">Error connecting to service</string>
     <string name="preferences_chats__backups">Backups</string>
-    <string name="prompt_passphrase_activity__signal_is_locked">Molly is locked</string>
+    <string mollyify="true" name="prompt_passphrase_activity__signal_is_locked">Molly is locked</string>
     <string name="prompt_passphrase_activity__tap_to_unlock">TAP TO UNLOCK</string>
     <string name="Recipient_unknown">Unknown</string>
     <!-- Name to use for a user across the UI when they are unregistered and have no other name available -->
@@ -3988,19 +4057,19 @@
     <string name="NewDeviceTransferSetup__preparing_to_connect_to_old_android_device">Preparing to connect to old Android 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">Molly needs the location permission to discover and connect to your old Android device.</string>
-    <string name="NewDeviceTransferSetup__signal_needs_location_services_enabled_to_discover_and_connect_with_your_old_device">Molly needs location services enabled to discover and connect with your old Android device.</string>
-    <string name="NewDeviceTransferSetup__signal_needs_wifi_on_to_discover_and_connect_with_your_old_device">Molly needs Wi-Fi on to discover and connect with your old Android device. Wi-Fi needs to be on but it does not have to be connected to a Wi-Fi network.</string>
-    <string name="NewDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">Sorry, it appears this device does not support Wi-Fi Direct. Molly uses Wi-Fi Direct to discover and connect with your old Android device. You can still restore a backup to restore your account from your old Android device.</string>
+    <string mollyify="true" name="NewDeviceTransferSetup__signal_needs_the_location_permission_to_discover_and_connect_with_your_old_device">Molly needs the location permission to discover and connect to your old Android device.</string>
+    <string mollyify="true" name="NewDeviceTransferSetup__signal_needs_location_services_enabled_to_discover_and_connect_with_your_old_device">Molly needs location services enabled to discover and connect with your old Android device.</string>
+    <string mollyify="true" name="NewDeviceTransferSetup__signal_needs_wifi_on_to_discover_and_connect_with_your_old_device">Molly needs Wi-Fi on to discover and connect with your old Android device. Wi-Fi needs to be on but it does not have to be connected to a Wi-Fi network.</string>
+    <string mollyify="true" name="NewDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">Sorry, it appears this device does not support Wi-Fi Direct. Molly uses Wi-Fi Direct to discover and connect with your old Android device. You can still restore a backup to restore your account from your old Android device.</string>
     <string name="NewDeviceTransferSetup__restore_a_backup">Restore a 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">Molly needs the location permission to discover and connect to your new Android device.</string>
-    <string name="OldDeviceTransferSetup__signal_needs_location_services_enabled_to_discover_and_connect_with_your_new_device">Molly needs location services enabled to discover and connect with your new Android device.</string>
-    <string name="OldDeviceTransferSetup__signal_needs_wifi_on_to_discover_and_connect_with_your_new_device">Molly needs Wi-Fi on to discover and connect with your new Android device. Wi-Fi needs to be on but it does not have to be connected to a Wi-Fi network.</string>
-    <string name="OldDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">Sorry, it appears this device does not support Wi-Fi Direct. Molly uses Wi-Fi Direct to discover and connect with your new Android device. You can still create a backup to restore your account on your new Android device.</string>
+    <string mollyify="true" name="OldDeviceTransferSetup__signal_needs_the_location_permission_to_discover_and_connect_with_your_new_device">Molly needs the location permission to discover and connect to your new Android device.</string>
+    <string mollyify="true" name="OldDeviceTransferSetup__signal_needs_location_services_enabled_to_discover_and_connect_with_your_new_device">Molly needs location services enabled to discover and connect with your new Android device.</string>
+    <string mollyify="true" name="OldDeviceTransferSetup__signal_needs_wifi_on_to_discover_and_connect_with_your_new_device">Molly needs Wi-Fi on to discover and connect with your new Android device. Wi-Fi needs to be on but it does not have to be connected to a Wi-Fi network.</string>
+    <string mollyify="true" name="OldDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">Sorry, it appears this device does not support Wi-Fi Direct. Molly uses Wi-Fi Direct to discover and connect with your new Android device. You can still create a backup to restore your account on your new Android device.</string>
     <string name="OldDeviceTransferSetup__create_a_backup">Create a 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>
 
@@ -4041,7 +4110,7 @@
 
     <!-- DeviceTransferFragment -->
     <string name="DeviceTransfer__transferring_data">Transferring data</string>
-    <string name="DeviceTransfer__keep_both_devices_near_each_other">Keep both devices near each other. Do not turn off the devices and keep Molly open. Transfers are end-to-end encrypted.</string>
+    <string mollyify="true" name="DeviceTransfer__keep_both_devices_near_each_other">Keep both devices near each other. Do not turn off the devices and keep Molly open. Transfers are 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>
@@ -4055,7 +4124,7 @@
     <!-- OldDeviceTransferInstructionsFragment -->
     <string name="OldDeviceTransferInstructions__transfer_account">Transfer Account</string>
     <string name="OldDeviceTransferInstructions__first_bullet">1.</string>
-    <string name="OldDeviceTransferInstructions__download_signal_on_your_new_android_device">Download Molly on your new Android device</string>
+    <string mollyify="true" name="OldDeviceTransferInstructions__download_signal_on_your_new_android_device">Download Molly on your new Android device</string>
     <string name="OldDeviceTransferInstructions__second_bullet">2.</string>
     <string name="OldDeviceTransferInstructions__tap_on_transfer_or_restore_account">Tap on "Transfer or restore account"</string>
     <string name="OldDeviceTransferInstructions__third_bullet">3.</string>
@@ -4113,6 +4182,7 @@
     <string name="RecipientBottomSheet_copied_to_clipboard">Copied to clipboard</string>
 
     <string name="GroupRecipientListItem_admin">Admin</string>
+    <!-- Button text to approve a user that has requested to join a group -->
     <string name="GroupRecipientListItem_approve_description">Approve</string>
     <string name="GroupRecipientListItem_deny_description">Deny</string>
 
@@ -4128,7 +4198,7 @@
     <!-- GroupLinkBottomSheetDialogFragment -->
     <string name="GroupLinkBottomSheet_share_hint_requiring_approval">Anyone with this link can view the group\'s name and photo and request to join. Share it with people you trust.</string>
     <string name="GroupLinkBottomSheet_share_hint_not_requiring_approval">Anyone with this link can view the group\'s name and photo and join the group. Share it with people you trust.</string>
-    <string name="GroupLinkBottomSheet_share_via_signal">Share via Molly</string>
+    <string mollyify="true" name="GroupLinkBottomSheet_share_via_signal">Share via Molly</string>
     <string name="GroupLinkBottomSheet_copy">Copy</string>
     <string name="GroupLinkBottomSheet_qr_code">QR Code</string>
     <string name="GroupLinkBottomSheet_share">Share</string>
@@ -4140,6 +4210,7 @@
 
     <!-- VoiceNoteMediaDescriptionCompatFactory -->
     <string name="VoiceNoteMediaItemFactory__voice_message">Voice message &#183; %1$s</string>
+    <!-- This is a title in a banner describing the conversation sender to receiver placeholders of the currently playing voice memo. -->
     <string name="VoiceNoteMediaItemFactory__s_to_s">%1$s to %2$s</string>
 
     <!-- StorageUtil -->
@@ -4153,8 +4224,16 @@
     <string name="ReviewCardDialogFragment__review_members">Review members</string>
     <!-- Title of a screen where the user will be prompted to review a message request matching the name of someone they already know -->
     <string name="ReviewCardDialogFragment__review_request">Review request</string>
-    <string name="ReviewCardDialogFragment__d_group_members_have_the_same_name">%1$d group members have the same name, review the members below and choose to take action.</string>
-    <string name="ReviewCardDialogFragment__if_youre_not_sure">If you\'re not sure who the request is from, review the contacts below and take action.</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="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 -->
+    <plurals name="ReviewCardDialogFragment__if_youre_not_sure">
+        <item quantity="one">If you\'re not sure who the request is from, review the contact below and take action.</item>
+        <item quantity="other">If you\'re not sure who the request is from, review the contacts below and take action.</item>
+    </plurals>
     <string name="ReviewCardDialogFragment__no_other_groups_in_common">No other groups in common.</string>
     <string name="ReviewCardDialogFragment__no_groups_in_common">No groups in common.</string>
     <plurals name="ReviewCardDialogFragment__d_other_groups_in_common">
@@ -4185,11 +4264,20 @@
     <string name="CallParticipantsListUpdatePopupWindow__s_joined">%1$s joined</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_and_s_joined">%1$s and %2$s joined</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_s_and_s_joined">%1$s, %2$s and %3$s joined</string>
-    <string name="CallParticipantsListUpdatePopupWindow__s_s_and_d_others_joined">%1$s, %2$s and %3$d others joined</string>
+    <!-- Toast message shown in group call when 3 or more people join -->
+    <plurals name="CallParticipantsListUpdatePopupWindow__s_s_and_d_others_joined">
+        <item quantity="one">%1$s, %2$s and %3$d other joined</item>
+        <item quantity="other">%1$s, %2$s and %3$d others joined</item>
+    </plurals>
+    <!-- Toast/popup text shown when someone leaves a group call -->
     <string name="CallParticipantsListUpdatePopupWindow__s_left">%1$s left</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_and_s_left">%1$s and %2$s left</string>
     <string name="CallParticipantsListUpdatePopupWindow__s_s_and_s_left">%1$s, %2$s and %3$s left</string>
-    <string name="CallParticipantsListUpdatePopupWindow__s_s_and_d_others_left">%1$s, %2$s and %3$d others left</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 and %3$d other left</item>
+        <item quantity="other">%1$s, %2$s and %3$d others left</item>
+    </plurals>
 
     <string name="CallParticipant__you">You</string>
     <string name="CallParticipant__you_on_another_device">You (on another device)</string>
@@ -4296,7 +4384,7 @@
     <string name="payment_info_card_about_mobilecoin">About MobileCoin</string>
     <string name="payment_info_card_mobilecoin_is_a_new_privacy_focused_digital_currency">MobileCoin is a new 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">You can add funds for use in Molly by sending MobileCoin to your wallet address.</string>
+    <string mollyify="true" 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">Hide this card?</string>
@@ -4317,12 +4405,12 @@
     <!-- DeactivateWalletFragment -->
     <string name="DeactivateWalletFragment__deactivate_wallet">Deactivate Wallet</string>
     <string name="DeactivateWalletFragment__your_balance">Your balance</string>
-    <string name="DeactivateWalletFragment__its_recommended_that_you">It\'s recommended that you transfer your funds to another wallet address before deactivating payments. If you choose not to transfer your funds now, they will remain in your wallet linked to Molly if you reactivate payments.</string>
+    <string mollyify="true" name="DeactivateWalletFragment__its_recommended_that_you">It\'s recommended that you transfer your funds to another wallet address before deactivating payments. If you choose not to transfer your funds now, they will remain in your wallet linked to Molly if you reactivate payments.</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">Deactivate</string>
     <string name="DeactivateWalletFragment__deactivate_without_transferring_question">Deactivate without transferring?</string>
-    <string name="DeactivateWalletFragment__your_balance_will_remain">Your balance will remain in your wallet linked to Molly if you choose to reactivate payments.</string>
+    <string mollyify="true" name="DeactivateWalletFragment__your_balance_will_remain">Your balance will remain in your wallet linked to Molly if you choose to reactivate payments.</string>
     <string name="DeactivateWalletFragment__error_deactivating_wallet">Error deactivating wallet.</string>
     <string name="DeactivateWalletFragment__learn_more__we_recommend_transferring_your_funds" translatable="false">https://support.signal.org/hc/articles/360057625692#payments_deactivate</string>
 
@@ -4559,10 +4647,15 @@
 
     <!-- PrivacySettingsFragment -->
     <string name="PrivacySettingsFragment__blocked">Blocked</string>
-    <string name="PrivacySettingsFragment__d_contacts">%1$d contacts</string>
+    <!-- Settings label that shows the number blocked contacts -->
+    <plurals name="PrivacySettingsFragment__d_contacts">
+        <item quantity="one">%1$d contact</item>
+        <item quantity="other">%1$d contacts</item>
+    </plurals>
     <string name="PrivacySettingsFragment__messaging">Messaging</string>
     <string name="PrivacySettingsFragment__disappearing_messages">Disappearing messages</string>
     <string name="PrivacySettingsFragment__app_security">App security</string>
+    <!-- This refers to the multi-tasking overview (recent apps) from the Android operating system.-->
     <string name="PrivacySettingsFragment__block_screenshots_in_the_recents_list_and_inside_the_app">Block screenshots in the recents list and inside the app</string>
     <string name="PrivacySettingsFragment__signal_message_and_calls">Signal messages and calls, always relay calls, and sealed sender</string>
     <string name="PrivacySettingsFragment__default_timer_for_new_changes">Default timer for new chats</string>
@@ -4612,18 +4705,21 @@
     <!--    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">Terms &amp; Privacy Policy</string>
-    <string name="HelpFragment__copyright_signal_messenger">Copyright Molly Messenger</string>
+    <string mollyify="true" name="HelpFragment__copyright_signal_messenger">Copyright Molly Messenger</string>
     <string name="HelpFragment__licenced_under_the_agplv3">Licensed under the GNU AGPLv3</string>
 
     <!-- DataAndStorageSettingsFragment -->
     <string name="DataAndStorageSettingsFragment__media_quality">Media quality</string>
     <string name="DataAndStorageSettingsFragment__sent_media_quality">Sent media quality</string>
     <string name="DataAndStorageSettingsFragment__sending_high_quality_media_will_use_more_data">Sending high quality media will use more data.</string>
+    <!-- Setting option that can be selected to default media to be sent as high quality by default -->
     <string name="DataAndStorageSettingsFragment__high">High</string>
+    <!-- Setting option that can be selected to default media to be sent as standard quality by default -->
     <string name="DataAndStorageSettingsFragment__standard">Standard</string>
     <string name="DataAndStorageSettingsFragment__calls">Calls</string>
 
     <!-- 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__use_custom_colors">Use custom colors</string>
     <string name="ChatColorSelectionFragment__chat_color">Chat color</string>
@@ -4835,6 +4931,7 @@
     <string name="AvatarPickerFragment__take_a_picture">Take a picture</string>
     <string name="AvatarPickerFragment__choose_a_photo">Choose a photo</string>
     <string name="AvatarPickerFragment__photo">Photo</string>
+    <!-- Button label during avatar selection/creation that when tapped lets you generate an avatar from typed in text. -->
     <string name="AvatarPickerFragment__text">Text</string>
     <string name="AvatarPickerFragment__save">Save</string>
     <string name="AvatarPickerFragment__clear_avatar">Clear avatar</string>
@@ -4895,7 +4992,7 @@
     <string name="MediaReviewFragment__add_a_message">Add a message</string>
     <string name="MediaReviewFragment__add_a_reply">Add a reply</string>
     <string name="MediaReviewFragment__send_to">Send to</string>
-    <string name="MediaReviewFragment__view_once_message">View once message</string>
+    <string name="MediaReviewFragment__view_once_message">View once media</string>
     <string name="MediaReviewFragment__one_or_more_items_were_too_large">One or more items were too large</string>
     <string name="MediaReviewFragment__one_or_more_items_were_invalid">One or more items were invalid</string>
     <string name="MediaReviewFragment__too_many_items_selected">Too many items selected</string>
@@ -5062,9 +5159,9 @@
     <string name="MySupportPreference__learn_more">Learn more</string>
 
     <!-- Title of dialog telling user they need to update signal as it expired -->
-    <string name="UpdateSignalExpiredDialog__title">Update Molly</string>
+    <string mollyify="true" name="UpdateSignalExpiredDialog__title">Update Molly</string>
     <!-- Message of dialog telling user they need to update signal as it expired -->
-    <string name="UpdateSignalExpiredDialog__message">This version of Molly has expired. Update now to continue using Molly.</string>
+    <string mollyify="true" name="UpdateSignalExpiredDialog__message">This version of Molly has expired. Update now to continue using Molly.</string>
     <!-- Button text of expiration dialog, will take user to update the app -->
     <string name="UpdateSignalExpiredDialog__update_action">Update</string>
     <!-- Button text of expiration dialog to cancel the dialog.  -->
@@ -5073,7 +5170,7 @@
     <!-- Title of dialog telling user they need to re-register signal -->
     <string name="ReregisterSignalDialog__title">Device not registered</string>
     <!-- Message of dialog telling user they need to re-register signal as it is no longer registered -->
-    <string name="ReregisterSignalDialog__message">This device is no longer registered. Re-register to continue using Molly on this device.</string>
+    <string mollyify="true" name="ReregisterSignalDialog__message">This device is no longer registered. Re-register to continue using Molly on this device.</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.  -->
@@ -5367,7 +5464,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">To enable notifications, Molly needs permission to display them.</string>
+    <string mollyify="true" name="NotificationSettingsFragment__to_enable_notifications">To enable notifications, Molly needs permission to display them.</string>
     <!-- Banner action when notification permission is disabled -->
     <string name="NotificationSettingsFragment__turn_on">Turn on</string>
 
@@ -5488,7 +5585,7 @@
     <string name="StoryViewerFragment__s_s">%1$s %2$s</string>
     <!-- Displayed when viewing a post you sent -->
     <string name="StoryViewerPageFragment__you">You</string>
-    <!-- Displayed when viewing a post displayed to a group -->
+    <!-- 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 to %2$s</string>
     <!-- Displayed when viewing a post from another user with no replies -->
     <string name="StoryViewerPageFragment__reply">Reply</string>
@@ -6705,5 +6802,26 @@
     <!-- Content description for opening the note editor -->
     <string name="ViewNoteSheet__edit_note">Edit note</string>
 
+    <!-- BackupProgressService -->
+    <!-- Notification title shown while backup restore job is running -->
+    <string name="BackupProgressService_title">Restoring backup…</string>
+    <!-- Notification title shown while downloading backup restore data -->
+    <string name="BackupProgressService_title_downloading">Downloading backup data…</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>
+    <!-- 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 -->
+    <string name="BackupsTypeSettingsFragment__google_pay">Google Pay</string>
+    <!-- Displayed as the user\'s payment method as a label in a preference row -->
+    <string name="BackupsTypeSettingsFragment__bank_transfer">Bank transfer</string>
+    <!-- Displayed as the user\'s payment method as a label in a preference row -->
+    <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>
+
+
     <!-- EOF -->
 </resources>
diff --git a/app/src/test/java/org/thoughtcrime/securesms/backup/v2/stream/EncryptedBackupReaderWriterTest.kt b/app/src/test/java/org/thoughtcrime/securesms/backup/v2/stream/EncryptedBackupReaderWriterTest.kt
index 12198e7e43..f9849b3b61 100644
--- a/app/src/test/java/org/thoughtcrime/securesms/backup/v2/stream/EncryptedBackupReaderWriterTest.kt
+++ b/app/src/test/java/org/thoughtcrime/securesms/backup/v2/stream/EncryptedBackupReaderWriterTest.kt
@@ -7,6 +7,8 @@ package org.thoughtcrime.securesms.backup.v2.stream
 
 import org.junit.Assert.assertEquals
 import org.junit.Test
+import org.signal.core.util.Base64
+import org.signal.core.util.Hex
 import org.thoughtcrime.securesms.backup.v2.proto.AccountData
 import org.thoughtcrime.securesms.backup.v2.proto.BackupInfo
 import org.thoughtcrime.securesms.backup.v2.proto.Frame
@@ -27,13 +29,15 @@ class EncryptedBackupReaderWriterTest {
 
     val frameCount = 10_000
     EncryptedBackupWriter(key, aci, outputStream, append = { outputStream.write(it) }).use { writer ->
-      writer.write(BackupInfo(1, 1000L))
+      writer.write(BackupInfo(version = 1, backupTimeMs = 1000L))
+
       for (i in 0 until frameCount) {
         writer.write(Frame(account = AccountData(username = "username-$i")))
       }
     }
 
     val ciphertext: ByteArray = outputStream.toByteArray()
+    println(ciphertext.size)
 
     val frames: List<Frame> = EncryptedBackupReader(key, aci, ciphertext.size.toLong()) { ciphertext.inputStream() }.use { reader ->
       assertEquals(reader.backupInfo?.version, 1L)
@@ -47,4 +51,51 @@ class EncryptedBackupReaderWriterTest {
       assertEquals("username-$i", frames[i].account?.username)
     }
   }
+
+  @Test
+  fun `padding limits number of sizes`() {
+    val key = BackupKey(Util.getSecretBytes(32))
+    val aci = ACI.from(UUID.randomUUID())
+
+    val uniqueSizes = (1..10)
+      .map { frameCount ->
+        val outputStream = ByteArrayOutputStream()
+
+        EncryptedBackupWriter(key, aci, outputStream, append = { outputStream.write(it) }).use { writer ->
+          writer.write(BackupInfo(version = 1, backupTimeMs = 1000L))
+
+          for (i in 0 until frameCount) {
+            writer.write(Frame(account = AccountData(username = Hex.toStringCondensed(Util.getSecretBytes(32)))))
+          }
+        }
+
+        outputStream.toByteArray().size
+      }
+      .toSet()
+
+    assertEquals(1, uniqueSizes.size)
+  }
+
+  @Test
+  fun `using a different IV every time`() {
+    val key = BackupKey(Util.getSecretBytes(32))
+    val aci = ACI.from(UUID.randomUUID())
+    val count = 10
+
+    val uniqueOutputs = (0 until count)
+      .map {
+        val outputStream = ByteArrayOutputStream()
+
+        EncryptedBackupWriter(key, aci, outputStream, append = { outputStream.write(it) }).use { writer ->
+          writer.write(BackupInfo(version = 1, backupTimeMs = 1000L))
+          writer.write(Frame(account = AccountData(username = "static-data")))
+        }
+
+        outputStream.toByteArray()
+      }
+      .map { Base64.encodeWithPadding(it) }
+      .toSet()
+
+    assertEquals(count, uniqueOutputs.size)
+  }
 }
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 112252c364..936249f922 100644
--- a/app/src/test/java/org/thoughtcrime/securesms/dependencies/MockApplicationDependencyProvider.java
+++ b/app/src/test/java/org/thoughtcrime/securesms/dependencies/MockApplicationDependencyProvider.java
@@ -3,7 +3,6 @@
 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;
@@ -43,6 +42,7 @@
 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;
 
@@ -181,7 +181,7 @@ public class MockApplicationDependencyProvider implements ApplicationDependencie
   }
 
   @Override
-  public @NonNull SignalWebSocket provideSignalWebSocket(@NonNull Supplier<SignalServiceConfiguration> signalServiceConfigurationSupplier) {
+  public @NonNull SignalWebSocket provideSignalWebSocket(@NonNull Supplier<SignalServiceConfiguration> signalServiceConfigurationSupplier, @NonNull Supplier<LibSignalNetwork> libSignalNetworkSupplier) {
     return null;
   }
 
@@ -235,7 +235,7 @@ public class MockApplicationDependencyProvider implements ApplicationDependencie
   }
 
   @Override
-  public @NonNull Network provideLibsignalNetwork() {
+  public @NonNull LibSignalNetwork provideLibsignalNetwork(@NonNull SignalServiceConfiguration config) {
     return null;
   }
 }
diff --git a/app/src/test/java/org/thoughtcrime/securesms/keyvalue/KeyValueDataSetTest.java b/app/src/test/java/org/thoughtcrime/securesms/keyvalue/KeyValueDataSetTest.java
index b3e72ce1ee..fe51dc564d 100644
--- a/app/src/test/java/org/thoughtcrime/securesms/keyvalue/KeyValueDataSetTest.java
+++ b/app/src/test/java/org/thoughtcrime/securesms/keyvalue/KeyValueDataSetTest.java
@@ -121,14 +121,6 @@ public void getInteger_positive() {
     assertEquals(Integer.class, subject.getType("key"));
   }
 
-  @Test(expected = IllegalArgumentException.class)
-  public void getInteger_negative() {
-    KeyValueDataSet subject = new KeyValueDataSet();
-    subject.putInteger("key", 1);
-
-    subject.getLong("key", 0);
-  }
-
   @Test
   public void getInteger_default() {
     KeyValueDataSet subject = new KeyValueDataSet();
@@ -144,17 +136,30 @@ public void getLong_positive() {
     assertEquals(Long.class, subject.getType("key"));
   }
 
-  @Test(expected = IllegalArgumentException.class)
-  public void getLong_negative() {
+  @Test
+  public void getLong_default() {
     KeyValueDataSet subject = new KeyValueDataSet();
-    subject.putLong("key", 1L);
+    assertEquals(1, subject.getLong("key", 1));
+  }
 
-    subject.getInteger("key", 0);
+  @Test
+  public void getInteger_storedAsLong() {
+    KeyValueDataSet subject = new KeyValueDataSet();
+    subject.putLong("key", 1);
+    assertEquals(1, subject.getInteger("key", 1));
+  }
+
+  @Test(expected = ArithmeticException.class)
+  public void getInteger_storedAsLongAndTooLargeForInt() {
+    KeyValueDataSet subject = new KeyValueDataSet();
+    subject.putLong("key", Long.MAX_VALUE);
+    subject.getInteger("key", 1);
   }
 
   @Test
-  public void getLong_default() {
+  public void getLong_storedAsInt() {
     KeyValueDataSet subject = new KeyValueDataSet();
+    subject.putInteger("key", 1);
     assertEquals(1, subject.getLong("key", 1));
   }
 
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 c2614d0547..2f78a5272f 100644
--- a/app/src/test/java/org/thoughtcrime/securesms/sms/UploadDependencyGraphTest.kt
+++ b/app/src/test/java/org/thoughtcrime/securesms/sms/UploadDependencyGraphTest.kt
@@ -236,7 +236,7 @@ class UploadDependencyGraphTest {
       transferProgress = AttachmentTable.TRANSFER_PROGRESS_PENDING,
       size = attachment.size,
       fileName = attachment.fileName,
-      cdnNumber = attachment.cdnNumber,
+      cdn = attachment.cdn,
       location = attachment.remoteLocation,
       key = attachment.remoteKey,
       digest = attachment.remoteDigest,
@@ -256,7 +256,10 @@ class UploadDependencyGraphTest {
       transformProperties = attachment.transformProperties,
       displayOrder = 0,
       uploadTimestamp = attachment.uploadTimestamp,
-      dataHash = null
+      dataHash = null,
+      archiveMediaId = null,
+      archiveMediaName = null,
+      archiveCdn = 0
     )
   }
 
diff --git a/app/src/testShared/org/thoughtcrime/securesms/database/FakeMessageRecords.kt b/app/src/testShared/org/thoughtcrime/securesms/database/FakeMessageRecords.kt
index ebaeba6e9b..a3597070c8 100644
--- a/app/src/testShared/org/thoughtcrime/securesms/database/FakeMessageRecords.kt
+++ b/app/src/testShared/org/thoughtcrime/securesms/database/FakeMessageRecords.kt
@@ -1,6 +1,7 @@
 package org.thoughtcrime.securesms.database
 
 import org.thoughtcrime.securesms.attachments.AttachmentId
+import org.thoughtcrime.securesms.attachments.Cdn
 import org.thoughtcrime.securesms.attachments.DatabaseAttachment
 import org.thoughtcrime.securesms.audio.AudioHash
 import org.thoughtcrime.securesms.blurhash.BlurHash
@@ -35,7 +36,7 @@ object FakeMessageRecords {
     transferProgress: Int = AttachmentTable.TRANSFER_PROGRESS_DONE,
     size: Long = 0L,
     fileName: String = "",
-    cdnNumber: Int = 1,
+    cdnNumber: Int = 3,
     location: String = "",
     key: String = "",
     relay: String = "",
@@ -56,7 +57,10 @@ object FakeMessageRecords {
     transformProperties: AttachmentTable.TransformProperties? = null,
     displayOrder: Int = 0,
     uploadTimestamp: Long = 200,
-    dataHash: String? = null
+    dataHash: String? = null,
+    archiveCdn: Int = 0,
+    archiveMediaName: String? = null,
+    archiveMediaId: String? = null
   ): DatabaseAttachment {
     return DatabaseAttachment(
       attachmentId,
@@ -67,7 +71,7 @@ object FakeMessageRecords {
       transferProgress,
       size,
       fileName,
-      cdnNumber,
+      Cdn.fromCdnNumber(cdnNumber),
       location,
       key,
       digest,
@@ -87,7 +91,10 @@ object FakeMessageRecords {
       transformProperties,
       displayOrder,
       uploadTimestamp,
-      dataHash
+      dataHash,
+      archiveCdn,
+      archiveMediaId,
+      archiveMediaName
     )
   }
 
diff --git a/build-logic/plugins/src/main/java/molly.gradle.kts b/build-logic/plugins/src/main/java/molly.gradle.kts
new file mode 100644
index 0000000000..0a048f1f77
--- /dev/null
+++ b/build-logic/plugins/src/main/java/molly.gradle.kts
@@ -0,0 +1,78 @@
+import org.w3c.dom.Document
+import org.w3c.dom.Element
+import javax.xml.parsers.DocumentBuilderFactory
+import javax.xml.transform.OutputKeys
+import javax.xml.transform.TransformerFactory
+import javax.xml.transform.dom.DOMSource
+import javax.xml.transform.stream.StreamResult
+
+/**
+ * Utility object for parsing and manipulating strings.xml files.
+ */
+object StringsXmlParser {
+  fun parse(stringsFile: File): Pair<Document, List<Element>> {
+    val docBuilder = DocumentBuilderFactory.newInstance().newDocumentBuilder()
+    val doc = docBuilder.parse(stringsFile).apply {
+      xmlStandalone = true
+    }
+    return doc to doc.getStringElements()
+  }
+
+  fun writeToFile(doc: Document, file: File) {
+    val transformer = TransformerFactory.newInstance().newTransformer()
+    transformer.transform(DOMSource(doc), StreamResult(file))
+  }
+
+  private fun Document.getStringElements() =
+    getElementsByTagName("string").let { nodeList ->
+      (0 until nodeList.length).map { nodeList.item(it) as Element }
+    }
+}
+
+val updateTranslationsForMolly by tasks.registering {
+  group = "Molly"
+  description = "Updates references to \"Signal\" with \"Molly\" in all translation files."
+
+  doLast {
+    val englishFile = file("src/main/res/values/strings.xml")
+    val (_, englishStrings) = StringsXmlParser.parse(englishFile)
+
+    // Gather all string names containing "mollyify" attribute
+    val mollyStringNames = englishStrings
+      .filter { it.getAttribute("mollyify") == "true" }
+      .map { it.getAttribute("name") }
+      .toSet()
+
+    // Iterate through each translation file and perform the replacements
+    project.fileTree("src/main/res").matching {
+      include("**/values-*/strings.xml")
+    }.forEach { translationFile ->
+      try {
+        val (translationDoc, translatedStrings) = StringsXmlParser.parse(translationFile)
+        var modified = false
+
+        translatedStrings.forEach { translatedString ->
+          with(translatedString) {
+            val stringName = getAttribute("name")
+            if (stringName in mollyStringNames) {
+              val oldContent = textContent
+              textContent = textContent
+                .replace("Signal", "Molly")
+                .replace("signal.org", "molly.im")
+              if (oldContent != textContent) {
+                modified = true
+              }
+            }
+          }
+        }
+        if (modified) {
+          // Write back the modified translation file only if replacements were made
+          StringsXmlParser.writeToFile(translationDoc, translationFile)
+          logger.lifecycle("Updated translations in: ${translationFile.path}")
+        }
+      } catch (e: Exception) {
+        logger.error("Error processing file: ${translationFile.path}, ${e.message}")
+      }
+    }
+  }
+}
diff --git a/build-logic/plugins/src/main/java/translations.gradle b/build-logic/plugins/src/main/java/translations.gradle
deleted file mode 100644
index 06a3658ebb..0000000000
--- a/build-logic/plugins/src/main/java/translations.gradle
+++ /dev/null
@@ -1,128 +0,0 @@
-import groovy.io.FileType
-import groovy.transform.stc.ClosureParams
-import groovy.transform.stc.SimpleType
-import org.signal.buildtools.StaticIpResolver
-
-def allStringsResourceFiles(@ClosureParams(value = SimpleType.class, options = ['java.io.File']) Closure c) {
-    file('src/main/res').eachFileRecurse(FileType.FILES) { f ->
-        if (f.name == 'strings.xml') {
-            c(f)
-        }
-    }
-}
-
-task replaceEllipsis {
-    group 'Static Files'
-    description 'Process strings for ellipsis characters.'
-    doLast {
-        allStringsResourceFiles { f ->
-            def before = f.text
-            def after = f.text.replace('...', '…')
-            if (before != after) {
-                f.text = after
-                logger.info("$f.parentFile.name/$f.name...updated")
-            }
-        }
-    }
-}
-
-task cleanApostropheErrors {
-    group 'Static Files'
-    description 'Fix transifex apostrophe string errors.'
-    doLast {
-        allStringsResourceFiles { f ->
-            def before = f.text
-            def after = before.replaceAll(/([^\\=08])(')/, '$1\\\\\'')
-            if (before != after) {
-                f.text = after
-                logger.info("$f.parentFile.name/$f.name...updated")
-            }
-        }
-    }
-}
-
-task excludeNonTranslatables {
-    group 'Static Files'
-    description 'Remove strings that are marked "translatable"="false" or are ExtraTranslations.'
-    doLast {
-        def englishFile = file('src/main/res/values/strings.xml')
-
-        def english = new XmlParser().parse(englishFile)
-        def nonTranslatable = english
-                .findAll { it['@translatable'] == 'false' }
-                .collect { it['@name'] }
-                .toSet()
-        def all = english.collect { it['@name'] }.toSet()
-        def translatable = all - nonTranslatable
-        def inMultiline = false
-        def endBlockName = ""
-
-        allStringsResourceFiles { f ->
-            if (f != englishFile) {
-                def newLines = f.readLines()
-                        .collect { line ->
-                            if (!inMultiline) {
-                                def singleLineMatcher = line =~ /name="([^"]*)".*(<\/|\/>)/
-                                if (singleLineMatcher.find()) {
-                                    def name = singleLineMatcher.group(1)
-                                    if (!line.contains('excludeNonTranslatables') && !translatable.contains(name)) {
-                                        return "  <!-- Removed by excludeNonTranslatables ${line.trim()} -->"
-                                    }
-                                } else {
-                                    def multilineStartMatcher = line =~ /<(.*) .?name="([^"]*)".*/
-                                    if (multilineStartMatcher.find()) {
-                                        endBlockName = multilineStartMatcher.group(1)
-                                        def name = multilineStartMatcher.group(2)
-                                        if (!line.contains('excludeNonTranslatables') && !translatable.contains(name)) {
-                                            inMultiline = true;
-                                            return "  <!-- Removed by excludeNonTranslatables ${line.trim()}"
-                                        }
-                                    }
-                                }
-                            } else {
-                                def multilineEndMatcher = line =~ /<\/${endBlockName}/
-                                if (multilineEndMatcher.find()) {
-                                    inMultiline = false
-                                    return "${line} -->"
-                                }
-                            }
-
-                            return line
-                        }
-
-                f.write(newLines.join("\n") + "\n")
-            }
-        }
-    }
-}
-
-task postTranslateQa {
-    group 'Static Files'
-    description 'Runs QA to check validity of updated strings, and ensure presence of any new languages in internal lists.'
-    dependsOn ':qa'
-}
-
-task resolveStaticIps {
-    group 'Static Files'
-    description 'Fetches static IPs for core hosts and writes them to static-ips.gradle'
-    doLast {
-        def staticIpResolver = new StaticIpResolver()
-        new File(projectDir, "static-ips.gradle.kts").text = """
-            rootProject.extra["service_ips"] = \"\"\"${staticIpResolver.resolveToBuildConfig("chat.signal.org")}\"\"\"
-            rootProject.extra["storage_ips"] = \"\"\"${staticIpResolver.resolveToBuildConfig("storage.signal.org")}\"\"\"
-            rootProject.extra["cdn_ips"] = \"\"\"${staticIpResolver.resolveToBuildConfig("cdn.signal.org")}\"\"\"
-            rootProject.extra["cdn2_ips"] = \"\"\"${staticIpResolver.resolveToBuildConfig("cdn2.signal.org")}\"\"\"
-            rootProject.extra["cdn3_ips"] = \"\"\"${staticIpResolver.resolveToBuildConfig("cdn3.signal.org")}\"\"\"
-            rootProject.extra["sfu_ips"] = \"\"\"${staticIpResolver.resolveToBuildConfig("sfu.voip.signal.org")}\"\"\"
-            rootProject.extra["content_proxy_ips"] = \"\"\"${staticIpResolver.resolveToBuildConfig("contentproxy.signal.org")}\"\"\"
-            rootProject.extra["svr2_ips"] = \"\"\"${staticIpResolver.resolveToBuildConfig("svr2.signal.org")}\"\"\"
-            rootProject.extra["cdsi_ips"] = \"\"\"${staticIpResolver.resolveToBuildConfig("cdsi.signal.org")}\"\"\"
-        """.stripIndent().trim() + "\n"
-    }
-}
-
-task updateStaticFilesAndQa {
-    group 'Static Files'
-    description 'Runs tasks to update static files. This includes translations, static IPs, and licenses. Runs QA afterwards to verify all went well. Intended to be run before cutting a release.'
-    dependsOn replaceEllipsis, cleanApostropheErrors, excludeNonTranslatables, resolveStaticIps, postTranslateQa
-}
diff --git a/core-ui/src/main/java/org/signal/core/ui/Icons.kt b/core-ui/src/main/java/org/signal/core/ui/Icons.kt
new file mode 100644
index 0000000000..397871cd41
--- /dev/null
+++ b/core-ui/src/main/java/org/signal/core/ui/Icons.kt
@@ -0,0 +1,57 @@
+/*
+ * Copyright 2024 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.signal.core.ui
+
+import androidx.compose.material3.Icon
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.drawWithCache
+import androidx.compose.ui.graphics.BlendMode
+import androidx.compose.ui.graphics.Brush
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.CompositingStrategy
+import androidx.compose.ui.graphics.graphicsLayer
+import androidx.compose.ui.graphics.painter.Painter
+import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.tooling.preview.Preview
+
+object Icons {
+  /**
+   * Icon that takes a Brush instead of a Color for its foreground
+   */
+  @Composable
+  fun BrushedForeground(
+    painter: Painter,
+    contentDescription: String?,
+    foregroundBrush: Brush,
+    modifier: Modifier = Modifier
+  ) {
+    Icon(
+      painter = painter,
+      contentDescription = contentDescription,
+      modifier = modifier
+        .graphicsLayer { compositingStrategy = CompositingStrategy.Offscreen }
+        .drawWithCache {
+          onDrawWithContent {
+            drawContent()
+            drawRect(foregroundBrush, blendMode = BlendMode.SrcAtop)
+          }
+        }
+    )
+  }
+}
+
+@Preview
+@Composable
+private fun BrushedForegroundPreview() {
+  Previews.Preview {
+    Icons.BrushedForeground(
+      painter = painterResource(id = android.R.drawable.ic_menu_camera),
+      contentDescription = null,
+      foregroundBrush = Brush.linearGradient(listOf(Color.Red, Color.Blue))
+    )
+  }
+}
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 35fd45da4a..bd9368a092 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
@@ -4,6 +4,7 @@ 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.RowScope
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
@@ -22,8 +23,9 @@ import androidx.compose.ui.Alignment.Companion.CenterVertically
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.alpha
 import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.graphics.vector.ImageVector
+import androidx.compose.ui.graphics.painter.Painter
 import androidx.compose.ui.res.dimensionResource
+import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
@@ -110,41 +112,53 @@ object Rows {
     text: String,
     modifier: Modifier = Modifier,
     iconModifier: Modifier = Modifier,
-    icon: ImageVector? = null,
+    icon: Painter? = null,
     foregroundTint: Color = MaterialTheme.colorScheme.onSurface,
     onClick: (() -> Unit)? = null
   ) {
-    if (icon != null) {
-      Row(
-        modifier = modifier
-          .fillMaxWidth()
-          .clickable(enabled = onClick != null, onClick = onClick ?: {})
-          .padding(defaultPadding())
-      ) {
-        Icon(
-          imageVector = icon,
-          contentDescription = null,
-          tint = foregroundTint,
-          modifier = iconModifier
-        )
-
-        Spacer(modifier = Modifier.width(24.dp))
-
+    TextRow(
+      text = {
         Text(
           text = text,
-          modifier = Modifier.weight(1f).align(CenterVertically),
-          color = foregroundTint
+          color = foregroundTint,
+          modifier = Modifier.align(CenterVertically)
         )
+      },
+      icon = if (icon != null) {
+        {
+          Icon(
+            painter = icon,
+            contentDescription = null,
+            tint = foregroundTint,
+            modifier = iconModifier
+          )
+        }
+      } else {
+        null
+      },
+      modifier = modifier,
+      onClick = onClick
+    )
+  }
+
+  @Composable
+  fun TextRow(
+    text: @Composable RowScope.() -> Unit,
+    modifier: Modifier = Modifier,
+    icon: (@Composable RowScope.() -> Unit)? = null,
+    onClick: (() -> Unit)? = null
+  ) {
+    Row(
+      modifier = modifier
+        .fillMaxWidth()
+        .clickable(enabled = onClick != null, onClick = onClick ?: {})
+        .padding(defaultPadding())
+    ) {
+      if (icon != null) {
+        icon()
+        Spacer(modifier = Modifier.width(24.dp))
       }
-    } else {
-      Text(
-        text = text,
-        color = foregroundTint,
-        modifier = modifier
-          .fillMaxWidth()
-          .clickable(enabled = onClick != null, onClick = onClick ?: {})
-          .padding(defaultPadding())
-      )
+      text()
     }
   }
 
@@ -190,11 +204,13 @@ private fun ToggleRowPreview() {
   }
 }
 
-@Preview
+@SignalPreview
 @Composable
 private fun TextRowPreview() {
-  SignalTheme(isDarkMode = false) {
-    Rows.TextRow(text = "TextRow")
-    Rows.TextRow(text = "TextRow")
+  Previews.Preview {
+    Rows.TextRow(
+      text = "TextRow",
+      icon = painterResource(id = android.R.drawable.ic_menu_camera)
+    )
   }
 }
diff --git a/core-ui/src/main/java/org/signal/core/ui/SignalPreview.kt b/core-ui/src/main/java/org/signal/core/ui/SignalPreview.kt
new file mode 100644
index 0000000000..ec457432cd
--- /dev/null
+++ b/core-ui/src/main/java/org/signal/core/ui/SignalPreview.kt
@@ -0,0 +1,17 @@
+/*
+ * Copyright 2024 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.signal.core.ui
+
+import android.content.res.Configuration
+import androidx.compose.ui.tooling.preview.Preview
+
+/**
+ * Our very own preview that will generate light and dark previews for
+ * composables
+ */
+@Preview(uiMode = Configuration.UI_MODE_NIGHT_NO)
+@Preview(uiMode = Configuration.UI_MODE_NIGHT_YES)
+annotation class SignalPreview()
diff --git a/core-util-jvm/src/main/java/org/signal/core/util/logging/Log.kt b/core-util-jvm/src/main/java/org/signal/core/util/logging/Log.kt
index 6bb089be41..fe057e1177 100644
--- a/core-util-jvm/src/main/java/org/signal/core/util/logging/Log.kt
+++ b/core-util-jvm/src/main/java/org/signal/core/util/logging/Log.kt
@@ -5,6 +5,8 @@
 
 package org.signal.core.util.logging
 
+import kotlin.reflect.KClass
+
 object Log {
   private val NOOP_LOGGER: Logger = NoopLogger()
   private var internalCheck: InternalCheck? = null
@@ -135,6 +137,11 @@ object Log {
   @JvmStatic
   fun e(tag: String, message: String?, t: Throwable?, keepLonger: Boolean) = activeLogger.e(tag, redact(message), t, keepLonger)
 
+  @JvmStatic
+  fun tag(clazz: KClass<*>): String {
+    return tag(clazz.java)
+  }
+
   @JvmStatic
   fun tag(clazz: Class<*>): String {
     val simpleName = clazz.simpleName
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 477b0c89ec..6edb4cef4d 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
@@ -6,7 +6,6 @@ import android.database.sqlite.SQLiteDatabase
 import androidx.core.content.contentValuesOf
 import androidx.sqlite.db.SupportSQLiteDatabase
 import androidx.sqlite.db.SupportSQLiteQueryBuilder
-import org.intellij.lang.annotations.Language
 
 /**
  * Begins a transaction on the `this` database, runs the provided [block] providing the `this` value as it's argument
@@ -168,7 +167,7 @@ class SelectBuilderPart2(
   private val columns: Array<String>,
   private val tableName: String
 ) {
-  fun where(@Language("sql") where: String, vararg whereArgs: Any): SelectBuilderPart3 {
+  fun where(where: String, vararg whereArgs: Any): SelectBuilderPart3 {
     return SelectBuilderPart3(db, columns, tableName, where, SqlUtil.buildArgs(*whereArgs))
   }
 
@@ -316,12 +315,12 @@ class UpdateBuilderPart2(
   private val tableName: String,
   private val values: ContentValues
 ) {
-  fun where(@Language("sql") where: String, vararg whereArgs: Any): UpdateBuilderPart3 {
+  fun where(where: String, vararg whereArgs: Any): UpdateBuilderPart3 {
     require(where.isNotBlank())
     return UpdateBuilderPart3(db, tableName, values, where, SqlUtil.buildArgs(*whereArgs))
   }
 
-  fun where(@Language("sql") where: String, whereArgs: Array<String>): UpdateBuilderPart3 {
+  fun where(where: String, whereArgs: Array<String>): UpdateBuilderPart3 {
     require(where.isNotBlank())
     return UpdateBuilderPart3(db, tableName, values, where, whereArgs)
   }
@@ -368,12 +367,12 @@ class DeleteBuilderPart1(
   private val db: SupportSQLiteDatabase,
   private val tableName: String
 ) {
-  fun where(@Language("sql") where: String, vararg whereArgs: Any): DeleteBuilderPart2 {
+  fun where(where: String, vararg whereArgs: Any): DeleteBuilderPart2 {
     require(where.isNotBlank())
     return DeleteBuilderPart2(db, tableName, where, SqlUtil.buildArgs(*whereArgs))
   }
 
-  fun where(@Language("sql") where: String, whereArgs: Array<String>): DeleteBuilderPart2 {
+  fun where(where: String, whereArgs: Array<String>): DeleteBuilderPart2 {
     require(where.isNotBlank())
     return DeleteBuilderPart2(db, tableName, where, whereArgs)
   }
@@ -395,11 +394,11 @@ class ExistsBuilderPart1(
   private val tableName: String
 ) {
 
-  fun where(@Language("sql") where: String, vararg whereArgs: Any): ExistsBuilderPart2 {
+  fun where(where: String, vararg whereArgs: Any): ExistsBuilderPart2 {
     return ExistsBuilderPart2(db, tableName, where, SqlUtil.buildArgs(*whereArgs))
   }
 
-  fun where(@Language("sql") where: String, whereArgs: Array<String>): ExistsBuilderPart2 {
+  fun where(where: String, whereArgs: Array<String>): ExistsBuilderPart2 {
     return ExistsBuilderPart2(db, tableName, where, whereArgs)
   }
 
diff --git a/dependencies.gradle.kts b/dependencies.gradle.kts
index 25e00c2add..6150380274 100644
--- a/dependencies.gradle.kts
+++ b/dependencies.gradle.kts
@@ -15,7 +15,7 @@ dependencyResolutionManagement {
       version("exoplayer", "2.19.0")
       version("glide", "4.15.1")
       version("kotlin", "1.8.10")
-      version("libsignal-client", "0.44.0")
+      version("libsignal-client", "0.45.1")
       version("mp4parser", "1.9.39")
       version("android-gradle-plugin", "8.0.2")
       version("accompanist", "0.28.0")
@@ -118,7 +118,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.39.3-1")
+      library("molly-ringrtc", "im.molly:ringrtc-android:2.41.0-1")
       library("signal-android-database-sqlcipher", "org.signal:sqlcipher-android:4.5.4-S2")
 
       // MOLLY
diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
index a3061eef57..9312a3390e 100644
--- a/gradle/verification-metadata.xml
+++ b/gradle/verification-metadata.xml
@@ -4374,6 +4374,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="968bf930df1d1e971278152499963e4d8b9aefad005174a255a10bf32095121b" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="im.molly" name="ringrtc-android" version="2.41.0-1">
+         <artifact name="ringrtc-android-2.41.0-1.aar">
+            <sha256 value="44c04bd45f6b832815aa564c70c3ea7d1dc334863b63758d94288dd2c167fd25" 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"/>
@@ -6078,28 +6083,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.44.0">
-         <artifact name="libsignal-android-0.44.0.aar">
-            <sha256 value="305c356426fa6a69431dd671ef4d6241139f34471df9a69bc43a5250e404bf23" origin="Generated by Gradle"/>
+      <component group="org.signal" name="libsignal-android" version="0.45.1">
+         <artifact name="libsignal-android-0.45.1.aar">
+            <sha256 value="005de8aff2fe744449bb08942a9bedabcfdfd465bae281833ae5ccb2d11474d2" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="libsignal-android-0.44.0.module">
-            <sha256 value="16a202170f9c152a971a7077034261e0ca96f8351631fbfe1109afb8db8f7c91" origin="Generated by Gradle"/>
+         <artifact name="libsignal-android-0.45.1.module">
+            <sha256 value="b6530251e76b44cb265525ade2fab809887c896a1017d543547eceaca012014b" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.signal" name="libsignal-client" version="0.44.0">
-         <artifact name="libsignal-client-0.44.0.jar">
-            <sha256 value="4a572e1288f1509b898f7080dc52c3f575396ec05ec12e7014a8b52a37f2f434" origin="Generated by Gradle"/>
+      <component group="org.signal" name="libsignal-client" version="0.45.1">
+         <artifact name="libsignal-client-0.45.1.jar">
+            <sha256 value="5395ff43f7364c1300e255284439b9714cee80d6b736c1ef16facb059e371c3a" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="libsignal-client-0.44.0.module">
-            <sha256 value="21ad4954266610b8171e8b146d5be428543427b1466f81749c0c9f52a40e393d" origin="Generated by Gradle"/>
+         <artifact name="libsignal-client-0.45.1.module">
+            <sha256 value="e932f20caa5bc88db92508df3129e1eb60cfd50706ec2e1fe8d06f7340db84e2" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.signal" name="ringrtc-android" version="2.39.3">
-         <artifact name="ringrtc-android-2.39.3.aar">
-            <sha256 value="2d3d1e73e357e8c1a2cf76fc2af61cf0ee786c02b4ccd95b6aa3c134d01adbf1" origin="Generated by Gradle"/>
+      <component group="org.signal" name="ringrtc-android" version="2.41.0">
+         <artifact name="ringrtc-android-2.41.0.aar">
+            <sha256 value="f1973632cef291ecb173bf95a76313c07572a5066a63b9c887b6ade83175120c" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="ringrtc-android-2.39.3.module">
-            <sha256 value="115221c47c1d6f285f8714d3bf6272c6e08fa9ac1a258f418f36c0b859f30e96" origin="Generated by Gradle"/>
+         <artifact name="ringrtc-android-2.41.0.module">
+            <sha256 value="310ba98dc5a055ac24774c0a88628a6f14b6c2128e39c21e65c2806b0c28cf8e" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="org.signal" name="sqlcipher-android" version="4.5.4-S2">
diff --git a/libsignal-service/build.gradle.kts b/libsignal-service/build.gradle.kts
index 726a9a2773..d4f374f1b4 100644
--- a/libsignal-service/build.gradle.kts
+++ b/libsignal-service/build.gradle.kts
@@ -78,6 +78,7 @@ dependencies {
   testImplementation(testLibs.assertj.core)
   testImplementation(testLibs.conscrypt.openjdk.uber)
   testImplementation(testLibs.mockito.core)
+  testImplementation(testLibs.mockk)
 
   testFixturesImplementation(libs.libsignal.client)
   testFixturesImplementation(testLibs.junit.junit)
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 12981b17df..6465bd5f88 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
@@ -6,9 +6,10 @@
 package org.whispersystems.signalservice.api
 
 import org.whispersystems.signalservice.api.push.exceptions.NonSuccessfulResponseCodeException
-import org.whispersystems.signalservice.api.push.exceptions.PushNetworkException
 import java.io.IOException
 
+typealias StatusCodeErrorAction = (NetworkResult.StatusCodeError<*>) -> Unit
+
 /**
  * A helper class that wraps the result of a network request, turning common exceptions
  * into sealed classes, with optional request chaining.
@@ -23,7 +24,9 @@ import java.io.IOException
  * sealed class. However, for the majority of requests which just require getting a model from
  * the success case and the status code of the error, this can be quite convenient.
  */
-sealed class NetworkResult<T> {
+sealed class NetworkResult<T>(
+  private val statusCodeErrorActions: MutableSet<StatusCodeErrorAction> = mutableSetOf()
+) {
   companion object {
     /**
      * A convenience method to capture the common case of making a request.
@@ -33,7 +36,7 @@ sealed class NetworkResult<T> {
     fun <T> fromFetch(fetch: () -> T): NetworkResult<T> = try {
       Success(fetch())
     } catch (e: NonSuccessfulResponseCodeException) {
-      StatusCodeError(e.code, e)
+      StatusCodeError(e.code, e.body, e)
     } catch (e: IOException) {
       NetworkError(e)
     } catch (e: Throwable) {
@@ -45,49 +48,131 @@ sealed class NetworkResult<T> {
   data class Success<T>(val result: T) : NetworkResult<T>()
 
   /** Indicates a generic network error occurred before we were able to process a response. */
-  data class NetworkError<T>(val throwable: Throwable? = null) : 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 throwable: Throwable? = null) : NetworkResult<T>()
+  data class StatusCodeError<T>(val code: Int, val body: String?, val exception: IOException) : NetworkResult<T>()
 
   /** 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>()
 
   /**
    * Returns the result if successful, otherwise turns the result back into an exception and throws it.
+   *
+   * Useful for bridging to Java, where you may want to use try-catch.
    */
   fun successOrThrow(): T {
     when (this) {
       is Success -> return result
-      is NetworkError -> throw throwable ?: PushNetworkException("Network error")
-      is StatusCodeError -> throw throwable ?: NonSuccessfulResponseCodeException(this.code)
+      is NetworkError -> throw exception
+      is StatusCodeError -> throw exception
       is ApplicationError -> throw throwable
     }
   }
 
+  /**
+   * Returns the [Throwable] associated with the result, or null if the result is successful.
+   */
+  fun getCause(): Throwable? {
+    return when (this) {
+      is Success -> null
+      is NetworkError -> exception
+      is StatusCodeError -> exception
+      is ApplicationError -> throwable
+    }
+  }
+
   /**
    * Takes the output of one [NetworkResult] and transforms it into another if the operation is successful.
-   * If it's a failure, the original failure will be propagated. Useful for changing the type of a result.
+   * If it's non-successful, [transform] lambda is not run, and instead the original failure will be propagated.
+   * Useful for changing the type of a result.
+   *
+   * ```kotlin
+   * val user: NetworkResult<LocalUserModel> = NetworkResult
+   *   .fromFetch { fetchRemoteUserModel() }
+   *   .map { it.toLocalUserModel() }
+   * ```
    */
   fun <R> map(transform: (T) -> R): NetworkResult<R> {
     return when (this) {
-      is Success -> Success(transform(this.result))
-      is NetworkError -> NetworkError(throwable)
-      is StatusCodeError -> StatusCodeError(code, throwable)
-      is ApplicationError -> ApplicationError(throwable)
+      is Success -> Success(transform(this.result)).runOnStatusCodeError(statusCodeErrorActions)
+      is NetworkError -> NetworkError<R>(exception).runOnStatusCodeError(statusCodeErrorActions)
+      is ApplicationError -> ApplicationError<R>(throwable).runOnStatusCodeError(statusCodeErrorActions)
+      is StatusCodeError -> StatusCodeError<R>(code, body, exception).runOnStatusCodeError(statusCodeErrorActions)
     }
   }
 
   /**
    * Takes the output of one [NetworkResult] and passes it as the input to another if the operation is successful.
-   * If it's a failure, the original failure will be propagated. Useful for chaining operations together.
+   * If it's non-successful, the [result] lambda is not run, and instead the original failure will be propagated.
+   * Useful for chaining operations together.
+   *
+   * ```kotlin
+   * val networkResult: NetworkResult<MyData> = NetworkResult
+   *   .fromFetch { fetchAuthCredential() }
+   *   .then {
+   *     NetworkResult.fromFetch { credential -> fetchData(credential) }
+   *   }
+   * ```
    */
   fun <R> then(result: (T) -> NetworkResult<R>): NetworkResult<R> {
     return when (this) {
-      is Success -> result(this.result)
-      is NetworkError -> NetworkError(throwable)
-      is StatusCodeError -> StatusCodeError(code, throwable)
-      is ApplicationError -> ApplicationError(throwable)
+      is Success -> result(this.result).runOnStatusCodeError(statusCodeErrorActions)
+      is NetworkError -> NetworkError<R>(exception).runOnStatusCodeError(statusCodeErrorActions)
+      is ApplicationError -> ApplicationError<R>(throwable).runOnStatusCodeError(statusCodeErrorActions)
+      is StatusCodeError -> StatusCodeError<R>(code, body, exception).runOnStatusCodeError(statusCodeErrorActions)
+    }
+  }
+
+  /**
+   * 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.
+   *
+   * ```kotlin
+   * val networkResult: NetworkResult<MyData> = NetworkResult
+   *   .fromFetch { fetchAuthCredential() }
+   *   .runIfSuccessful { storeMyCredential(it) }
+   * ```
+   */
+  fun runIfSuccessful(result: (T) -> Unit): NetworkResult<T> {
+    if (this is Success) {
+      result(this.result)
     }
+    return this
+  }
+
+  /**
+   * Specify an action to be run when a status code error occurs. When a result is a [StatusCodeError] or is transformed into one further down the chain via
+   * a future [map] or [then], this code will be run. There can only ever be a single status code error in a chain, and therefore this lambda will only ever
+   * be run a single time.
+   *
+   * This is a low-visibility way of doing things, so use sparingly.
+   *
+   * ```kotlin
+   * val result = NetworkResult
+   *   .fromFetch { getAuth() }
+   *   .runOnStatusCodeError { error -> logError(error) }
+   *   .then { credential ->
+   *     NetworkResult.fromFetch { fetchUserDetails(credential) }
+   *   }
+   * ```
+   */
+  fun runOnStatusCodeError(action: StatusCodeErrorAction): NetworkResult<T> {
+    return runOnStatusCodeError(setOf(action))
+  }
+
+  internal fun runOnStatusCodeError(actions: Collection<StatusCodeErrorAction>): NetworkResult<T> {
+    if (actions.isEmpty()) {
+      return this
+    }
+
+    statusCodeErrorActions += actions
+
+    if (this is StatusCodeError) {
+      statusCodeErrorActions.forEach { it.invoke(this) }
+      statusCodeErrorActions.clear()
+    }
+
+    return this
   }
 }
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 0845ec6f53..c654f5ca7c 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
@@ -16,7 +16,6 @@
 import org.signal.libsignal.protocol.ecc.ECPrivateKey;
 import org.signal.libsignal.protocol.ecc.ECPublicKey;
 import org.signal.libsignal.protocol.logging.Log;
-import org.signal.libsignal.protocol.state.SignedPreKeyRecord;
 import org.signal.libsignal.protocol.util.ByteUtil;
 import org.signal.libsignal.usernames.BaseUsernameException;
 import org.signal.libsignal.usernames.Username;
@@ -52,6 +51,7 @@
 import org.whispersystems.signalservice.api.push.exceptions.NonSuccessfulResponseCodeException;
 import org.whispersystems.signalservice.api.push.exceptions.NotFoundException;
 import org.whispersystems.signalservice.api.push.exceptions.PushNetworkException;
+import org.whispersystems.signalservice.api.registration.RegistrationApi;
 import org.whispersystems.signalservice.api.services.CdsiV2Service;
 import org.whispersystems.signalservice.api.storage.SignalStorageCipher;
 import org.whispersystems.signalservice.api.storage.SignalStorageManifest;
@@ -93,6 +93,7 @@
 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;
@@ -227,7 +228,7 @@ public void requestRegistrationPushChallenge(String sessionId, String gcmRegistr
 
   public ServiceResponse<RegistrationSessionMetadataResponse> createRegistrationSession(@Nullable String fcmToken, @Nullable String mcc, @Nullable String mnc) {
     try {
-      final RegistrationSessionMetadataResponse response =  pushServiceSocket.createVerificationSession(fcmToken, mcc, mnc);
+      final RegistrationSessionMetadataResponse response = pushServiceSocket.createVerificationSession(fcmToken, mcc, mnc);
       return ServiceResponse.forResult(response, 200, null);
     } catch (IOException e) {
       return ServiceResponse.forUnknownError(e);
@@ -319,6 +320,10 @@ 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);
@@ -384,7 +389,7 @@ public CdsiV2Service.Response getRegisteredUsersWithCdsi(Set<String> previousE16
                                                            Optional<byte[]> token,
                                                            String mrEnclave,
                                                            Long timeoutMs,
-                                                           @Nullable Network libsignalNetwork,
+                                                           @Nullable LibSignalNetwork libsignalNetwork,
                                                            Consumer<byte[]> tokenSaver)
       throws IOException
   {
@@ -1051,6 +1056,10 @@ public KeysApi getKeysApi() {
     return KeysApi.create(pushServiceSocket);
   }
 
+  public RegistrationApi getRegistrationApi() {
+    return new RegistrationApi(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 d1399f6af9..d004801ade 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
@@ -6,13 +6,17 @@
 
 package org.whispersystems.signalservice.api;
 
+import org.signal.core.util.StreamUtil;
 import org.signal.core.util.concurrent.FutureTransformers;
 import org.signal.core.util.concurrent.ListenableFuture;
 import org.signal.core.util.concurrent.SettableFuture;
 import org.signal.libsignal.protocol.InvalidMessageException;
 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.messages.SignalServiceAttachment.ProgressListener;
@@ -27,6 +31,7 @@
 import org.whispersystems.signalservice.api.util.CredentialsProvider;
 import org.whispersystems.signalservice.internal.ServiceResponse;
 import org.whispersystems.signalservice.internal.configuration.SignalServiceConfiguration;
+import org.whispersystems.signalservice.internal.crypto.PaddingInputStream;
 import org.whispersystems.signalservice.internal.push.IdentityCheckRequest;
 import org.whispersystems.signalservice.internal.push.IdentityCheckResponse;
 import org.whispersystems.signalservice.internal.push.PushServiceSocket;
@@ -36,14 +41,18 @@
 
 import java.io.File;
 import java.io.FileInputStream;
+import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 import java.util.Locale;
+import java.util.Map;
 import java.util.Optional;
 
 import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 
 import io.reactivex.rxjava3.core.Single;
 
@@ -159,10 +168,60 @@ public InputStream retrieveAttachment(SignalServiceAttachmentPointer pointer, Fi
       throws IOException, InvalidMessageException, MissingConfigurationException {
     if (!pointer.getDigest().isPresent()) throw new InvalidMessageException("No attachment digest!");
 
-    socket.retrieveAttachment(pointer.getCdnNumber(), pointer.getRemoteId(), destination, maxSizeBytes, listener);
+    socket.retrieveAttachment(pointer.getCdnNumber(), Collections.emptyMap(), pointer.getRemoteId(), destination, maxSizeBytes, listener);
     return AttachmentCipherInputStream.createForAttachment(destination, pointer.getSize().orElse(0), pointer.getKey(), pointer.getDigest().get(), null, 0);
   }
 
+  /**
+   * Retrieves an archived media attachment.
+   *
+   * @param archivedMediaKeyMaterial Decryption key material for decrypting outer layer of archived media.
+   * @param readCredentialHeaders Headers to pass to the backup CDN to authorize the download
+   * @param archiveDestination The download destination for archived attachment. If this file exists, download will resume.
+   * @param pointer The {@link SignalServiceAttachmentPointer} received in a {@link SignalServiceDataMessage}.
+   * @param attachmentDestination The download destination for this attachment. If this file exists, it is assumed that this is previously-downloaded content that can be resumed.
+   * @param listener An optional listener (may be null) to receive callbacks on download progress.
+   *
+   * @return An InputStream that streams the plaintext attachment contents.
+   */
+  public InputStream retrieveArchivedAttachment(@Nonnull BackupKey.MediaKeyMaterial archivedMediaKeyMaterial,
+                                                @Nonnull Map<String, String> readCredentialHeaders,
+                                                @Nonnull File archiveDestination,
+                                                @Nonnull SignalServiceAttachmentPointer pointer,
+                                                @Nonnull File attachmentDestination,
+                                                long maxSizeBytes,
+                                                @Nullable ProgressListener listener)
+      throws IOException, InvalidMessageException, MissingConfigurationException
+  {
+    if (pointer.getDigest().isEmpty()) {
+      throw new InvalidMessageException("No attachment digest!");
+    }
+
+    socket.retrieveAttachment(pointer.getCdnNumber(), readCredentialHeaders, pointer.getRemoteId(), archiveDestination, maxSizeBytes, listener);
+
+    long originalCipherLength = pointer.getSize()
+                                       .filter(s -> s > 0)
+                                       .map(s -> AttachmentCipherStreamUtil.getCiphertextLength(PaddingInputStream.getPaddedSize(s)))
+                                       .orElse(0L);
+
+    try (InputStream backupDecrypted = AttachmentCipherInputStream.createForArchivedMedia(archivedMediaKeyMaterial, archiveDestination, originalCipherLength)) {
+      try (FileOutputStream fos = new FileOutputStream(attachmentDestination)) {
+        StreamUtil.copy(backupDecrypted, fos);
+      }
+    }
+
+    return AttachmentCipherInputStream.createForAttachment(attachmentDestination,
+                                                           pointer.getSize().orElse(0),
+                                                           pointer.getKey(),
+                                                           pointer.getDigest().get(),
+                                                           null,
+                                                           0);
+  }
+
+  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);
+  }
+
   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 28cb7c3ed7..75a8fdb57b 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
@@ -93,7 +93,7 @@
 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.AttachmentV4UploadAttributes;
+import org.whispersystems.signalservice.internal.push.AttachmentUploadForm;
 import org.whispersystems.signalservice.internal.push.BodyRange;
 import org.whispersystems.signalservice.internal.push.CallMessage;
 import org.whispersystems.signalservice.internal.push.Content;
@@ -841,7 +841,7 @@ private SignalServiceAttachmentPointer uploadAttachmentV2(SignalServiceAttachmen
     Pair<Long, AttachmentDigest> attachmentIdAndDigest = socket.uploadAttachment(attachmentData, v2UploadAttributes);
 
     return new SignalServiceAttachmentPointer(0,
-                                              new SignalServiceAttachmentRemoteId(attachmentIdAndDigest.first()),
+                                              new SignalServiceAttachmentRemoteId.V2(attachmentIdAndDigest.first()),
                                               attachment.getContentType(),
                                               attachmentKey,
                                               Optional.of(Util.toIntExact(attachment.getLength())),
@@ -860,7 +860,7 @@ private SignalServiceAttachmentPointer uploadAttachmentV2(SignalServiceAttachmen
   }
 
   public ResumableUploadSpec getResumableUploadSpec() throws IOException {
-    AttachmentV4UploadAttributes v4UploadAttributes = null;
+    AttachmentUploadForm v4UploadAttributes = null;
 
     Log.d(TAG, "Using pipe to retrieve attachment upload attributes...");
     try {
@@ -868,6 +868,9 @@ public ResumableUploadSpec getResumableUploadSpec() throws IOException {
     } catch (WebSocketUnavailableException e) {
       Log.w(TAG, "[getResumableUploadSpec] Pipe unavailable, falling back... (" + e.getClass().getSimpleName() + ": " + e.getMessage() + ")");
     } catch (IOException e) {
+      if (e instanceof RateLimitException) {
+        throw e;
+      }
       Log.w(TAG, "Failed to retrieve attachment upload attributes using pipe. Falling back...");
     }
     
@@ -882,7 +885,7 @@ public ResumableUploadSpec getResumableUploadSpec() throws IOException {
   private SignalServiceAttachmentPointer uploadAttachmentV4(SignalServiceAttachmentStream attachment, byte[] attachmentKey, PushAttachmentData attachmentData) throws IOException {
     AttachmentDigest digest = socket.uploadAttachment(attachmentData);
     return new SignalServiceAttachmentPointer(attachmentData.getResumableUploadSpec().getCdnNumber(),
-                                              new SignalServiceAttachmentRemoteId(attachmentData.getResumableUploadSpec().getCdnKey()),
+                                              new SignalServiceAttachmentRemoteId.V4(attachmentData.getResumableUploadSpec().getCdnKey()),
                                               attachment.getContentType(),
                                               attachmentKey,
                                               Optional.of(Util.toIntExact(attachment.getLength())),
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 1e43a67feb..670f169981 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
@@ -16,8 +16,11 @@ import org.whispersystems.signalservice.api.NetworkResult
 import org.whispersystems.signalservice.api.archive.ArchiveGetMediaItemsResponse.StoredMediaObject
 import org.whispersystems.signalservice.api.backup.BackupKey
 import org.whispersystems.signalservice.api.push.ServiceId.ACI
+import org.whispersystems.signalservice.internal.push.AttachmentUploadForm
 import org.whispersystems.signalservice.internal.push.PushServiceSocket
+import org.whispersystems.signalservice.internal.push.http.ResumableUploadSpec
 import java.io.InputStream
+import java.time.Instant
 
 /**
  * Class to interact with various archive-related endpoints.
@@ -55,6 +58,15 @@ class ArchiveApi(
     }
   }
 
+  fun getCdnReadCredentials(cdnNumber: Int, backupKey: BackupKey, serviceCredential: ArchiveServiceCredential): NetworkResult<GetArchiveCdnCredentialsResponse> {
+    return NetworkResult.fromFetch {
+      val zkCredential = getZkCredential(backupKey, serviceCredential)
+      val presentationData = CredentialPresentationData.from(backupKey, zkCredential, backupServerPublicParams)
+
+      pushServiceSocket.getArchiveCdnReadCredentials(cdnNumber, presentationData.toArchiveCredentialPresentation())
+    }
+  }
+
   /**
    * Ensures that you reserve a backupId on the service. This must be done before any other
    * backup-related calls. You only need to do it once, but repeated calls are safe.
@@ -82,7 +94,7 @@ class ArchiveApi(
   /**
    * Fetches an upload form you can use to upload your main message backup file to cloud storage.
    */
-  fun getMessageBackupUploadForm(backupKey: BackupKey, serviceCredential: ArchiveServiceCredential): NetworkResult<ArchiveMessageBackupUploadFormResponse> {
+  fun getMessageBackupUploadForm(backupKey: BackupKey, serviceCredential: ArchiveServiceCredential): NetworkResult<AttachmentUploadForm> {
     return NetworkResult.fromFetch {
       val zkCredential = getZkCredential(backupKey, serviceCredential)
       val presentationData = CredentialPresentationData.from(backupKey, zkCredential, backupServerPublicParams)
@@ -104,38 +116,63 @@ class ArchiveApi(
   }
 
   /**
-   * Retrieves a resumable upload URL you can use to upload your main message backup file to cloud storage.
+   * Lists the media objects in the backup
+   */
+  fun listMediaObjects(backupKey: BackupKey, serviceCredential: ArchiveServiceCredential, limit: Int, cursor: String? = null): NetworkResult<ArchiveGetMediaItemsResponse> {
+    return NetworkResult.fromFetch {
+      val zkCredential = getZkCredential(backupKey, serviceCredential)
+      val presentationData = CredentialPresentationData.from(backupKey, zkCredential, backupServerPublicParams)
+      pushServiceSocket.getArchiveMediaItemsPage(presentationData.toArchiveCredentialPresentation(), limit, cursor)
+    }
+  }
+
+  /**
+   * Retrieves a resumable upload URL you can use to upload your main message backup file or an arbitrary media file to cloud storage.
    */
-  fun getBackupResumableUploadUrl(archiveFormResponse: ArchiveMessageBackupUploadFormResponse): NetworkResult<String> {
+  fun getBackupResumableUploadUrl(uploadForm: AttachmentUploadForm): NetworkResult<String> {
     return NetworkResult.fromFetch {
-      pushServiceSocket.getResumableUploadUrl(archiveFormResponse)
+      pushServiceSocket.getResumableUploadUrl(uploadForm)
     }
   }
 
   /**
    * Uploads your main backup file to cloud storage.
    */
-  fun uploadBackupFile(archiveFormResponse: ArchiveMessageBackupUploadFormResponse, resumableUploadUrl: String, data: InputStream, dataLength: Long): NetworkResult<Unit> {
+  fun uploadBackupFile(uploadForm: AttachmentUploadForm, resumableUploadUrl: String, data: InputStream, dataLength: Long): NetworkResult<Unit> {
     return NetworkResult.fromFetch {
-      pushServiceSocket.uploadBackupFile(archiveFormResponse, resumableUploadUrl, data, dataLength)
+      pushServiceSocket.uploadBackupFile(uploadForm, resumableUploadUrl, data, dataLength)
     }
   }
 
   /**
-   * Retrieves all media items in the user's archive. Note that this could be a very large number of items, making this only suitable for debugging.
-   * Use [getArchiveMediaItemsPage] in production.
+   * Retrieves an [AttachmentUploadForm] that can be used to upload pre-existing media to the archive.
+   * After uploading, the media still needs to be copied via [archiveAttachmentMedia].
    */
-  fun debugGetUploadedMediaItemMetadata(backupKey: BackupKey, serviceCredential: ArchiveServiceCredential): NetworkResult<List<StoredMediaObject>> {
+  fun getMediaUploadForm(backupKey: BackupKey, serviceCredential: ArchiveServiceCredential): NetworkResult<AttachmentUploadForm> {
     return NetworkResult.fromFetch {
       val zkCredential = getZkCredential(backupKey, serviceCredential)
       val presentationData = CredentialPresentationData.from(backupKey, zkCredential, backupServerPublicParams)
-      val credentialPresentation = presentationData.toArchiveCredentialPresentation()
+      pushServiceSocket.getArchiveMediaUploadForm(presentationData.toArchiveCredentialPresentation())
+    }
+  }
+
+  fun getResumableUploadSpec(uploadForm: AttachmentUploadForm): NetworkResult<ResumableUploadSpec> {
+    return NetworkResult.fromFetch {
+      pushServiceSocket.getResumableUploadSpec(uploadForm)
+    }
+  }
 
+  /**
+   * Retrieves all media items in the user's archive. Note that this could be a very large number of items, making this only suitable for debugging.
+   * Use [getArchiveMediaItemsPage] in production.
+   */
+  fun debugGetUploadedMediaItemMetadata(backupKey: BackupKey, serviceCredential: ArchiveServiceCredential): NetworkResult<List<StoredMediaObject>> {
+    return NetworkResult.fromFetch {
       val mediaObjects: MutableList<StoredMediaObject> = ArrayList()
 
       var cursor: String? = null
       do {
-        val response: ArchiveGetMediaItemsResponse = pushServiceSocket.getArchiveMediaItemsPage(credentialPresentation, 512, cursor)
+        val response: ArchiveGetMediaItemsResponse = getArchiveMediaItemsPage(backupKey, serviceCredential, 512, cursor).successOrThrow()
         mediaObjects += response.storedMediaObjects
         cursor = response.cursor
       } while (cursor != null)
@@ -149,7 +186,7 @@ class ArchiveApi(
    * @param limit The maximum number of items to return.
    * @param cursor A token that can be read from your previous response, telling the server where to start the next page.
    */
-  fun getArchiveMediaItemsPage(backupKey: BackupKey, serviceCredential: ArchiveServiceCredential, limit: Int, cursor: String): NetworkResult<ArchiveGetMediaItemsResponse> {
+  fun getArchiveMediaItemsPage(backupKey: BackupKey, serviceCredential: ArchiveServiceCredential, limit: Int, cursor: String?): NetworkResult<ArchiveGetMediaItemsResponse> {
     return NetworkResult.fromFetch {
       val zkCredential = getZkCredential(backupKey, serviceCredential)
       val presentationData = CredentialPresentationData.from(backupKey, zkCredential, backupServerPublicParams)
@@ -160,6 +197,13 @@ class ArchiveApi(
 
   /**
    * Copy and re-encrypt media from the attachments cdn into the backup cdn.
+   *
+   * Possible errors:
+   *   400: Bad arguments, or made on an authenticated channel
+   *   401: Invalid presentation or signature
+   *   403: Insufficient permissions
+   *   413: No media space remaining
+   *   429: Rate-limited
    */
   fun archiveAttachmentMedia(
     backupKey: BackupKey,
@@ -215,8 +259,8 @@ class ArchiveApi(
 
     return backupRequestContext.receiveResponse(
       backupAuthResponse,
-      backupServerPublicParams,
-      20
+      Instant.ofEpochSecond(serviceCredential.redemptionTime),
+      backupServerPublicParams
     )
   }
 
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 42e44e0d83..c07350cdd9 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
@@ -15,6 +15,8 @@ data class ArchiveGetBackupInfoResponse(
   val cdn: Int?,
   @JsonProperty("backupDir")
   val backupDir: String?,
+  @JsonProperty("mediaDir")
+  val mediaDir: String?,
   @JsonProperty("backupName")
   val backupName: String?,
   @JsonProperty("usedSpace")
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 694bd8323f..991b4514ea 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
@@ -12,6 +12,8 @@ import com.fasterxml.jackson.annotation.JsonProperty
  */
 class ArchiveGetMediaItemsResponse(
   @JsonProperty("storedMediaObjects") val storedMediaObjects: List<StoredMediaObject>,
+  @JsonProperty("cursor") val backupDir: String?,
+  @JsonProperty("mediaDir") val mediaDir: String?,
   @JsonProperty("cursor") val cursor: String?
 ) {
   class StoredMediaObject(
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 d2bb44b03f..55505cf0ed 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
@@ -12,4 +12,19 @@ import com.fasterxml.jackson.annotation.JsonProperty
  */
 class ArchiveMediaResponse(
   @JsonProperty("cdn") val cdn: Int
-)
+) {
+  enum class StatusCodes(val code: Int) {
+    BadArguments(400),
+    InvalidPresentationOrSignature(401),
+    InsufficientPermissions(403),
+    NoMediaSpaceRemaining(413),
+    RateLimited(429),
+    Unknown(-1);
+
+    companion object {
+      fun from(code: Int): StatusCodes {
+        return values().firstOrNull { it.code == code } ?: Unknown
+      }
+    }
+  }
+}
diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/archive/ArchiveMediaUploadFormStatusCodes.kt b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/archive/ArchiveMediaUploadFormStatusCodes.kt
new file mode 100644
index 0000000000..f756bbf675
--- /dev/null
+++ b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/archive/ArchiveMediaUploadFormStatusCodes.kt
@@ -0,0 +1,25 @@
+/*
+ * Copyright 2024 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.whispersystems.signalservice.api.archive
+
+/**
+ * Status codes for the ArchiveMediaUploadForm endpoint.
+ *
+ * Kept in a separate class because [AttachmentUploadForm] (the model the request returns) is used for multiple endpoints with different status codes.
+ */
+enum class ArchiveMediaUploadFormStatusCodes(val code: Int) {
+  BadArguments(400),
+  InvalidPresentationOrSignature(401),
+  InsufficientPermissions(403),
+  RateLimited(429),
+  Unknown(-1);
+
+  companion object {
+    fun from(code: Int): ArchiveMediaUploadFormStatusCodes {
+      return values().firstOrNull { it.code == code } ?: Unknown
+    }
+  }
+}
diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/archive/ArchiveMessageBackupUploadFormResponse.kt b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/archive/ArchiveMessageBackupUploadFormResponse.kt
deleted file mode 100644
index f523221953..0000000000
--- a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/archive/ArchiveMessageBackupUploadFormResponse.kt
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright 2023 Signal Messenger, LLC
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-package org.whispersystems.signalservice.api.archive
-
-import com.fasterxml.jackson.annotation.JsonProperty
-
-/**
- * Represents the response body when we ask for a message backup upload form.
- */
-data class ArchiveMessageBackupUploadFormResponse(
-  @JsonProperty("cdn")
-  val cdn: Int,
-  @JsonProperty("key")
-  val key: String,
-  @JsonProperty("headers")
-  val headers: Map<String, String>,
-  @JsonProperty("signedUploadLocation")
-  val signedUploadLocation: 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
new file mode 100644
index 0000000000..85fcdf6d67
--- /dev/null
+++ b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/archive/GetArchiveCdnCredentialsResponse.kt
@@ -0,0 +1,15 @@
+/*
+ * Copyright 2024 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.whispersystems.signalservice.api.archive
+
+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>
+)
diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/backup/BackupId.kt b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/backup/BackupId.kt
index 6d6a386614..5d6ef9cf78 100644
--- a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/backup/BackupId.kt
+++ b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/backup/BackupId.kt
@@ -5,6 +5,9 @@
 
 package org.whispersystems.signalservice.api.backup
 
+import org.signal.core.util.Base64
+import java.security.MessageDigest
+
 /**
  * Safe typing around a backupId, which is a 16-byte array.
  */
@@ -14,4 +17,9 @@ value class BackupId(val value: ByteArray) {
   init {
     require(value.size == 16) { "BackupId must be 16 bytes!" }
   }
+
+  /** Encode backup-id for use in a URL/request */
+  fun encode(): String {
+    return Base64.encodeUrlSafeWithPadding(MessageDigest.getInstance("SHA-256").digest(value).copyOfRange(0, 16))
+  }
 }
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 1939cc5e1b..8c05a55eea 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
@@ -16,31 +16,36 @@ class BackupKey(val value: ByteArray) {
     require(value.size == 32) { "Backup key must be 32 bytes!" }
   }
 
-  fun deriveSecrets(aci: ACI): KeyMaterial<BackupId> {
-    val backupId = BackupId(
+  fun deriveBackupId(aci: ACI): BackupId {
+    return BackupId(
       HKDF.deriveSecrets(this.value, aci.toByteArray(), "20231003_Signal_Backups_GenerateBackupId".toByteArray(), 16)
     )
+  }
+
+  fun deriveBackupSecrets(aci: ACI): BackupKeyMaterial {
+    val backupId = deriveBackupId(aci)
 
     val extendedKey = HKDF.deriveSecrets(this.value, backupId.value, "20231003_Signal_Backups_EncryptMessageBackup".toByteArray(), 80)
 
-    return KeyMaterial(
+    return BackupKeyMaterial(
       id = backupId,
       macKey = extendedKey.copyOfRange(0, 32),
-      cipherKey = extendedKey.copyOfRange(32, 64),
-      iv = extendedKey.copyOfRange(64, 80)
+      cipherKey = extendedKey.copyOfRange(32, 64)
     )
   }
 
-  fun deriveMediaId(dataHash: ByteArray): MediaId {
-    return MediaId(HKDF.deriveSecrets(value, dataHash, "Media ID".toByteArray(), 15))
+  fun deriveMediaId(mediaName: MediaName): MediaId {
+    return MediaId(HKDF.deriveSecrets(value, mediaName.toByteArray(), "Media ID".toByteArray(), 15))
   }
 
-  fun deriveMediaSecrets(dataHash: ByteArray): KeyMaterial<MediaId> {
-    val mediaId = deriveMediaId(dataHash)
+  fun deriveMediaSecrets(mediaName: MediaName): MediaKeyMaterial {
+    return deriveMediaSecrets(deriveMediaId(mediaName))
+  }
 
+  private fun deriveMediaSecrets(mediaId: MediaId): MediaKeyMaterial {
     val extendedKey = HKDF.deriveSecrets(this.value, mediaId.value, "20231003_Signal_Backups_EncryptMedia".toByteArray(), 80)
 
-    return KeyMaterial(
+    return MediaKeyMaterial(
       id = mediaId,
       macKey = extendedKey.copyOfRange(0, 32),
       cipherKey = extendedKey.copyOfRange(32, 64),
@@ -48,10 +53,28 @@ class BackupKey(val value: ByteArray) {
     )
   }
 
-  class KeyMaterial<Id> (
-    val id: Id,
+  class BackupKeyMaterial(
+    val id: BackupId,
+    val macKey: ByteArray,
+    val cipherKey: ByteArray
+  )
+
+  class MediaKeyMaterial(
+    val id: MediaId,
     val macKey: ByteArray,
     val cipherKey: ByteArray,
     val iv: ByteArray
-  )
+  ) {
+    companion object {
+      @JvmStatic
+      fun forMedia(id: ByteArray, keyMac: ByteArray, iv: ByteArray): MediaKeyMaterial {
+        return MediaKeyMaterial(
+          MediaId(id),
+          keyMac.copyOfRange(32, 64),
+          keyMac.copyOfRange(0, 32),
+          iv
+        )
+      }
+    }
+  }
 }
diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/backup/MediaId.kt b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/backup/MediaId.kt
index 6575e99118..5ebb66caa7 100644
--- a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/backup/MediaId.kt
+++ b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/backup/MediaId.kt
@@ -13,11 +13,14 @@ import org.signal.core.util.Base64
 @JvmInline
 value class MediaId(val value: ByteArray) {
 
+  constructor(mediaId: String) : this(Base64.decode(mediaId))
+
   init {
     require(value.size == 15) { "MediaId must be 15 bytes!" }
   }
 
-  override fun toString(): String {
+  /** Encode media-id for use in a URL/request */
+  fun encode(): String {
     return Base64.encodeUrlSafeWithPadding(value)
   }
 }
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
new file mode 100644
index 0000000000..e0bc242aaf
--- /dev/null
+++ b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/backup/MediaName.kt
@@ -0,0 +1,24 @@
+/*
+ * Copyright 2024 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.whispersystems.signalservice.api.backup
+
+import org.signal.core.util.Base64
+
+/**
+ * Represent a media name for the various types of media that can be archived.
+ */
+@JvmInline
+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 toByteArray(): ByteArray {
+    return name.toByteArray()
+  }
+}
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 b07d66b95d..e744df0609 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
@@ -10,7 +10,8 @@
 import org.signal.libsignal.protocol.InvalidMessageException;
 import org.signal.libsignal.protocol.incrementalmac.ChunkSizeChoice;
 import org.signal.libsignal.protocol.incrementalmac.IncrementalMacInputStream;
-import org.signal.libsignal.protocol.kdf.HKDFv3;
+import org.signal.libsignal.protocol.kdf.HKDF;
+import org.whispersystems.signalservice.api.backup.BackupKey;
 import org.whispersystems.signalservice.internal.util.ContentLengthInputStream;
 import org.whispersystems.signalservice.internal.util.Util;
 
@@ -26,6 +27,8 @@
 import java.security.NoSuchAlgorithmException;
 import java.util.Arrays;
 
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 import javax.crypto.BadPaddingException;
 import javax.crypto.Cipher;
 import javax.crypto.IllegalBlockSizeException;
@@ -47,9 +50,10 @@ public class AttachmentCipherInputStream extends FilterInputStream {
   private static final int CIPHER_KEY_SIZE = 32;
   private static final int MAC_KEY_SIZE    = 32;
 
-  private Cipher  cipher;
+  private final Cipher cipher;
+  private final long   totalDataSize;
+
   private boolean done;
-  private long    totalDataSize;
   private long    totalRead;
   private byte[]  overflowBuffer;
 
@@ -83,7 +87,12 @@ public static InputStream createForAttachment(File file, long plaintextLength, b
         wrappedStream = new FileInputStream(file);
       } else {
         wrappedStream = new IncrementalMacInputStream(
-            new FileInputStream(file),
+            new IncrementalMacAdditionalValidationsInputStream(
+                new FileInputStream(file),
+                file.length(),
+                mac,
+                digest
+            ),
             parts[1],
             ChunkSizeChoice.everyNthByte(incrementalMacChunkSize),
             incrementalDigest);
@@ -102,11 +111,43 @@ public static InputStream createForAttachment(File file, long plaintextLength, b
     }
   }
 
+  /**
+   * Decrypt archived media to it's original attachment encrypted blob.
+   */
+  public static InputStream createForArchivedMedia(BackupKey.MediaKeyMaterial archivedMediaKeyMaterial, File file, long originalCipherTextLength)
+      throws InvalidMessageException, IOException
+  {
+    try {
+      Mac mac = Mac.getInstance("HmacSHA256");
+      mac.init(new SecretKeySpec(archivedMediaKeyMaterial.getMacKey(), "HmacSHA256"));
+
+      if (file.length() <= BLOCK_SIZE + mac.getMacLength()) {
+        throw new InvalidMessageException("Message shorter than crypto overhead!");
+      }
+
+      try (FileInputStream macVerificationStream = new FileInputStream(file)) {
+        verifyMac(macVerificationStream, file.length(), mac, null);
+      }
+
+      InputStream inputStream = new AttachmentCipherInputStream(new FileInputStream(file), archivedMediaKeyMaterial.getCipherKey(), file.length() - BLOCK_SIZE - mac.getMacLength());
+
+      if (originalCipherTextLength != 0) {
+        inputStream = new ContentLengthInputStream(inputStream, originalCipherTextLength);
+      }
+
+      return inputStream;
+    } catch (NoSuchAlgorithmException | InvalidKeyException e) {
+      throw new AssertionError(e);
+    } catch (InvalidMacException e) {
+      throw new InvalidMessageException(e);
+    }
+  }
+
   public static InputStream createForStickerData(byte[] data, byte[] packKey)
       throws InvalidMessageException, IOException
   {
     try {
-      byte[]   combinedKeyMaterial = new HKDFv3().deriveSecrets(packKey, "Sticker Pack".getBytes(), 64);
+      byte[]   combinedKeyMaterial = HKDF.deriveSecrets(packKey, "Sticker Pack".getBytes(), 64);
       byte[][] parts               = Util.split(combinedKeyMaterial, CIPHER_KEY_SIZE, MAC_KEY_SIZE);
       Mac      mac                 = Mac.getInstance("HmacSHA256");
       mac.init(new SecretKeySpec(parts[1], "HmacSHA256"));
@@ -159,12 +200,12 @@ public int read() throws IOException {
   }
 
   @Override
-  public int read(byte[] buffer) throws IOException {
+  public int read(@Nonnull byte[] buffer) throws IOException {
     return read(buffer, 0, buffer.length);
   }
 
   @Override
-  public int read(byte[] buffer, int offset, int length) throws IOException {
+  public int read(@Nonnull byte[] buffer, int offset, int length) throws IOException {
     if (totalRead != totalDataSize) {
       return readIncremental(buffer, offset, length);
     } else if (!done) {
@@ -256,7 +297,7 @@ private int readIncremental(byte[] buffer, int offset, int length) throws IOExce
     }
   }
 
-  private static void verifyMac(InputStream inputStream, long length, Mac mac, byte[] theirDigest)
+  private static void verifyMac(@Nonnull InputStream inputStream, long length, @Nonnull Mac mac, @Nullable byte[] theirDigest)
       throws InvalidMacException
   {
     try {
diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/crypto/IncrementalMacAdditionalValidationsInputStream.kt b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/crypto/IncrementalMacAdditionalValidationsInputStream.kt
new file mode 100644
index 0000000000..4e55b1ff50
--- /dev/null
+++ b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/crypto/IncrementalMacAdditionalValidationsInputStream.kt
@@ -0,0 +1,122 @@
+/*
+ * Copyright 2024 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.whispersystems.signalservice.api.crypto
+
+import org.signal.libsignal.protocol.InvalidMessageException
+import org.whispersystems.signalservice.internal.util.Util
+import java.io.FilterInputStream
+import java.io.InputStream
+import java.security.MessageDigest
+import javax.crypto.Mac
+import kotlin.math.max
+
+/**
+ * This is meant as a helper stream to go along with [org.signal.libsignal.protocol.incrementalmac.IncrementalMacInputStream].
+ * That class does not validate the overall digest, nor the overall MAC. This class does that for us.
+ *
+ * To use, wrap the IncremtalMacInputStream around this class, and then this class should wrap the lowest-level data stream.
+ */
+class IncrementalMacAdditionalValidationsInputStream(
+  wrapped: InputStream,
+  fileLength: Long,
+  private val mac: Mac,
+  private val theirDigest: ByteArray
+) : FilterInputStream(wrapped) {
+
+  private val digest: MessageDigest = MessageDigest.getInstance("SHA256")
+  private val macLength: Int = mac.macLength
+  private val macBuffer: ByteArray = ByteArray(macLength)
+
+  private var validated = false
+  private var bytesRemaining: Int = fileLength.toInt()
+  private var macBufferPosition: Int = 0
+
+  override fun read(): Int {
+    throw UnsupportedOperationException()
+  }
+
+  /**
+   * We need to be very careful to keep track of what data is part of the MAC and what isn't, based on how far we've read into the file.
+   * As a recap, the digest needs to ingest the entire file, while the MAC needs to ingest everything except the last [macLength] bytes.
+   * (Because the last [macLength] bytes represents the MAC we're going to verify against.)
+   *
+   * The wrapping stream may request the full length of the file, so we need to do some bookkeeping to remember the last [macLength] bytes
+   * for comparison purposes during [validate] while not ingesting them into the MAC that we're calculating.
+   */
+  override fun read(buffer: ByteArray, offset: Int, length: Int): Int {
+    val bytesRead = super.read(buffer, offset, length)
+    if (bytesRead == -1) {
+      validate()
+      return bytesRead
+    }
+
+    bytesRemaining -= bytesRead
+
+    // This indicates we've read into the last [macLength] bytes of the file, so we need to start our bookkeeping
+    if (bytesRemaining < macLength) {
+      val bytesOfMacRead = macLength - bytesRemaining
+      val newBytesOfMacRead = bytesOfMacRead - macBufferPosition
+
+      // There's a possibility that the reader has only partially read the last [macLength] bytes, so we need to keep track of a position in our
+      // MAC buffer and copy over just the new parts we've read
+      if (newBytesOfMacRead > 0) {
+        System.arraycopy(buffer, offset + bytesRead - newBytesOfMacRead, macBuffer, macBufferPosition, newBytesOfMacRead)
+        macBufferPosition += newBytesOfMacRead
+      }
+
+      // Even though we're reading into the MAC, many of the bytes read in this method call could be non-MAC bytes, so we need to copy
+      // those over, while excluding the bytes that are part of the MAC.
+      val bytesOfNonMacRead = max(0, bytesRead - bytesOfMacRead)
+      if (bytesOfNonMacRead > 0) {
+        mac.update(buffer, offset, bytesOfNonMacRead)
+      }
+    } else {
+      mac.update(buffer, offset, bytesRead)
+    }
+
+    digest.update(buffer, offset, bytesRead)
+
+    if (bytesRemaining == 0) {
+      validate()
+    }
+
+    return bytesRead
+  }
+
+  override fun close() {
+    // We only want to validate the digest if we've otherwise read the entire stream.
+    // It's valid to close the stream early, and in this case, we don't want to force reading the whole rest of the stream.
+    if (bytesRemaining > macLength) {
+      super.close()
+      return
+    }
+
+    if (bytesRemaining > 0) {
+      Util.readFullyAsBytes(this)
+    }
+
+    super.close()
+  }
+
+  private fun validate() {
+    if (validated) {
+      return
+    }
+    validated = true
+
+    val ourMac = mac.doFinal()
+    val theirMac = macBuffer
+
+    if (!MessageDigest.isEqual(ourMac, theirMac)) {
+      throw InvalidMessageException("MAC doesn't match!")
+    }
+
+    val ourDigest = digest.digest()
+    if (!MessageDigest.isEqual(ourDigest, theirDigest)) {
+      throw InvalidMessageException("Digest doesn't match!")
+    }
+  }
+}
diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/EnvelopeContentValidator.kt b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/EnvelopeContentValidator.kt
index db240092af..d73a137700 100644
--- a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/EnvelopeContentValidator.kt
+++ b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/EnvelopeContentValidator.kt
@@ -1,5 +1,6 @@
 package org.whispersystems.signalservice.api.messages
 
+import okio.ByteString
 import org.signal.libsignal.protocol.message.DecryptionErrorMessage
 import org.signal.libsignal.protocol.message.SenderKeyDistributionMessage
 import org.signal.libsignal.zkgroup.InvalidInputException
@@ -13,6 +14,7 @@ import org.whispersystems.signalservice.internal.push.DataMessage
 import org.whispersystems.signalservice.internal.push.EditMessage
 import org.whispersystems.signalservice.internal.push.Envelope
 import org.whispersystems.signalservice.internal.push.GroupContextV2
+import org.whispersystems.signalservice.internal.push.PniSignatureMessage
 import org.whispersystems.signalservice.internal.push.ReceiptMessage
 import org.whispersystems.signalservice.internal.push.StoryMessage
 import org.whispersystems.signalservice.internal.push.SyncMessage
@@ -43,6 +45,10 @@ object EnvelopeContentValidator {
       validateSenderKeyDistributionMessage(content.senderKeyDistributionMessage.toByteArray())?.let { return it }
     }
 
+    if (content.pniSignatureMessage != null) {
+      validatePniSignatureMessage(content.pniSignatureMessage)?.let { return it }
+    }
+
     // Reminder: envelope.destinationServiceId was already validated since we need that for decryption
 
     return when {
@@ -255,6 +261,18 @@ object EnvelopeContentValidator {
     }
   }
 
+  private fun validatePniSignatureMessage(pniSignatureMessage: PniSignatureMessage): Result? {
+    if (pniSignatureMessage.pni.isNullOrInvalidPni()) {
+      return Result.Invalid("[PniSignatureMessage] Invalid PNI")
+    }
+
+    if (pniSignatureMessage.signature == null) {
+      return Result.Invalid("[PniSignatureMessage] Signature is null")
+    }
+
+    return null
+  }
+
   private fun validateStoryMessage(storyMessage: StoryMessage): Result {
     if (storyMessage.group != null) {
       validateGroupContextV2(storyMessage.group, "[StoryMessage]")?.let { return it }
@@ -328,6 +346,11 @@ object EnvelopeContentValidator {
     return parsed == null || parsed.isUnknown
   }
 
+  private fun ByteString?.isNullOrInvalidPni(): Boolean {
+    val parsed = ServiceId.PNI.parseOrNull(this?.toByteArray())
+    return parsed == null || parsed.isUnknown
+  }
+
   private fun Content?.meetsStoryFlagCriteria(): Boolean {
     return when {
       this == null -> false
diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/SignalServiceAttachmentRemoteId.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/SignalServiceAttachmentRemoteId.java
deleted file mode 100644
index 5b5af120f7..0000000000
--- a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/SignalServiceAttachmentRemoteId.java
+++ /dev/null
@@ -1,67 +0,0 @@
-package org.whispersystems.signalservice.api.messages;
-
-import org.whispersystems.signalservice.api.InvalidMessageStructureException;
-import org.whispersystems.signalservice.internal.push.AttachmentPointer;
-
-import java.util.Optional;
-
-/**
- * Represents a signal service attachment identifier. This can be either a CDN key or a long, but
- * not both at once. Attachments V2 used a long as an attachment identifier. This lacks sufficient
- * entropy to reduce the likelihood of any two uploads going to the same location within a 30-day
- * window. Attachments V3 uses an opaque string as an attachment identifier which provides more
- * flexibility in the amount of entropy present.
- */
-public final class SignalServiceAttachmentRemoteId {
-  private final Optional<Long>   v2;
-  private final Optional<String> v3;
-
-  public SignalServiceAttachmentRemoteId(long v2) {
-    this.v2 = Optional.of(v2);
-    this.v3 = Optional.empty();
-  }
-
-  public SignalServiceAttachmentRemoteId(String v3) {
-    this.v2 = Optional.empty();
-    this.v3 = Optional.of(v3);
-  }
-
-  public Optional<Long> getV2() {
-    return v2;
-  }
-
-  public Optional<String> getV3() {
-    return v3;
-  }
-
-  @Override
-  public String toString() {
-    if (v2.isPresent()) {
-      return v2.get().toString();
-    } else {
-      return v3.get();
-    }
-  }
-
-  public static SignalServiceAttachmentRemoteId from(AttachmentPointer attachmentPointer) throws InvalidMessageStructureException {
-    if (attachmentPointer.cdnKey != null) {
-      return new SignalServiceAttachmentRemoteId(attachmentPointer.cdnKey);
-    } else if (attachmentPointer.cdnId != null && attachmentPointer.cdnId > 0) {
-      return new SignalServiceAttachmentRemoteId(attachmentPointer.cdnId);
-    } else {
-      throw new InvalidMessageStructureException("AttachmentPointer CDN location not set");
-    }
-  }
-
-  /**
-   * Guesses that strings which contain values parseable to {@code long} should use an id-based
-   * CDN path. Otherwise, use key-based CDN path.
-   */
-  public static SignalServiceAttachmentRemoteId from(String string) {
-    try {
-      return new SignalServiceAttachmentRemoteId(Long.parseLong(string));
-    } catch (NumberFormatException e) {
-      return new SignalServiceAttachmentRemoteId(string);
-    }
-  }
-}
diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/SignalServiceAttachmentRemoteId.kt b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/SignalServiceAttachmentRemoteId.kt
new file mode 100644
index 0000000000..7dd8bf0f1d
--- /dev/null
+++ b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/SignalServiceAttachmentRemoteId.kt
@@ -0,0 +1,54 @@
+package org.whispersystems.signalservice.api.messages
+
+import org.whispersystems.signalservice.api.InvalidMessageStructureException
+import org.whispersystems.signalservice.internal.push.AttachmentPointer
+
+/**
+ * Represents a signal service attachment identifier. This can be either a CDN key or a long, but
+ * not both at once. Attachments V2 used a long as an attachment identifier. This lacks sufficient
+ * entropy to reduce the likelihood of any two uploads going to the same location within a 30-day
+ * window. Attachments V4 (backwards compatible with V3) uses an opaque string as an attachment
+ * identifier which provides more flexibility in the amount of entropy present.
+ */
+sealed interface SignalServiceAttachmentRemoteId {
+
+  object S3 : SignalServiceAttachmentRemoteId {
+    override fun toString() = ""
+  }
+
+  data class V2(val cdnId: Long) : SignalServiceAttachmentRemoteId {
+    override fun toString() = cdnId.toString()
+  }
+
+  data class V4(val cdnKey: String) : SignalServiceAttachmentRemoteId {
+    override fun toString() = cdnKey
+  }
+
+  data class Backup(val backupDir: String, val mediaDir: String, val mediaId: String) : SignalServiceAttachmentRemoteId {
+    override fun toString() = mediaId
+  }
+
+  companion object {
+
+    @JvmStatic
+    @Throws(InvalidMessageStructureException::class)
+    fun from(attachmentPointer: AttachmentPointer): SignalServiceAttachmentRemoteId {
+      return if (attachmentPointer.cdnKey != null) {
+        V4(attachmentPointer.cdnKey)
+      } else if (attachmentPointer.cdnId != null && attachmentPointer.cdnId > 0) {
+        V2(attachmentPointer.cdnId)
+      } else {
+        throw InvalidMessageStructureException("AttachmentPointer CDN location not set")
+      }
+    }
+
+    /**
+     * Guesses that strings which contain values parseable to `long` should use an id-based
+     * CDN path. Otherwise, use key-based CDN path.
+     */
+    @JvmStatic
+    fun from(string: String): SignalServiceAttachmentRemoteId {
+      return string.toLongOrNull()?.let { V2(it) } ?: V4(string)
+    }
+  }
+}
diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/NonSuccessfulResponseCodeException.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/NonSuccessfulResponseCodeException.java
index df4e20cee1..c6c7090f60 100644
--- a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/NonSuccessfulResponseCodeException.java
+++ b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/NonSuccessfulResponseCodeException.java
@@ -13,16 +13,25 @@
  */
 public class NonSuccessfulResponseCodeException extends IOException {
 
-  private final int code;
+  private final int    code;
+  private final String body;
 
   public NonSuccessfulResponseCodeException(int code) {
     super("StatusCode: " + code);
     this.code = code;
+    this.body = null;
   }
 
   public NonSuccessfulResponseCodeException(int code, String s) {
     super("[" + code + "] " + s);
     this.code = code;
+    this.body = null;
+  }
+
+  public NonSuccessfulResponseCodeException(int code, String s, String body) {
+    super("[" + code + "] " + s);
+    this.code = code;
+    this.body = body;
   }
 
   public int getCode() {
@@ -36,4 +45,8 @@ public boolean is4xx() {
   public boolean is5xx() {
     return code >= 500 && code < 600;
   }
+
+  public String getBody() {
+    return body;
+  }
 }
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
new file mode 100644
index 0000000000..1eea96734c
--- /dev/null
+++ b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/registration/RegistrationApi.kt
@@ -0,0 +1,77 @@
+/*
+ * Copyright 2024 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+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.PreKeyCollection
+import org.whispersystems.signalservice.internal.push.BackupAuthCheckResponse
+import org.whispersystems.signalservice.internal.push.PushServiceSocket
+import org.whispersystems.signalservice.internal.push.RegistrationSessionMetadataResponse
+import org.whispersystems.signalservice.internal.push.VerifyAccountResponse
+import java.util.Locale
+
+/**
+ * Class to interact with various registration-related endpoints.
+ */
+class RegistrationApi(
+  private val pushServiceSocket: PushServiceSocket
+) {
+
+  /**
+   * Request that the service initialize a new registration session.
+   */
+  fun createRegistrationSession(fcmToken: String?, mcc: String?, mnc: String?): NetworkResult<RegistrationSessionMetadataResponse> {
+    return NetworkResult.fromFetch {
+      pushServiceSocket.createVerificationSession(fcmToken, mcc, mnc)
+    }
+  }
+
+  /**
+   * Submit an FCM token to the service as proof that this is an honest user attempting to register.
+   */
+  fun submitPushChallengeToken(sessionId: String?, pushChallengeToken: String?): NetworkResult<RegistrationSessionMetadataResponse> {
+    return NetworkResult.fromFetch {
+      pushServiceSocket.patchVerificationSession(sessionId, null, null, null, null, pushChallengeToken)
+    }
+  }
+
+  /**
+   * Request an SMS verification code.  On success, the server will send
+   * an SMS verification code to this Signal user.
+   *
+   * @param androidSmsRetrieverSupported whether the system framework will automatically parse the incoming verification message.
+   */
+  fun requestSmsVerificationCode(sessionId: String?, locale: Locale?, androidSmsRetrieverSupported: Boolean): NetworkResult<RegistrationSessionMetadataResponse> {
+    return NetworkResult.fromFetch {
+      pushServiceSocket.requestVerificationCode(sessionId, locale, androidSmsRetrieverSupported, PushServiceSocket.VerificationCodeTransport.SMS)
+    }
+  }
+
+  /**
+   * 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.
+   */
+  fun verifyAccount(verificationCode: String, sessionId: String): NetworkResult<RegistrationSessionMetadataResponse> {
+    return NetworkResult.fromFetch {
+      pushServiceSocket.submitVerificationCode(sessionId, verificationCode)
+    }
+  }
+
+  /**
+   * Submit the cryptographic assets required for an account to use the service.
+   */
+  fun registerAccount(sessionId: String?, recoveryPassword: String?, attributes: AccountAttributes?, aciPreKeys: PreKeyCollection?, pniPreKeys: PreKeyCollection?, fcmToken: String?, skipDeviceTransfer: Boolean): NetworkResult<VerifyAccountResponse> {
+    return NetworkResult.fromFetch {
+      pushServiceSocket.submitRegistrationRequest(sessionId, recoveryPassword, attributes, aciPreKeys, pniPreKeys, fcmToken, skipDeviceTransfer)
+    }
+  }
+
+  fun getSvrAuthCredential(e164: String, usernamePasswords: List<String>): NetworkResult<BackupAuthCheckResponse> {
+    return NetworkResult.fromFetch {
+      pushServiceSocket.checkBackupAuthCredentials(e164, usernamePasswords)
+    }
+  }
+}
diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/services/AttachmentService.kt b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/services/AttachmentService.kt
index 694b881697..b9299ed42a 100644
--- a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/services/AttachmentService.kt
+++ b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/services/AttachmentService.kt
@@ -4,8 +4,8 @@ import io.reactivex.rxjava3.core.Single
 import org.whispersystems.signalservice.api.SignalWebSocket
 import org.whispersystems.signalservice.internal.ServiceResponse
 import org.whispersystems.signalservice.internal.ServiceResponseProcessor
+import org.whispersystems.signalservice.internal.push.AttachmentUploadForm
 import org.whispersystems.signalservice.internal.push.AttachmentV2UploadAttributes
-import org.whispersystems.signalservice.internal.push.AttachmentV4UploadAttributes
 import org.whispersystems.signalservice.internal.websocket.DefaultResponseMapper
 import org.whispersystems.signalservice.internal.websocket.WebSocketRequestMessage
 import org.whispersystems.signalservice.internal.websocket.WebsocketResponse
@@ -29,7 +29,7 @@ class AttachmentService(private val signalWebSocket: SignalWebSocket) {
       .onErrorReturn { throwable: Throwable? -> ServiceResponse.forUnknownError(throwable) }
   }
 
-  fun getAttachmentV4UploadAttributes(): Single<ServiceResponse<AttachmentV4UploadAttributes>> {
+  fun getAttachmentV4UploadAttributes(): Single<ServiceResponse<AttachmentUploadForm>> {
     val requestMessage = WebSocketRequestMessage(
       id = SecureRandom().nextLong(),
       verb = "GET",
@@ -37,7 +37,7 @@ class AttachmentService(private val signalWebSocket: SignalWebSocket) {
     )
 
     return signalWebSocket.request(requestMessage)
-      .map { response: WebsocketResponse? -> DefaultResponseMapper.getDefault(AttachmentV4UploadAttributes::class.java).map(response) }
+      .map { response: WebsocketResponse? -> DefaultResponseMapper.getDefault(AttachmentUploadForm::class.java).map(response) }
       .onErrorReturn { throwable: Throwable? -> ServiceResponse.forUnknownError(throwable) }
   }
 
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 2549af2157..40d1bbc0e8 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,6 +19,7 @@
 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;
@@ -55,7 +56,7 @@ public final class CdsiV2Service {
 
   private final CdsiRequestHandler cdsiRequestHandler;
 
-  public CdsiV2Service(SignalServiceConfiguration configuration, String mrEnclave, @Nullable Network network) {
+  public CdsiV2Service(SignalServiceConfiguration configuration, String mrEnclave, @Nullable LibSignalNetwork 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 922c168dac..09721453d4 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
@@ -19,7 +19,7 @@
 import org.whispersystems.signalservice.internal.configuration.SignalServiceConfiguration;
 import org.whispersystems.signalservice.internal.push.BankMandate;
 import org.whispersystems.signalservice.internal.push.DonationProcessor;
-import org.whispersystems.signalservice.internal.push.DonationsConfiguration;
+import org.whispersystems.signalservice.internal.push.SubscriptionsConfiguration;
 import org.whispersystems.signalservice.internal.push.PushServiceSocket;
 
 import java.io.IOException;
@@ -42,8 +42,8 @@ public class DonationsService {
 
   private final PushServiceSocket pushServiceSocket;
 
-  private final AtomicReference<CacheEntry<DonationsConfiguration>> donationsConfigurationCache = new AtomicReference<>(null);
-  private final AtomicReference<CacheEntry<BankMandate>>            sepaBankMandateCache        = new AtomicReference<>(null);
+  private final AtomicReference<CacheEntry<SubscriptionsConfiguration>> donationsConfigurationCache = new AtomicReference<>(null);
+  private final AtomicReference<CacheEntry<BankMandate>>                sepaBankMandateCache        = new AtomicReference<>(null);
 
   private static class CacheEntry<T> {
     private final T      cachedValue;
@@ -111,7 +111,7 @@ public ServiceResponse<ReceiptCredentialResponse> submitBoostReceiptCredentialRe
     return wrapInServiceResponse(() -> new Pair<>(pushServiceSocket.submitBoostReceiptCredentials(paymentIntentId, receiptCredentialRequest, processor), 200));
   }
 
-  public ServiceResponse<DonationsConfiguration> getDonationsConfiguration(Locale locale) {
+  public ServiceResponse<SubscriptionsConfiguration> getDonationsConfiguration(Locale locale) {
     return getCachedValue(
         locale,
         donationsConfigurationCache,
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 1b3ddad5ba..55cdcaced2 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
@@ -18,6 +18,7 @@
 import org.whispersystems.signalservice.api.push.ServiceId;
 import org.whispersystems.signalservice.api.push.ServiceId.ACI;
 import org.whispersystems.signalservice.api.push.SignalServiceAddress;
+import org.whispersystems.signalservice.api.push.exceptions.AuthorizationFailedException;
 import org.whispersystems.signalservice.api.push.exceptions.MalformedResponseException;
 import org.whispersystems.signalservice.internal.ServiceResponse;
 import org.whispersystems.signalservice.internal.ServiceResponseProcessor;
@@ -37,6 +38,7 @@
 import java.util.Locale;
 import java.util.Map;
 import java.util.Optional;
+import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeUnit;
 import java.util.function.Function;
 import java.util.stream.Collectors;
@@ -150,7 +152,20 @@ private Single<ServiceResponse<ProfileAndCredential>> getProfileRestFallback(@No
                                                                                @Nonnull Locale locale)
   {
     return Single.fromFuture(receiver.retrieveProfile(address, profileKey, unidentifiedAccess, requestType, locale), 10, TimeUnit.SECONDS)
-                 .onErrorResumeNext(t -> Single.fromFuture(receiver.retrieveProfile(address, profileKey, Optional.empty(), requestType, locale), 10, TimeUnit.SECONDS))
+                 .onErrorResumeNext(t -> {
+                   Throwable error;
+                   if (t instanceof ExecutionException && t.getCause() != null) {
+                     error = t.getCause();
+                   } else {
+                     error = t;
+                   }
+
+                   if (error instanceof AuthorizationFailedException) {
+                     return Single.fromFuture(receiver.retrieveProfile(address, profileKey, Optional.empty(), requestType, locale), 10, TimeUnit.SECONDS);
+                   } else {
+                     return Single.error(t);
+                   }
+                 })
                  .map(p -> ServiceResponse.forResult(p, 0, null));
   }
 
@@ -158,7 +173,20 @@ private Single<ServiceResponse<ProfileAndCredential>> getProfileRestFallback(@No
                                                                                                    @Nonnull Optional<UnidentifiedAccess> unidentifiedAccess,
                                                                                                    @Nonnull ResponseMapper<IdentityCheckResponse> responseMapper) {
     return receiver.performIdentityCheck(request, unidentifiedAccess, responseMapper)
-                   .onErrorResumeNext(t -> receiver.performIdentityCheck(request, Optional.empty(), responseMapper));
+                   .onErrorResumeNext(t -> {
+                     Throwable error;
+                     if (t instanceof ExecutionException && t.getCause() != null) {
+                       error = t.getCause();
+                     } else {
+                       error = t;
+                     }
+
+                     if (error instanceof AuthorizationFailedException) {
+                       return receiver.performIdentityCheck(request, Optional.empty(), responseMapper);
+                     } else {
+                       return Single.error(t);
+                     }
+                   });
   }
 
   /**
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 b8d5522614..8ec9b7db75 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
@@ -56,12 +56,12 @@ public static AttachmentPointer createAttachmentPointer(SignalServiceAttachmentP
       builder.incrementalMacChunkSize(attachment.getIncrementalMacChunkSize());
     }
 
-    if (attachment.getRemoteId().getV2().isPresent()) {
-      builder.cdnId(attachment.getRemoteId().getV2().get());
+    if (attachment.getRemoteId() instanceof SignalServiceAttachmentRemoteId.V2) {
+      builder.cdnId(((SignalServiceAttachmentRemoteId.V2) attachment.getRemoteId()).getCdnId());
     }
 
-    if (attachment.getRemoteId().getV3().isPresent()) {
-      builder.cdnKey(attachment.getRemoteId().getV3().get());
+    if (attachment.getRemoteId() instanceof SignalServiceAttachmentRemoteId.V4) {
+      builder.cdnKey(((SignalServiceAttachmentRemoteId.V4) attachment.getRemoteId()).getCdnKey());
     }
 
     if (attachment.getFileName().isPresent()) {
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
new file mode 100644
index 0000000000..b4efe344bd
--- /dev/null
+++ b/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/AttachmentUploadForm.kt
@@ -0,0 +1,24 @@
+package org.whispersystems.signalservice.internal.push
+
+import com.fasterxml.jackson.annotation.JsonProperty
+
+/**
+ * Represents an attachment upload form that can be returned by various service endpoints.
+ */
+data class AttachmentUploadForm(
+  @JvmField
+  @JsonProperty
+  val cdn: Int,
+
+  @JvmField
+  @JsonProperty
+  val key: String,
+
+  @JvmField
+  @JsonProperty
+  val headers: Map<String, String>,
+
+  @JvmField
+  @JsonProperty
+  val signedUploadLocation: String
+)
diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/AttachmentV4UploadAttributes.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/AttachmentV4UploadAttributes.java
deleted file mode 100644
index 86cc4d2fb9..0000000000
--- a/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/AttachmentV4UploadAttributes.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package org.whispersystems.signalservice.internal.push;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import java.util.Map;
-
-public final class AttachmentV4UploadAttributes {
-    @JsonProperty
-    private int cdn;
-
-    @JsonProperty
-    private String key;
-
-    @JsonProperty
-    private Map<String, String> headers;
-
-    @JsonProperty
-    private String signedUploadLocation;
-
-    public AttachmentV4UploadAttributes() {
-    }
-
-    public int getCdn() {
-        return cdn;
-    }
-
-    public String getKey() {
-        return key;
-    }
-
-    public Map<String, String> getHeaders() {
-        return headers;
-    }
-
-    public String getSignedUploadLocation() {
-        return signedUploadLocation;
-    }
-}
diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/ProvisioningSocket.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/ProvisioningSocket.java
index 4ef58696d7..f9894897ef 100644
--- a/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/ProvisioningSocket.java
+++ b/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/ProvisioningSocket.java
@@ -7,6 +7,7 @@
 import org.whispersystems.signalservice.api.websocket.HealthMonitor;
 import org.whispersystems.signalservice.internal.configuration.SignalServiceConfiguration;
 import org.whispersystems.signalservice.internal.crypto.PrimaryProvisioningCipher;
+import org.whispersystems.signalservice.internal.websocket.OkHttpWebSocketConnection;
 import org.whispersystems.signalservice.internal.websocket.WebSocketConnection;
 import org.whispersystems.signalservice.internal.websocket.WebSocketRequestMessage;
 
@@ -21,7 +22,7 @@ public class ProvisioningSocket {
   private boolean connected = false;
 
   public ProvisioningSocket(SignalServiceConfiguration signalServiceConfiguration, String userAgent) {
-    connection = new WebSocketConnection(
+    connection = new OkHttpWebSocketConnection(
         "provisioning",
         signalServiceConfiguration,
         Optional.empty(),
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 7ece5cb386..bcd14d57ec 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
@@ -10,6 +10,7 @@
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.squareup.wire.Message;
 
+import org.jetbrains.annotations.NotNull;
 import org.signal.core.util.Base64;
 import org.signal.core.util.concurrent.FutureTransformers;
 import org.signal.core.util.concurrent.ListenableFuture;
@@ -51,13 +52,13 @@
 import org.whispersystems.signalservice.api.archive.ArchiveGetMediaItemsResponse;
 import org.whispersystems.signalservice.api.archive.ArchiveMediaRequest;
 import org.whispersystems.signalservice.api.archive.ArchiveMediaResponse;
-import org.whispersystems.signalservice.api.archive.ArchiveMessageBackupUploadFormResponse;
 import org.whispersystems.signalservice.api.archive.ArchiveServiceCredentialsResponse;
 import org.whispersystems.signalservice.api.archive.ArchiveSetBackupIdRequest;
 import org.whispersystems.signalservice.api.archive.ArchiveSetPublicKeyRequest;
 import org.whispersystems.signalservice.api.archive.BatchArchiveMediaRequest;
 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.groupsv2.CredentialResponse;
 import org.whispersystems.signalservice.api.groupsv2.GroupsV2AuthorizationString;
@@ -268,7 +269,7 @@ public class PushServiceSocket {
   private static final String STICKER_MANIFEST_PATH          = "stickers/%s/manifest.proto";
   private static final String STICKER_PATH                   = "stickers/%s/full/%d";
 
-  private static final String GROUPSV2_CREDENTIAL       = "/v1/certificate/auth/group?redemptionStartSeconds=%d&redemptionEndSeconds=%d&pniAsServiceId=true";
+  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";
@@ -312,21 +313,24 @@ public class PushServiceSocket {
   private static final String BACKUP_AUTH_CHECK = "/v2/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";
+  private static final String ARCHIVE_READ_CREDENTIALS    = "/v1/archives/auth/read?cdn=%d";
   private static final String ARCHIVE_BACKUP_ID           = "/v1/archives/backupid";
   private static final String ARCHIVE_PUBLIC_KEY          = "/v1/archives/keys";
   private static final String ARCHIVE_INFO                = "/v1/archives";
   private static final String ARCHIVE_MESSAGE_UPLOAD_FORM = "/v1/archives/upload/form";
+  private static final String ARCHIVE_MEDIA_UPLOAD_FORM   = "/v1/archives/media/upload/form";
   private static final String ARCHIVE_MEDIA               = "/v1/archives/media";
   private static final String ARCHIVE_MEDIA_LIST          = "/v1/archives/media?limit=%d";
   private static final String ARCHIVE_MEDIA_BATCH         = "/v1/archives/media/batch";
   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 CALL_LINK_CREATION_AUTH = "/v1/call-link/create-auth";
   private static final String SERVER_DELIVERED_TIMESTAMP_HEADER = "X-Signal-Timestamp";
 
-  private static final Map<String, String> NO_HEADERS = Collections.emptyMap();
-  private static final ResponseCodeHandler NO_HANDLER = new EmptyResponseCodeHandler();
+  private static final Map<String, String> NO_HEADERS            = Collections.emptyMap();
+  private static final ResponseCodeHandler NO_HANDLER            = new EmptyResponseCodeHandler();
+  private static final ResponseCodeHandler UNOPINIONATED_HANDLER = new UnopinionatedResponseCodeHandler();
 
   private static final long CDN2_RESUMABLE_LINK_LIFETIME_MILLIS = TimeUnit.DAYS.toMillis(7);
 
@@ -494,14 +498,14 @@ public ArchiveServiceCredentialsResponse getArchiveCredentials(long currentTime)
     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);
+    String response = makeServiceRequest(String.format(Locale.US, ARCHIVE_CREDENTIALS, secondsRoundedToNearestDay, endTimeInSeconds), "GET", null, NO_HEADERS, UNOPINIONATED_HANDLER, Optional.empty());
 
     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);
+    makeServiceRequest(ARCHIVE_BACKUP_ID, "PUT", body, NO_HEADERS, UNOPINIONATED_HANDLER, Optional.empty());
   }
 
   public void setArchivePublicKey(ECPublicKey publicKey, ArchiveCredentialPresentation credentialPresentation) throws IOException {
@@ -555,7 +559,7 @@ public ArchiveGetMediaItemsResponse getArchiveMediaItemsPage(ArchiveCredentialPr
   public ArchiveMediaResponse archiveAttachmentMedia(@Nonnull ArchiveCredentialPresentation credentialPresentation, @Nonnull ArchiveMediaRequest request) throws IOException {
     Map<String, String> headers = credentialPresentation.toHeaders();
 
-    String response = makeServiceRequestWithoutAuthentication(ARCHIVE_MEDIA, "PUT", JsonUtil.toJson(request), headers, NO_HANDLER);
+    String response = makeServiceRequestWithoutAuthentication(ARCHIVE_MEDIA, "PUT", JsonUtil.toJson(request), headers, UNOPINIONATED_HANDLER);
 
     return JsonUtil.fromJson(response, ArchiveMediaResponse.class);
   }
@@ -566,7 +570,7 @@ public ArchiveMediaResponse archiveAttachmentMedia(@Nonnull ArchiveCredentialPre
   public BatchArchiveMediaResponse archiveAttachmentMedia(@Nonnull ArchiveCredentialPresentation credentialPresentation, @Nonnull BatchArchiveMediaRequest request) throws IOException {
     Map<String, String> headers = credentialPresentation.toHeaders();
 
-    String response = makeServiceRequestWithoutAuthentication(ARCHIVE_MEDIA_BATCH, "PUT", JsonUtil.toJson(request), headers, NO_HANDLER);
+    String response = makeServiceRequestWithoutAuthentication(ARCHIVE_MEDIA_BATCH, "PUT", JsonUtil.toJson(request), headers, UNOPINIONATED_HANDLER);
 
     return JsonUtil.fromJson(response, BatchArchiveMediaResponse.class);
   }
@@ -580,13 +584,30 @@ public void deleteArchivedMedia(@Nonnull ArchiveCredentialPresentation credentia
     makeServiceRequestWithoutAuthentication(ARCHIVE_MEDIA_DELETE, "POST", JsonUtil.toJson(request), headers, NO_HANDLER);
   }
 
-  public ArchiveMessageBackupUploadFormResponse getArchiveMessageBackupUploadForm(ArchiveCredentialPresentation credentialPresentation) throws IOException {
+  public AttachmentUploadForm getArchiveMessageBackupUploadForm(ArchiveCredentialPresentation credentialPresentation) throws IOException {
     Map<String, String> headers = credentialPresentation.toHeaders();
 
     String response = makeServiceRequestWithoutAuthentication(ARCHIVE_MESSAGE_UPLOAD_FORM, "GET", null, headers, NO_HANDLER);
-    return JsonUtil.fromJson(response, ArchiveMessageBackupUploadFormResponse.class);
+    return JsonUtil.fromJson(response, AttachmentUploadForm.class);
   }
 
+  public AttachmentUploadForm getArchiveMediaUploadForm(@NotNull ArchiveCredentialPresentation credentialPresentation) throws IOException {
+    Map<String, String> headers = credentialPresentation.toHeaders();
+
+    String response = makeServiceRequestWithoutAuthentication(ARCHIVE_MEDIA_UPLOAD_FORM, "GET", null, headers, UNOPINIONATED_HANDLER);
+    return JsonUtil.fromJson(response, AttachmentUploadForm.class);
+  }
+
+  /**
+   * Copy and re-encrypt media from the attachments cdn into the backup cdn.
+   */
+  public GetArchiveCdnCredentialsResponse getArchiveCdnReadCredentials(int cdnNumber, @Nonnull ArchiveCredentialPresentation credentialPresentation) throws IOException {
+    Map<String, String> headers = credentialPresentation.toHeaders();
+
+    String response = makeServiceRequestWithoutAuthentication(String.format(Locale.US, ARCHIVE_READ_CREDENTIALS, cdnNumber), "GET", null, headers, NO_HANDLER);
+
+    return JsonUtil.fromJson(response, GetArchiveCdnCredentialsResponse.class);
+  }
 
   public VerifyAccountResponse changeNumber(@Nonnull ChangePhoneNumberRequest changePhoneNumberRequest)
       throws IOException
@@ -962,16 +983,27 @@ public void checkRepeatedUsePreKeys(ServiceIdType serviceIdType, byte[] digest)
     }, Optional.empty());
   }
 
-  public void retrieveAttachment(int cdnNumber, SignalServiceAttachmentRemoteId cdnPath, File destination, long maxSizeBytes, ProgressListener listener)
+  public void retrieveBackup(int cdnNumber, Map<String, String> headers, String cdnPath, File destination, long maxSizeBytes, ProgressListener listener)
+      throws MissingConfigurationException, IOException
+  {
+    downloadFromCdn(destination, cdnNumber, headers, cdnPath, maxSizeBytes, listener);
+  }
+
+  public void retrieveAttachment(int cdnNumber, Map<String, String> headers, SignalServiceAttachmentRemoteId cdnPath, File destination, long maxSizeBytes, ProgressListener listener)
       throws IOException, MissingConfigurationException
   {
     final String path;
-    if (cdnPath.getV2().isPresent()) {
-      path = String.format(Locale.US, ATTACHMENT_ID_DOWNLOAD_PATH, cdnPath.getV2().get());
+    if (cdnPath instanceof SignalServiceAttachmentRemoteId.V2) {
+      path = String.format(Locale.US, ATTACHMENT_ID_DOWNLOAD_PATH, ((SignalServiceAttachmentRemoteId.V2) cdnPath).getCdnId());
+    } else if (cdnPath instanceof SignalServiceAttachmentRemoteId.V4) {
+      path = String.format(Locale.US, ATTACHMENT_KEY_DOWNLOAD_PATH, ((SignalServiceAttachmentRemoteId.V4) cdnPath).getCdnKey());
+    } else if (cdnPath instanceof SignalServiceAttachmentRemoteId.Backup) {
+      SignalServiceAttachmentRemoteId.Backup backupCdnId = (SignalServiceAttachmentRemoteId.Backup) cdnPath;
+      path = String.format(Locale.US, ARCHIVE_MEDIA_DOWNLOAD_PATH, backupCdnId.getBackupDir(), backupCdnId.getMediaDir(), backupCdnId.getMediaId());
     } else {
-      path = String.format(Locale.US, ATTACHMENT_KEY_DOWNLOAD_PATH, cdnPath.getV3().get());
+      throw new IllegalArgumentException("Invalid cdnPath type: " + cdnPath.getClass().getSimpleName());
     }
-    downloadFromCdn(destination, cdnNumber, path, maxSizeBytes, listener);
+    downloadFromCdn(destination, cdnNumber, headers, path, maxSizeBytes, listener);
   }
 
   public byte[] retrieveSticker(byte[] packId, int stickerId)
@@ -980,7 +1012,7 @@ public byte[] retrieveSticker(byte[] packId, int stickerId)
     ByteArrayOutputStream output    = new ByteArrayOutputStream();
 
     try {
-      downloadFromCdn(output, 0, 0, String.format(Locale.US, STICKER_PATH, hexPackId, stickerId), 1024 * 1024, null);
+      downloadFromCdn(output, 0, 0, Collections.emptyMap(), String.format(Locale.US, STICKER_PATH, hexPackId, stickerId), 1024 * 1024, null);
     } catch (MissingConfigurationException e) {
       throw new AssertionError(e);
     }
@@ -994,7 +1026,7 @@ public byte[] retrieveStickerManifest(byte[] packId)
     ByteArrayOutputStream output    = new ByteArrayOutputStream();
 
     try {
-      downloadFromCdn(output, 0, 0, String.format(STICKER_MANIFEST_PATH, hexPackId), 1024 * 1024, null);
+      downloadFromCdn(output, 0, 0, Collections.emptyMap(), String.format(STICKER_MANIFEST_PATH, hexPackId), 1024 * 1024, null);
     } catch (MissingConfigurationException e) {
       throw new AssertionError(e);
     }
@@ -1072,7 +1104,7 @@ public void retrieveProfileAvatar(String path, File destination, long maxSizeByt
       throws IOException
   {
     try {
-      downloadFromCdn(destination, 0, path, maxSizeBytes, null);
+      downloadFromCdn(destination, 0, Collections.emptyMap(), path, maxSizeBytes, null);
     } catch (MissingConfigurationException e) {
       throw new AssertionError(e);
     }
@@ -1148,6 +1180,11 @@ 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);
+  }
+
   private Single<ServiceResponse<BackupAuthCheckResponse>> createBackupAuthCheckSingle(@Nonnull String path,
                                                                                        @Nonnull BackupAuthCheckRequest request,
                                                                                        @Nonnull ResponseMapper<BackupAuthCheckResponse> responseMapper)
@@ -1368,11 +1405,11 @@ public ReceiptCredentialResponse submitBoostReceiptCredentials(String paymentInt
   /**
    * Get the DonationsConfiguration pointed at by /v1/subscriptions/configuration
    */
-  public DonationsConfiguration getDonationsConfiguration(Locale locale) throws IOException {
+  public SubscriptionsConfiguration getDonationsConfiguration(Locale locale) throws IOException {
     Map<String, String> headers = Collections.singletonMap("Accept-Language", locale.getLanguage() + "-" + locale.getCountry());
     String              result  = makeServiceRequestWithoutAuthentication(DONATIONS_CONFIGURATION, "GET", null, headers, NO_HANDLER);
 
-    return JsonUtil.fromJson(result, DonationsConfiguration.class);
+    return JsonUtil.fromJson(result, SubscriptionsConfiguration.class);
   }
 
   /**
@@ -1542,12 +1579,12 @@ public AttachmentV2UploadAttributes getAttachmentV2UploadAttributes()
     }
   }
 
-  public AttachmentV4UploadAttributes getAttachmentV4UploadAttributes()
+  public AttachmentUploadForm getAttachmentV4UploadAttributes()
       throws NonSuccessfulResponseCodeException, PushNetworkException, MalformedResponseException
   {
     String response = makeServiceRequest(ATTACHMENT_V4_PATH, "GET", null);
     try {
-      return JsonUtil.fromJson(response, AttachmentV4UploadAttributes.class);
+      return JsonUtil.fromJson(response, AttachmentUploadForm.class);
     } catch (IOException e) {
       Log.w(TAG, e);
       throw new MalformedResponseException("Unable to parse entity", e);
@@ -1582,14 +1619,14 @@ public Pair<Long, AttachmentDigest> uploadAttachment(PushAttachmentData attachme
     return new Pair<>(id, digest);
   }
 
-  public ResumableUploadSpec getResumableUploadSpec(AttachmentV4UploadAttributes uploadAttributes) throws IOException {
+  public ResumableUploadSpec getResumableUploadSpec(AttachmentUploadForm uploadForm) throws IOException {
     return new ResumableUploadSpec(Util.getSecretBytes(64),
                                    Util.getSecretBytes(16),
-                                   uploadAttributes.getKey(),
-                                   uploadAttributes.getCdn(),
-                                   getResumableUploadUrl(uploadAttributes.getCdn(), uploadAttributes.getSignedUploadLocation(), uploadAttributes.getHeaders()),
+                                   uploadForm.key,
+                                   uploadForm.cdn,
+                                   getResumableUploadUrl(uploadForm),
                                    System.currentTimeMillis() + CDN2_RESUMABLE_LINK_LIFETIME_MILLIS,
-                                   uploadAttributes.getHeaders());
+                                   uploadForm.headers);
   }
 
   public AttachmentDigest uploadAttachment(PushAttachmentData attachment) throws IOException {
@@ -1620,15 +1657,15 @@ public AttachmentDigest uploadAttachment(PushAttachmentData attachment) throws I
     }
   }
 
-  private void downloadFromCdn(File destination, int cdnNumber, String path, long maxSizeBytes, ProgressListener listener)
+  private void downloadFromCdn(File destination, int cdnNumber, Map<String, String> headers, String path, long maxSizeBytes, ProgressListener listener)
       throws IOException, MissingConfigurationException
   {
     try (FileOutputStream outputStream = new FileOutputStream(destination, true)) {
-      downloadFromCdn(outputStream, destination.length(), cdnNumber, path, maxSizeBytes, listener);
+      downloadFromCdn(outputStream, destination.length(), cdnNumber, headers, path, maxSizeBytes, listener);
     }
   }
 
-  private void downloadFromCdn(OutputStream outputStream, long offset, int cdnNumber, String path, long maxSizeBytes, ProgressListener listener)
+  private void downloadFromCdn(OutputStream outputStream, long offset, int cdnNumber, Map<String, String> headers, String path, long maxSizeBytes, ProgressListener listener)
       throws PushNetworkException, NonSuccessfulResponseCodeException, MissingConfigurationException {
     ConnectionHolder[] cdnNumberClients = cdnClientsMap.get(cdnNumber);
     if (cdnNumberClients == null) {
@@ -1647,6 +1684,10 @@ private void downloadFromCdn(OutputStream outputStream, long offset, int cdnNumb
       request.addHeader("Host", connectionHolder.getHostHeader().get());
     }
 
+    for (Map.Entry<String, String> header : headers.entrySet()) {
+      request.addHeader(header.getKey(), header.getValue());
+    }
+
     if (offset > 0) {
       Log.i(TAG, "Starting download from CDN with offset " + offset);
       request.addHeader("Range", "bytes=" + offset + "-");
@@ -1756,22 +1797,18 @@ private AttachmentDigest uploadToCdn0(String path, String acl, String key, Strin
     }
   }
 
-  public String getResumableUploadUrl(ArchiveMessageBackupUploadFormResponse uploadFormResponse) throws IOException {
-    return getResumableUploadUrl(uploadFormResponse.getCdn(), uploadFormResponse.getSignedUploadLocation(), uploadFormResponse.getHeaders());
-  }
-
-  private String getResumableUploadUrl(int cdn, String signedUrl, Map<String, String> headers) throws IOException {
-    ConnectionHolder connectionHolder = getRandom(cdnClientsMap.get(cdn), random);
+  public String getResumableUploadUrl(AttachmentUploadForm uploadForm) throws IOException {
+    ConnectionHolder connectionHolder = getRandom(cdnClientsMap.get(uploadForm.cdn), random);
     OkHttpClient     okHttpClient     = connectionHolder.getClient()
                                                         .newBuilder()
                                                         .connectTimeout(soTimeoutMillis, TimeUnit.MILLISECONDS)
                                                         .readTimeout(soTimeoutMillis, TimeUnit.MILLISECONDS)
                                                         .build();
 
-    Request.Builder request = new Request.Builder().url(buildConfiguredUrl(connectionHolder, signedUrl))
+    Request.Builder request = new Request.Builder().url(buildConfiguredUrl(connectionHolder, uploadForm.signedUploadLocation))
                                                    .post(RequestBody.create(null, ""));
 
-    for (Map.Entry<String, String> header : headers.entrySet()) {
+    for (Map.Entry<String, String> header : uploadForm.headers.entrySet()) {
       if (!header.getKey().equalsIgnoreCase("host")) {
         request.header(header.getKey(), header.getValue());
       }
@@ -1783,13 +1820,13 @@ private String getResumableUploadUrl(int cdn, String signedUrl, Map<String, Stri
 
     request.addHeader("Content-Length", "0");
 
-    if (cdn == 2) {
+    if (uploadForm.cdn == 2) {
       request.addHeader("Content-Type", "application/octet-stream");
-    } else if (cdn == 3) {
+    } else if (uploadForm.cdn == 3) {
       request.addHeader("Upload-Defer-Length", "1")
              .addHeader("Tus-Resumable", "1.0.0");
     } else {
-      throw new AssertionError("Unknown CDN version: " + cdn);
+      throw new AssertionError("Unknown CDN version: " + uploadForm.cdn);
     }
 
     Call call = okHttpClient.newCall(request.build());
@@ -1862,8 +1899,8 @@ private AttachmentDigest uploadToCdn2(String resumableUrl, InputStream data, Str
     }
   }
 
-  public void uploadBackupFile(ArchiveMessageBackupUploadFormResponse uploadFormResponse, String resumableUploadUrl, InputStream data, long dataLength) throws IOException {
-    uploadToCdn3(resumableUploadUrl, data, "application/octet-stream", dataLength, false, new NoCipherOutputStreamFactory(), null, null, uploadFormResponse.getHeaders());
+  public void uploadBackupFile(AttachmentUploadForm uploadForm, String resumableUploadUrl, InputStream data, long dataLength) throws IOException {
+    uploadToCdn3(resumableUploadUrl, data, "application/octet-stream", dataLength, false, new NoCipherOutputStreamFactory(), null, null, uploadForm.headers);
   }
 
   private AttachmentDigest uploadToCdn3(String resumableUrl,
@@ -2586,6 +2623,7 @@ private static <T> T readResponseJson(Response response, Class<T> clazz)
       return readBodyJson(response.body(), clazz);
   }
 
+
   public enum VerificationCodeTransport { SMS, VOICE }
 
   private static class RegistrationLock {
@@ -2676,6 +2714,28 @@ private static class EmptyResponseCodeHandler implements ResponseCodeHandler {
     public void handle(int responseCode, ResponseBody body) { }
   }
 
+  /**
+   * A {@link ResponseCodeHandler} that only throws {@link NonSuccessfulResponseCodeException} with the response body.
+   * Any further processing is left to the caller.
+   */
+  private static class UnopinionatedResponseCodeHandler implements ResponseCodeHandler {
+    @Override
+    public void handle(int responseCode, ResponseBody body) throws NonSuccessfulResponseCodeException, PushNetworkException {
+      if (responseCode < 200 || responseCode > 299) {
+        String bodyString = null;
+        if (body != null) {
+          try {
+            bodyString = readBodyString(body);
+          } catch (MalformedResponseException e) {
+            Log.w(TAG, "Failed to read body string", e);
+          }
+        }
+
+        throw new NonSuccessfulResponseCodeException(responseCode, "Response: " + responseCode, bodyString);
+      }
+    }
+  }
+
   public enum ClientSet { KeyBackup }
 
   public CredentialResponse retrieveGroupsV2Credentials(long todaySeconds)
@@ -3036,7 +3096,6 @@ public void handle(int responseCode, ResponseBody body) throws NonSuccessfulResp
     }
   }
 
-
   private static RegistrationSessionMetadataResponse parseSessionMetadataResponse(Response response) throws IOException {
     long serverDeliveredTimestamp = 0;
     try {
diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/DonationsConfiguration.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/SubscriptionsConfiguration.java
similarity index 90%
rename from libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/DonationsConfiguration.java
rename to libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/SubscriptionsConfiguration.java
index 52a5fc81b2..8cc0d6792b 100644
--- a/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/DonationsConfiguration.java
+++ b/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/SubscriptionsConfiguration.java
@@ -14,7 +14,7 @@
 /**
  * Response JSON for a call to /v1/subscriptions/configuration
  */
-public class DonationsConfiguration {
+public class SubscriptionsConfiguration {
 
   public static final String PAYPAL     = "PAYPAL";
   public static final String CARD       = "CARD";
@@ -44,6 +44,9 @@ public static class CurrencyConfiguration {
     @JsonProperty("subscription")
     private Map<Integer, BigDecimal> subscription;
 
+    @JsonProperty("backupSubscription")
+    private Map<Integer, BigDecimal> backupSubscription;
+
     @JsonProperty("supportedPaymentMethods")
     private Set<String> supportedPaymentMethods;
 
@@ -59,6 +62,10 @@ public Map<Integer, BigDecimal> getSubscription() {
       return subscription;
     }
 
+    public Map<Integer, BigDecimal> getBackupSubscription() {
+      return backupSubscription;
+    }
+
     public Set<String> getSupportedPaymentMethods() {
       return supportedPaymentMethods;
     }
diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/websocket/LibSignalChatConnection.kt b/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/websocket/LibSignalChatConnection.kt
new file mode 100644
index 0000000000..6c3c1cd602
--- /dev/null
+++ b/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/websocket/LibSignalChatConnection.kt
@@ -0,0 +1,220 @@
+/*
+ * Copyright 2024 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.whispersystems.signalservice.internal.websocket
+
+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 io.reactivex.rxjava3.subjects.SingleSubject
+import org.signal.core.util.logging.Log
+import org.signal.libsignal.internal.CompletableFuture
+import org.signal.libsignal.net.ChatService
+import org.whispersystems.signalservice.api.websocket.HealthMonitor
+import org.whispersystems.signalservice.api.websocket.WebSocketConnectionState
+import java.time.Instant
+import java.util.Optional
+import kotlin.time.Duration.Companion.seconds
+import org.signal.libsignal.net.ChatService.Request as LibSignalRequest
+import org.signal.libsignal.net.ChatService.Response as LibSignalResponse
+
+/**
+ * Implements the WebSocketConnection interface via libsignal-net
+ *
+ * Notable implementation choices:
+ * - [chatService] contains both the authenticated and unauthenticated connections,
+ *   which one to use for [sendRequest]/[sendResponse] is based on [isAuthenticated].
+ * - keep-alive requests always use the [org.signal.libsignal.net.ChatService.unauthenticatedSendAndDebug]
+ *   API, and log the debug info on success.
+ * - regular sends use [org.signal.libsignal.net.ChatService.unauthenticatedSend] and don't create any overhead.
+ * - [org.whispersystems.signalservice.api.websocket.WebSocketConnectionState] reporting is implemented
+ *   as close as possible to the original implementation in
+ *   [org.whispersystems.signalservice.internal.websocket.OkHttpWebSocketConnection].
+ */
+class LibSignalChatConnection(
+  name: String,
+  private val chatService: ChatService,
+  private val healthMonitor: HealthMonitor,
+  val isAuthenticated: Boolean
+) : WebSocketConnection {
+
+  companion object {
+    private val TAG = Log.tag(LibSignalChatConnection::class.java)
+    private val SEND_TIMEOUT: Long = 10.seconds.inWholeMilliseconds
+
+    private val KEEP_ALIVE_REQUEST = LibSignalRequest(
+      "GET",
+      "/v1/keepalive",
+      emptyMap(),
+      ByteArray(0),
+      SEND_TIMEOUT.toInt()
+    )
+  }
+
+  override val name = "[$name:${System.identityHashCode(this)}]"
+
+  override var keepAlive = true
+
+  val state = BehaviorSubject.createDefault(WebSocketConnectionState.DISCONNECTED)
+
+  override fun connect(): Observable<WebSocketConnectionState> {
+    Log.i(TAG, "$name Connecting...")
+    state.onNext(WebSocketConnectionState.CONNECTING)
+    val connect = if (isAuthenticated) {
+      chatService::connectAuthenticated
+    } else {
+      chatService::connectUnauthenticated
+    }
+    connect()
+      .whenComplete(
+        onSuccess = { debugInfo ->
+          Log.i(TAG, "$name Connected")
+          Log.d(TAG, "$name $debugInfo")
+          state.onNext(WebSocketConnectionState.CONNECTED)
+        },
+        onFailure = { throwable ->
+          // TODO: [libsignal-net] Report WebSocketConnectionState.AUTHENTICATION_FAILED for 401 and 403 errors
+          Log.d(TAG, "$name Connect failed", throwable)
+          state.onNext(WebSocketConnectionState.FAILED)
+        }
+      )
+    return state
+  }
+
+  override fun isDead(): Boolean = false
+
+  override fun disconnect() {
+    Log.i(TAG, "$name Disconnecting...")
+    state.onNext(WebSocketConnectionState.DISCONNECTING)
+    chatService.disconnect()
+      .whenComplete(
+        onSuccess = {
+          Log.i(TAG, "$name Disconnected")
+          state.onNext(WebSocketConnectionState.DISCONNECTED)
+        },
+        onFailure = { throwable ->
+          Log.d(TAG, "$name Disconnect failed", throwable)
+          state.onNext(WebSocketConnectionState.DISCONNECTED)
+        }
+      )
+  }
+
+  override fun sendRequest(request: WebSocketRequestMessage): Single<WebsocketResponse> {
+    val single = SingleSubject.create<WebsocketResponse>()
+    val internalRequest = request.toLibSignalRequest()
+    val send = if (isAuthenticated) {
+      throw NotImplementedError("Authenticated socket is not yet supported")
+    } else {
+      chatService::unauthenticatedSend
+    }
+    send(internalRequest)
+      .whenComplete(
+        onSuccess = { response ->
+          when (response!!.status) {
+            in 400..599 -> {
+              healthMonitor.onMessageError(response.status, false)
+            }
+          }
+          // Here success means "we received the response" even if it is reporting an error.
+          // This is consistent with the behavior of the OkHttpWebSocketConnection.
+          single.onSuccess(response.toWebsocketResponse(isUnidentified = !isAuthenticated))
+        },
+        onFailure = { throwable ->
+          Log.i(TAG, "$name sendRequest failed", throwable)
+          single.onError(throwable)
+        }
+      )
+    return single.subscribeOn(Schedulers.io()).observeOn(Schedulers.io())
+  }
+
+  override fun sendKeepAlive() {
+    Log.i(TAG, "$name Sending keep alive...")
+    val send = if (isAuthenticated) {
+      throw NotImplementedError("Authenticated socket is not yet supported")
+    } else {
+      chatService::unauthenticatedSendAndDebug
+    }
+    send(KEEP_ALIVE_REQUEST)
+      .whenComplete(
+        onSuccess = { debugResponse ->
+          Log.i(TAG, "$name Keep alive - success")
+          Log.d(TAG, "$name $debugResponse")
+          when (debugResponse!!.response.status) {
+            in 200..299 -> {
+              healthMonitor.onKeepAliveResponse(
+                Instant.now().toEpochMilli(), // ignored. can be any value
+                false,
+                keepAlive
+              )
+            }
+
+            in 400..599 -> {
+              healthMonitor.onMessageError(debugResponse.response.status, isAuthenticated)
+            }
+
+            else -> {
+              Log.w(TAG, "$name Unsupported keep alive response status: ${debugResponse.response.status}")
+            }
+          }
+        },
+        onFailure = { throwable ->
+          Log.i(TAG, "$name Keep alive - failed")
+          Log.d(TAG, "$name $throwable")
+          state.onNext(WebSocketConnectionState.DISCONNECTED)
+        }
+      )
+  }
+
+  override fun readRequestIfAvailable(): Optional<WebSocketRequestMessage> {
+    throw NotImplementedError()
+  }
+
+  override fun readRequest(timeoutMillis: Long): WebSocketRequestMessage {
+    throw NotImplementedError()
+  }
+
+  override fun sendResponse(response: WebSocketResponseMessage?) {
+    throw NotImplementedError()
+  }
+
+  private fun WebSocketRequestMessage.toLibSignalRequest(timeout: Long = SEND_TIMEOUT): LibSignalRequest {
+    return LibSignalRequest(
+      this.verb?.uppercase() ?: "GET",
+      this.path ?: "",
+      this.headers.associate {
+        val parts = it.split(':', limit = 2)
+        if (parts.size != 2) {
+          throw IllegalArgumentException("Headers must contain at least one colon")
+        }
+        parts[0] to parts[1]
+      },
+      this.body?.toByteArray() ?: byteArrayOf(),
+      timeout.toInt()
+    )
+  }
+
+  private fun LibSignalResponse.toWebsocketResponse(isUnidentified: Boolean): WebsocketResponse {
+    return WebsocketResponse(
+      this.status,
+      this.body.decodeToString(),
+      this.headers,
+      isUnidentified
+    )
+  }
+
+  private fun <T> CompletableFuture<T>.whenComplete(
+    onSuccess: ((T?) -> Unit),
+    onFailure: ((Throwable) -> Unit)
+  ): CompletableFuture<T> {
+    return this.whenComplete { value, throwable ->
+      if (throwable != null) {
+        onFailure(throwable)
+      } else {
+        onSuccess(value)
+      }
+    }
+  }
+}
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
new file mode 100644
index 0000000000..6e7b75024b
--- /dev/null
+++ b/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/websocket/LibSignalNetwork.kt
@@ -0,0 +1,50 @@
+/*
+ * Copyright 2024 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.whispersystems.signalservice.internal.websocket
+
+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.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(private val inner: Network, config: SignalServiceConfiguration) {
+  init {
+    resetSettings(config)
+  }
+
+  fun createChatService(
+    credentialsProvider: CredentialsProvider? = null
+  ): ChatService {
+    val username = credentialsProvider?.username ?: ""
+    val password = credentialsProvider?.password ?: ""
+    return inner.createChatService(username, password)
+  }
+
+  fun resetSettings(config: SignalServiceConfiguration) {
+    // TODO: MOLLY
+    // resetProxy(config.signalProxy.orNull())
+  }
+
+  // Delegates
+  @Throws(IOException::class, InterruptedException::class, ExecutionException::class)
+  fun cdsiLookup(
+    username: String?,
+    password: String?,
+    request: CdsiLookupRequest?,
+    tokenConsumer: Consumer<ByteArray?>
+  ): CompletableFuture<CdsiLookupResponse?>? {
+    return inner.cdsiLookup(username, password, request, tokenConsumer)
+  }
+}
diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/websocket/WebSocketConnection.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/websocket/OkHttpWebSocketConnection.java
similarity index 91%
rename from libsignal-service/src/main/java/org/whispersystems/signalservice/internal/websocket/WebSocketConnection.java
rename to libsignal-service/src/main/java/org/whispersystems/signalservice/internal/websocket/OkHttpWebSocketConnection.java
index 976ad50c90..02970aeb13 100644
--- a/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/websocket/WebSocketConnection.java
+++ b/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/websocket/OkHttpWebSocketConnection.java
@@ -2,7 +2,6 @@
 
 import org.signal.libsignal.protocol.logging.Log;
 import org.signal.libsignal.protocol.util.Pair;
-import org.whispersystems.signalservice.api.push.SignalServiceAddress;
 import org.whispersystems.signalservice.api.push.TrustStore;
 import org.whispersystems.signalservice.api.util.CredentialsProvider;
 import org.whispersystems.signalservice.api.util.Tls12SocketFactory;
@@ -24,7 +23,6 @@
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
-import java.util.Objects;
 import java.util.Optional;
 import java.util.Set;
 import java.util.concurrent.TimeUnit;
@@ -51,10 +49,10 @@
 import okhttp3.WebSocketListener;
 import okio.ByteString;
 
-public class WebSocketConnection extends WebSocketListener {
+public class OkHttpWebSocketConnection extends WebSocketListener implements WebSocketConnection {
 
-  private static final String TAG                         = WebSocketConnection.class.getSimpleName();
-  public  static final int    KEEPALIVE_FREQUENCY_SECONDS = 30;
+  private static final String TAG                         = OkHttpWebSocketConnection.class.getSimpleName();
+  public static final  int    KEEPALIVE_FREQUENCY_SECONDS = 30;
 
   private final LinkedList<WebSocketRequestMessage> incomingRequests = new LinkedList<>();
   private final Map<Long, OutgoingRequest>          outgoingRequests = new HashMap<>();
@@ -79,22 +77,22 @@ public class WebSocketConnection extends WebSocketListener {
 
   private boolean keepAlive;
 
-  public WebSocketConnection(String name,
-                             SignalServiceConfiguration serviceConfiguration,
-                             Optional<CredentialsProvider> credentialsProvider,
-                             String signalAgent,
-                             HealthMonitor healthMonitor,
-                             boolean allowStories) {
+  public OkHttpWebSocketConnection(String name,
+                                   SignalServiceConfiguration serviceConfiguration,
+                                   Optional<CredentialsProvider> credentialsProvider,
+                                   String signalAgent,
+                                   HealthMonitor healthMonitor,
+                                   boolean allowStories) {
     this(name, serviceConfiguration, credentialsProvider, signalAgent, healthMonitor, "", allowStories);
   }
 
-  public WebSocketConnection(String name,
-                             SignalServiceConfiguration serviceConfiguration,
-                             Optional<CredentialsProvider> credentialsProvider,
-                             String signalAgent,
-                             HealthMonitor healthMonitor,
-                             String extraPathUri,
-                             boolean allowStories)
+  public OkHttpWebSocketConnection(String name,
+                                   SignalServiceConfiguration serviceConfiguration,
+                                   Optional<CredentialsProvider> credentialsProvider,
+                                   String signalAgent,
+                                   HealthMonitor healthMonitor,
+                                   String extraPathUri,
+                                   boolean allowStories)
   {
     this.name                = "[" + name + ":" + System.identityHashCode(this) + "]";
     this.trustStore          = serviceConfiguration.getSignalServiceUrls()[0].getTrustStore();
@@ -113,10 +111,17 @@ public WebSocketConnection(String name,
     this.random              = new SecureRandom();
   }
 
+  @Override
   public String getName() {
     return name;
   }
 
+  @Override
+  public boolean getKeepAlive() {
+    return keepAlive;
+  }
+
+  @Override
   public void setKeepAlive(boolean keepAlive) {
     this.keepAlive = keepAlive;
   }
@@ -132,6 +137,7 @@ private Pair<SignalServiceUrl, String> getConnectionInfo() {
     }
   }
 
+  @Override
   public synchronized Observable<WebSocketConnectionState> connect() {
     log("connect()");
 
@@ -139,7 +145,7 @@ public synchronized Observable<WebSocketConnectionState> connect() {
       Pair<SignalServiceUrl, String> connectionInfo = getConnectionInfo();
       SignalServiceUrl               serviceUrl     = connectionInfo.first();
       String                         wsUri          = connectionInfo.second();
-      String filledUri;
+      String                         filledUri;
 
       if (credentialsProvider.isPresent()) {
         filledUri = String.format(wsUri, credentialsProvider.get().getUsername(), credentialsProvider.get().getPassword());
@@ -184,10 +190,12 @@ public synchronized Observable<WebSocketConnectionState> connect() {
     return webSocketState;
   }
 
+  @Override
   public synchronized boolean isDead() {
     return client == null;
   }
 
+  @Override
   public synchronized void disconnect() {
     log("disconnect()");
 
@@ -200,6 +208,7 @@ public synchronized void disconnect() {
     notifyAll();
   }
 
+  @Override
   public synchronized Optional<WebSocketRequestMessage> readRequestIfAvailable() {
     if (incomingRequests.size() > 0) {
       return Optional.of(incomingRequests.removeFirst());
@@ -208,6 +217,7 @@ public synchronized Optional<WebSocketRequestMessage> readRequestIfAvailable() {
     }
   }
 
+  @Override
   public synchronized WebSocketRequestMessage readRequest(long timeoutMillis)
       throws TimeoutException, IOException
   {
@@ -230,6 +240,7 @@ public synchronized WebSocketRequestMessage readRequest(long timeoutMillis)
     }
   }
 
+  @Override
   public synchronized Single<WebsocketResponse> sendRequest(WebSocketRequestMessage request) throws IOException {
     if (client == null) {
       throw new IOException("No connection!");
@@ -253,6 +264,7 @@ public synchronized Single<WebsocketResponse> sendRequest(WebSocketRequestMessag
                  .timeout(10, TimeUnit.SECONDS, Schedulers.io());
   }
 
+  @Override
   public synchronized void sendResponse(WebSocketResponseMessage response) throws IOException {
     if (client == null) {
       throw new IOException("Connection closed!");
@@ -268,9 +280,10 @@ public synchronized void sendResponse(WebSocketResponseMessage response) throws
     }
   }
 
+  @Override
   public synchronized void sendKeepAlive() throws IOException {
     if (client != null && keepAlive) {
-      log( "Sending keep alive...");
+      log("Sending keep alive...");
       long id = System.currentTimeMillis();
       byte[] message = new WebSocketMessage.Builder()
                                            .type(WebSocketMessage.Type.REQUEST)
@@ -307,7 +320,7 @@ public synchronized void onMessage(WebSocket webSocket, ByteString payload) {
         OutgoingRequest listener = outgoingRequests.remove(message.response.id);
         if (listener != null) {
           listener.onSuccess(new WebsocketResponse(message.response.status,
-                                                   new String(message.response.body.toByteArray()),
+                                                   message.response.body == null ? "" : new String(message.response.body.toByteArray()),
                                                    message.response.headers,
                                                    !credentialsProvider.isPresent()));
           if (message.response.status >= 400) {
diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/websocket/WebSocketConnection.kt b/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/websocket/WebSocketConnection.kt
new file mode 100644
index 0000000000..83949d61cd
--- /dev/null
+++ b/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/websocket/WebSocketConnection.kt
@@ -0,0 +1,41 @@
+package org.whispersystems.signalservice.internal.websocket
+
+import io.reactivex.rxjava3.core.Observable
+import io.reactivex.rxjava3.core.Single
+import org.whispersystems.signalservice.api.websocket.WebSocketConnectionState
+import java.io.IOException
+import java.util.Optional
+import java.util.concurrent.TimeoutException
+
+/**
+ * Common interface for the web socket connection API
+ *
+ * At the time of this writing there are two implementations available:
+ *  - OkHttpWebSocketConnection - the original Android client implementation in Java using OkHttp library
+ *  - LibSignalChatConnection - the wrapper around libsignal's [org.signal.libsignal.net.ChatService]
+ */
+interface WebSocketConnection {
+  val name: String
+
+  var keepAlive: Boolean
+
+  fun connect(): Observable<WebSocketConnectionState>
+
+  fun isDead(): Boolean
+
+  fun disconnect()
+
+  @Throws(IOException::class)
+  fun sendRequest(request: WebSocketRequestMessage): Single<WebsocketResponse>
+
+  @Throws(IOException::class)
+  fun sendKeepAlive()
+
+  fun readRequestIfAvailable(): Optional<WebSocketRequestMessage>
+
+  @Throws(TimeoutException::class, IOException::class)
+  fun readRequest(timeoutMillis: Long): WebSocketRequestMessage
+
+  @Throws(IOException::class)
+  fun sendResponse(response: WebSocketResponseMessage?)
+}
diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/websocket/WebsocketResponse.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/websocket/WebsocketResponse.java
index 79ae17c9b2..940aa0aba8 100644
--- a/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/websocket/WebsocketResponse.java
+++ b/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/websocket/WebsocketResponse.java
@@ -15,9 +15,13 @@ public class WebsocketResponse {
   private final boolean             unidentified;
 
   WebsocketResponse(int status, String body, List<String> headers, boolean unidentified) {
+    this(status, body, parseHeaders(headers), unidentified);
+  }
+
+  WebsocketResponse(int status, String body, Map<String, String> headerMap, boolean unidentified) {
     this.status       = status;
     this.body         = body;
-    this.headers      = parseHeaders(headers);
+    this.headers      = headerMap;
     this.unidentified = unidentified;
   }
 
@@ -41,7 +45,7 @@ private static Map<String, String> parseHeaders(List<String> rawHeaders) {
     Map<String, String> headers = new HashMap<>(rawHeaders.size());
 
     for (String raw : rawHeaders) {
-      if (raw != null && raw.length() > 0) {
+      if (raw != null && !raw.isEmpty()) {
         int colonIndex = raw.indexOf(":");
 
         if (colonIndex > 0 && colonIndex < raw.length() - 1) {
diff --git a/libsignal-service/src/main/protowire/SignalService.proto b/libsignal-service/src/main/protowire/SignalService.proto
index cda81d99a2..4fa93c6a4b 100644
--- a/libsignal-service/src/main/protowire/SignalService.proto
+++ b/libsignal-service/src/main/protowire/SignalService.proto
@@ -637,8 +637,9 @@ message SyncMessage {
 
   message CallLogEvent {
     enum Type {
-      CLEAR          = 0;
-      MARKED_AS_READ = 1;
+      CLEAR                          = 0;
+      MARKED_AS_READ                 = 1;
+      MARKED_AS_READ_IN_CONVERSATION = 2;
     }
 
     optional Type   type          = 1;
diff --git a/libsignal-service/src/test/java/org/whispersystems/signalservice/api/NetworkResultTest.kt b/libsignal-service/src/test/java/org/whispersystems/signalservice/api/NetworkResultTest.kt
new file mode 100644
index 0000000000..591ee17d11
--- /dev/null
+++ b/libsignal-service/src/test/java/org/whispersystems/signalservice/api/NetworkResultTest.kt
@@ -0,0 +1,221 @@
+/*
+ * Copyright 2024 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.whispersystems.signalservice.api
+
+import org.junit.Assert.assertEquals
+import org.junit.Assert.assertFalse
+import org.junit.Assert.assertTrue
+import org.junit.Test
+import org.whispersystems.signalservice.api.push.exceptions.NonSuccessfulResponseCodeException
+import org.whispersystems.signalservice.api.push.exceptions.PushNetworkException
+
+class NetworkResultTest {
+  @Test
+  fun `generic success`() {
+    val result = NetworkResult.fromFetch {}
+
+    assertTrue(result is NetworkResult.Success)
+  }
+
+  @Test
+  fun `generic non-successful status code`() {
+    val exception = NonSuccessfulResponseCodeException(404, "not found", "body")
+
+    val result = NetworkResult.fromFetch {
+      throw exception
+    }
+
+    check(result is NetworkResult.StatusCodeError)
+    assertEquals(exception, result.exception)
+    assertEquals(404, result.code)
+    assertEquals("body", result.body)
+  }
+
+  @Test
+  fun `generic network error`() {
+    val exception = PushNetworkException("general exception")
+
+    val result = NetworkResult.fromFetch {
+      throw exception
+    }
+
+    assertTrue(result is NetworkResult.NetworkError)
+    assertEquals(exception, (result as NetworkResult.NetworkError).exception)
+  }
+
+  @Test
+  fun `generic application error`() {
+    val throwable = RuntimeException("test")
+
+    val result = NetworkResult.fromFetch {
+      throw throwable
+    }
+
+    assertTrue(result is NetworkResult.ApplicationError)
+    assertEquals(throwable, (result as NetworkResult.ApplicationError).throwable)
+  }
+
+  @Test
+  fun `then - generic`() {
+    val result = NetworkResult
+      .fromFetch { NetworkResult.Success(1) }
+      .then { NetworkResult.Success(2) }
+
+    assertTrue(result is NetworkResult.Success)
+    assertEquals(2, (result as NetworkResult.Success).result)
+  }
+
+  @Test
+  fun `then - doesn't run on error`() {
+    val throwable = RuntimeException("test")
+    var run = false
+
+    val result = NetworkResult
+      .fromFetch { throw throwable }
+      .then {
+        run = true
+        NetworkResult.Success(1)
+      }
+
+    assertTrue(result is NetworkResult.ApplicationError)
+    assertFalse(run)
+  }
+
+  @Test
+  fun `map - generic`() {
+    val result = NetworkResult
+      .fromFetch { NetworkResult.Success(1) }
+      .map { 2 }
+
+    assertTrue(result is NetworkResult.Success)
+    assertEquals(2, (result as NetworkResult.Success).result)
+  }
+
+  @Test
+  fun `map - doesn't run on error`() {
+    val throwable = RuntimeException("test")
+    var run = false
+
+    val result = NetworkResult
+      .fromFetch { throw throwable }
+      .map {
+        run = true
+        1
+      }
+
+    assertTrue(result is NetworkResult.ApplicationError)
+    assertFalse(run)
+  }
+
+  @Test
+  fun `runIfSuccessful - doesn't run on error`() {
+    val throwable = RuntimeException("test")
+    var run = false
+
+    val result = NetworkResult
+      .fromFetch { throw throwable }
+      .runIfSuccessful { run = true }
+
+    assertTrue(result is NetworkResult.ApplicationError)
+    assertFalse(run)
+  }
+
+  @Test
+  fun `runIfSuccessful - runs on success`() {
+    var run = false
+
+    NetworkResult
+      .fromFetch { NetworkResult.Success(1) }
+      .runIfSuccessful { run = true }
+
+    assertTrue(run)
+  }
+
+  @Test
+  fun `runIfSuccessful - runs before error`() {
+    val throwable = RuntimeException("test")
+    var run = false
+
+    val result = NetworkResult
+      .fromFetch { NetworkResult.Success(Unit) }
+      .runIfSuccessful { run = true }
+      .then { NetworkResult.ApplicationError<Unit>(throwable) }
+
+    assertTrue(result is NetworkResult.ApplicationError)
+    assertTrue(run)
+  }
+
+  @Test
+  fun `runOnStatusCodeError - simple call`() {
+    var handled = false
+
+    NetworkResult
+      .fromFetch { throw NonSuccessfulResponseCodeException(404, "not found", "body") }
+      .runOnStatusCodeError { handled = true }
+
+    assertTrue(handled)
+  }
+
+  @Test
+  fun `runOnStatusCodeError - ensure only called once`() {
+    var handleCount = 0
+
+    NetworkResult
+      .fromFetch { throw NonSuccessfulResponseCodeException(404, "not found", "body") }
+      .runOnStatusCodeError { handleCount++ }
+      .map { 1 }
+      .then { NetworkResult.Success(2) }
+      .map { 3 }
+
+    assertEquals(1, handleCount)
+  }
+
+  @Test
+  fun `runOnStatusCodeError - called when placed before a failing then`() {
+    var handled = false
+
+    val result = NetworkResult
+      .fromFetch { }
+      .runOnStatusCodeError { handled = true }
+      .then { NetworkResult.fromFetch { throw NonSuccessfulResponseCodeException(404, "not found", "body") } }
+
+    assertTrue(handled)
+    assertTrue(result is NetworkResult.StatusCodeError)
+  }
+
+  @Test
+  fun `runOnStatusCodeError - called when placed two spots before a failing then`() {
+    var handled = false
+
+    val result = NetworkResult
+      .fromFetch { }
+      .runOnStatusCodeError { handled = true }
+      .then { NetworkResult.Success(Unit) }
+      .then { NetworkResult.fromFetch { throw NonSuccessfulResponseCodeException(404, "not found", "body") } }
+
+    assertTrue(handled)
+    assertTrue(result is NetworkResult.StatusCodeError)
+  }
+
+  @Test
+  fun `runOnStatusCodeError - should not be called for successful results`() {
+    var handled = false
+
+    NetworkResult
+      .fromFetch {}
+      .runOnStatusCodeError { handled = true }
+
+    NetworkResult
+      .fromFetch { throw RuntimeException("application error") }
+      .runOnStatusCodeError { handled = true }
+
+    NetworkResult
+      .fromFetch { throw PushNetworkException("network error") }
+      .runOnStatusCodeError { handled = true }
+
+    assertFalse(handled)
+  }
+}
diff --git a/libsignal-service/src/test/java/org/whispersystems/signalservice/api/crypto/AttachmentCipherTest.java b/libsignal-service/src/test/java/org/whispersystems/signalservice/api/crypto/AttachmentCipherTest.java
index 72a05ea7d0..8f992701b6 100644
--- a/libsignal-service/src/test/java/org/whispersystems/signalservice/api/crypto/AttachmentCipherTest.java
+++ b/libsignal-service/src/test/java/org/whispersystems/signalservice/api/crypto/AttachmentCipherTest.java
@@ -2,10 +2,13 @@
 
 import org.conscrypt.Conscrypt;
 import org.junit.Test;
+import org.signal.core.util.StreamUtil;
 import org.signal.libsignal.protocol.InvalidMessageException;
 import org.signal.libsignal.protocol.incrementalmac.ChunkSizeChoice;
 import org.signal.libsignal.protocol.incrementalmac.InvalidMacException;
 import org.signal.libsignal.protocol.kdf.HKDFv3;
+import org.signal.libsignal.protocol.util.ByteUtil;
+import org.whispersystems.signalservice.api.backup.BackupKey;
 import org.whispersystems.signalservice.internal.crypto.PaddingInputStream;
 import org.whispersystems.signalservice.internal.push.http.AttachmentCipherOutputStreamFactory;
 import org.whispersystems.signalservice.internal.util.Util;
@@ -13,6 +16,7 @@
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.File;
+import java.io.FileInputStream;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
@@ -35,11 +39,30 @@ public final class AttachmentCipherTest {
     }
   }
 
+  private static int MEBIBYTE = 1024 * 1024;
+
   @Test
-  public void attachment_encryptDecrypt() throws IOException, InvalidMessageException {
+  public void attachment_encryptDecrypt_nonIncremental() throws IOException, InvalidMessageException {
+    attachment_encryptDecrypt(false, MEBIBYTE);
+  }
+
+  @Test
+  public void attachment_encryptDecrypt_incremental() throws IOException, InvalidMessageException {
+    attachment_encryptDecrypt(true, MEBIBYTE);
+  }
+
+  @Test
+  public void attachment_encryptDecrypt_incremental_manyFileSizes() throws IOException, InvalidMessageException {
+    // Designed to stress the various boundary conditions of reading the final mac
+    for (int i = 0; i < 100; i++) {
+      attachment_encryptDecrypt(true, MEBIBYTE + new Random().nextInt(1, 64 * 1024));
+    }
+  }
+
+  private void attachment_encryptDecrypt(boolean incremental, int fileSize) throws IOException, InvalidMessageException {
     byte[]          key             = Util.getSecretBytes(64);
-    byte[]          plaintextInput  = "Peter Parker".getBytes();
-    EncryptResult   encryptResult   = encryptData(plaintextInput, key, false);
+    byte[]          plaintextInput  = Util.getSecretBytes(fileSize);
+    EncryptResult   encryptResult   = encryptData(plaintextInput, key, incremental);
     File            cipherFile      = writeToFile(encryptResult.ciphertext);
     InputStream     inputStream     = AttachmentCipherInputStream.createForAttachment(cipherFile, plaintextInput.length, key, encryptResult.digest, encryptResult.incrementalDigest, encryptResult.chunkSizeChoice);
     byte[]          plaintextOutput = readInputStreamFully(inputStream);
@@ -50,10 +73,19 @@ public void attachment_encryptDecrypt() throws IOException, InvalidMessageExcept
   }
 
   @Test
-  public void attachment_encryptDecryptEmpty() throws IOException, InvalidMessageException {
+  public void attachment_encryptDecryptEmpty_nonIncremental() throws IOException, InvalidMessageException {
+    attachment_encryptDecryptEmpty(false);
+  }
+
+  @Test
+  public void attachment_encryptDecryptEmpty_incremental() throws IOException, InvalidMessageException {
+    attachment_encryptDecryptEmpty(true);
+  }
+
+  private void attachment_encryptDecryptEmpty(boolean incremental) throws IOException, InvalidMessageException {
     byte[]          key             = Util.getSecretBytes(64);
     byte[]          plaintextInput  = "".getBytes();
-    EncryptResult   encryptResult   = encryptData(plaintextInput, key, true);
+    EncryptResult   encryptResult   = encryptData(plaintextInput, key, incremental);
     File            cipherFile      = writeToFile(encryptResult.ciphertext);
     InputStream     inputStream     = AttachmentCipherInputStream.createForAttachment(cipherFile, plaintextInput.length, key, encryptResult.digest, encryptResult.incrementalDigest, encryptResult.chunkSizeChoice);
     byte[]          plaintextOutput = readInputStreamFully(inputStream);
@@ -63,54 +95,130 @@ public void attachment_encryptDecryptEmpty() throws IOException, InvalidMessageE
     cipherFile.delete();
   }
 
-  @Test
-  public void attachment_decryptFailOnBadKey() throws IOException {
-    File    cipherFile          = null;
-    boolean hitCorrectException = false;
+  @Test(expected = InvalidMessageException.class)
+  public void attachment_decryptFailOnBadKey_nonIncremental() throws IOException, InvalidMessageException {
+    attachment_decryptFailOnBadKey(false);
+  }
+
+  @Test(expected = InvalidMessageException.class)
+  public void attachment_decryptFailOnBadKey_incremental() throws IOException, InvalidMessageException {
+    attachment_decryptFailOnBadKey(true);
+  }
+
+  private void attachment_decryptFailOnBadKey(boolean incremental) throws IOException, InvalidMessageException {
+    File cipherFile = null;
 
     try {
       byte[]        key            = Util.getSecretBytes(64);
-      byte[]        plaintextInput = "Gwen Stacy".getBytes();
-      EncryptResult encryptResult  = encryptData(plaintextInput, key, true);
+      byte[]        plaintextInput = Util.getSecretBytes(MEBIBYTE);
+      EncryptResult encryptResult  = encryptData(plaintextInput, key, incremental);
       byte[]        badKey         = new byte[64];
 
       cipherFile = writeToFile(encryptResult.ciphertext);
 
       AttachmentCipherInputStream.createForAttachment(cipherFile, plaintextInput.length, badKey, encryptResult.digest, null, 0);
-    } catch (InvalidMessageException e) {
-      hitCorrectException = true;
     } finally {
       if (cipherFile != null) {
         cipherFile.delete();
       }
     }
+  }
+  @Test(expected = InvalidMessageException.class)
+  public void attachment_decryptFailOnBadMac_nonIncremental() throws IOException, InvalidMessageException {
+    attachment_decryptFailOnBadMac(false);
+  }
 
-    assertTrue(hitCorrectException);
+  @Test(expected = InvalidMessageException.class)
+  public void attachment_decryptFailOnBadMac_incremental() throws IOException, InvalidMessageException {
+    attachment_decryptFailOnBadMac(true);
   }
 
-  @Test
-  public void attachment_decryptFailOnBadDigest() throws IOException {
-    File    cipherFile          = null;
-    boolean hitCorrectException = false;
+  private void attachment_decryptFailOnBadMac(boolean incremental) throws IOException, InvalidMessageException {
+    File cipherFile = null;
+
+    try {
+      byte[]        key              = Util.getSecretBytes(64);
+      byte[]        plaintextInput   = Util.getSecretBytes(MEBIBYTE);
+      EncryptResult encryptResult    = encryptData(plaintextInput, key, incremental);
+      byte[]        badMacCiphertext = Arrays.copyOf(encryptResult.ciphertext, encryptResult.ciphertext.length);
+
+      badMacCiphertext[badMacCiphertext.length - 1] += 1;
+
+      cipherFile = writeToFile(badMacCiphertext);
+
+      InputStream stream = AttachmentCipherInputStream.createForAttachment(cipherFile, plaintextInput.length, key, encryptResult.digest, encryptResult.incrementalDigest, encryptResult.chunkSizeChoice);
+
+      // In incremental mode, we'll only check the digest after reading the whole thing
+      if (incremental) {
+        StreamUtil.readFully(stream);
+      }
+    } finally {
+      if (cipherFile != null) {
+        cipherFile.delete();
+      }
+    }
+  }
+
+  @Test(expected = InvalidMessageException.class)
+  public void attachment_decryptFailOnNullDigest_nonIncremental() throws IOException, InvalidMessageException {
+    attachment_decryptFailOnNullDigest(false);
+  }
+
+  @Test(expected = InvalidMessageException.class)
+  public void attachment_decryptFailOnNullDigest_incremental() throws IOException, InvalidMessageException {
+    attachment_decryptFailOnNullDigest(true);
+  }
+
+  private void attachment_decryptFailOnNullDigest(boolean incremental) throws IOException, InvalidMessageException {
+    File cipherFile = null;
 
     try {
       byte[]        key            = Util.getSecretBytes(64);
-      byte[]        plaintextInput = "Mary Jane Watson".getBytes();
-      EncryptResult encryptResult  = encryptData(plaintextInput, key, true);
-      byte[]        badDigest      = new byte[32];
+      byte[]        plaintextInput = Util.getSecretBytes(MEBIBYTE);
+      EncryptResult encryptResult  = encryptData(plaintextInput, key, incremental);
 
       cipherFile = writeToFile(encryptResult.ciphertext);
 
-      AttachmentCipherInputStream.createForAttachment(cipherFile, plaintextInput.length, key, badDigest, null, 0);
-    } catch (InvalidMessageException e) {
-      hitCorrectException = true;
+      AttachmentCipherInputStream.createForAttachment(cipherFile, plaintextInput.length, key, null, encryptResult.incrementalDigest, encryptResult.chunkSizeChoice);
     } finally {
       if (cipherFile != null) {
         cipherFile.delete();
       }
     }
+  }
 
-    assertTrue(hitCorrectException);
+  @Test(expected = InvalidMessageException.class)
+  public void attachment_decryptFailOnBadDigest_nonIncremental() throws IOException, InvalidMessageException {
+    attachment_decryptFailOnBadDigest(false);
+  }
+
+  @Test(expected = InvalidMessageException.class)
+  public void attachment_decryptFailOnBadDigest_incremental() throws IOException, InvalidMessageException {
+    attachment_decryptFailOnBadDigest(true);
+  }
+
+  private void attachment_decryptFailOnBadDigest(boolean incremental) throws IOException, InvalidMessageException {
+    File cipherFile = null;
+
+    try {
+      byte[]        key            = Util.getSecretBytes(64);
+      byte[]        plaintextInput = Util.getSecretBytes(MEBIBYTE);
+      EncryptResult encryptResult  = encryptData(plaintextInput, key, incremental);
+      byte[]        badDigest      = new byte[32];
+
+      cipherFile = writeToFile(encryptResult.ciphertext);
+
+      InputStream stream = AttachmentCipherInputStream.createForAttachment(cipherFile, plaintextInput.length, key, badDigest, encryptResult.incrementalDigest, encryptResult.chunkSizeChoice);
+
+      // In incremental mode, we'll only check the digest after reading the whole thing
+      if (incremental) {
+        StreamUtil.readFully(stream);
+      }
+    } finally {
+      if (cipherFile != null) {
+        cipherFile.delete();
+      }
+    }
   }
 
   @Test
@@ -120,9 +228,7 @@ public void attachment_decryptFailOnBadIncrementalDigest() throws IOException {
 
     try {
       byte[]        key            = Util.getSecretBytes(64);
-      byte[]        plaintextInput = new byte[1000000];
-
-      new Random().nextBytes(plaintextInput);
+      byte[]        plaintextInput = Util.getSecretBytes(MEBIBYTE);
 
       EncryptResult encryptResult  = encryptData(plaintextInput, key, true);
       byte[]        badDigest      = Util.getSecretBytes(encryptResult.incrementalDigest.length);
@@ -185,19 +291,50 @@ public void attachment_encryptDecryptPaddedContent() throws IOException, Invalid
   }
 
   @Test
-  public void attachment_decryptFailOnNullDigest() throws IOException {
+  public void archive_encryptDecrypt() throws IOException, InvalidMessageException {
+    byte[]                         key             = Util.getSecretBytes(64);
+    BackupKey.MediaKeyMaterial     keyMaterial     = BackupKey.MediaKeyMaterial.forMedia(Util.getSecretBytes(15), key, Util.getSecretBytes(16));
+    byte[]                         plaintextInput  = "Peter Parker".getBytes();
+    EncryptResult                  encryptResult   = encryptData(plaintextInput, key, false);
+    File                           cipherFile      = writeToFile(encryptResult.ciphertext);
+    InputStream                    inputStream     = AttachmentCipherInputStream.createForArchivedMedia(keyMaterial, cipherFile, plaintextInput.length);
+    byte[]                         plaintextOutput = readInputStreamFully(inputStream);
+
+    assertArrayEquals(plaintextInput, plaintextOutput);
+
+    cipherFile.delete();
+  }
+
+  @Test
+  public void archive_encryptDecryptEmpty() throws IOException, InvalidMessageException {
+    byte[]                         key             = Util.getSecretBytes(64);
+    BackupKey.MediaKeyMaterial     keyMaterial     = BackupKey.MediaKeyMaterial.forMedia(Util.getSecretBytes(15), key, Util.getSecretBytes(16));
+    byte[]                         plaintextInput  = "".getBytes();
+    EncryptResult                  encryptResult   = encryptData(plaintextInput, key, false);
+    File                           cipherFile      = writeToFile(encryptResult.ciphertext);
+    InputStream                    inputStream     = AttachmentCipherInputStream.createForArchivedMedia(keyMaterial, cipherFile, plaintextInput.length);
+    byte[]                         plaintextOutput = readInputStreamFully(inputStream);
+
+    assertArrayEquals(plaintextInput, plaintextOutput);
+
+    cipherFile.delete();
+  }
+
+  @Test
+  public void archive_decryptFailOnBadKey() throws IOException {
     File    cipherFile          = null;
     boolean hitCorrectException = false;
 
     try {
-      byte[]        key            = Util.getSecretBytes(64);
-      byte[]        plaintextInput = "Aunt May".getBytes();
-      ChunkSizeChoice sizeChoice      = ChunkSizeChoice.inferChunkSize(plaintextInput.length);
-      EncryptResult encryptResult  = encryptData(plaintextInput, key, true);
+      byte[]                         key            = Util.getSecretBytes(64);
+      byte[]                         badKey         = Util.getSecretBytes(64);
+      BackupKey.MediaKeyMaterial     keyMaterial    = BackupKey.MediaKeyMaterial.forMedia(Util.getSecretBytes(15), badKey, Util.getSecretBytes(16));
+      byte[]                         plaintextInput = "Gwen Stacy".getBytes();
+      EncryptResult                  encryptResult  = encryptData(plaintextInput, key, false);
 
       cipherFile = writeToFile(encryptResult.ciphertext);
 
-      AttachmentCipherInputStream.createForAttachment(cipherFile, plaintextInput.length, key, null, encryptResult.incrementalDigest, encryptResult.chunkSizeChoice);
+      AttachmentCipherInputStream.createForArchivedMedia(keyMaterial, cipherFile, plaintextInput.length);
     } catch (InvalidMessageException e) {
       hitCorrectException = true;
     } finally {
@@ -210,7 +347,45 @@ public void attachment_decryptFailOnNullDigest() throws IOException {
   }
 
   @Test
-  public void attachment_decryptFailOnBadMac() throws IOException {
+  public void archive_encryptDecryptPaddedContent() throws IOException, InvalidMessageException {
+    int[] lengths = { 531, 600, 724, 1019, 1024 };
+
+    for (int length : lengths) {
+      byte[] plaintextInput = new byte[length];
+
+      for (int i = 0; i < length; i++) {
+        plaintextInput[i] = (byte) 0x97;
+      }
+
+      byte[]                key                     = Util.getSecretBytes(64);
+      byte[]                iv                      = Util.getSecretBytes(16);
+      ByteArrayInputStream  inputStream             = new ByteArrayInputStream(plaintextInput);
+      InputStream           paddedInputStream       = new PaddingInputStream(inputStream, length);
+      ByteArrayOutputStream destinationOutputStream = new ByteArrayOutputStream();
+
+      DigestingOutputStream encryptingOutputStream = new AttachmentCipherOutputStreamFactory(key, iv).createFor(destinationOutputStream);
+
+      Util.copy(paddedInputStream, encryptingOutputStream);
+
+      encryptingOutputStream.flush();
+      encryptingOutputStream.close();
+
+      byte[] encryptedData = destinationOutputStream.toByteArray();
+
+      File cipherFile = writeToFile(encryptedData);
+
+      BackupKey.MediaKeyMaterial     keyMaterial     = BackupKey.MediaKeyMaterial.forMedia(Util.getSecretBytes(15), key, Util.getSecretBytes(16));
+      InputStream                    decryptedStream = AttachmentCipherInputStream.createForArchivedMedia(keyMaterial, cipherFile, length);
+      byte[]                         plaintextOutput = readInputStreamFully(decryptedStream);
+
+      assertArrayEquals(plaintextInput, plaintextOutput);
+
+      cipherFile.delete();
+    }
+  }
+
+  @Test
+  public void archive_decryptFailOnBadMac() throws IOException {
     File    cipherFile          = null;
     boolean hitCorrectException = false;
 
@@ -224,7 +399,8 @@ public void attachment_decryptFailOnBadMac() throws IOException {
 
       cipherFile = writeToFile(badMacCiphertext);
 
-      AttachmentCipherInputStream.createForAttachment(cipherFile, plaintextInput.length, key, encryptResult.digest, null, encryptResult.chunkSizeChoice);
+      BackupKey.MediaKeyMaterial     keyMaterial     = BackupKey.MediaKeyMaterial.forMedia(Util.getSecretBytes(15), key, Util.getSecretBytes(16));
+      AttachmentCipherInputStream.createForArchivedMedia(keyMaterial, cipherFile, plaintextInput.length);
       fail();
     } catch (InvalidMessageException e) {
       hitCorrectException = true;
@@ -319,7 +495,6 @@ private static EncryptResult encryptData(byte[] data, byte[] keyMaterial, boolea
       encryptStream = factory.createFor(outputStream);
     }
 
-
     encryptStream.write(data);
     encryptStream.flush();
     encryptStream.close();
diff --git a/libsignal-service/src/test/java/org/whispersystems/signalservice/internal/websocket/LibSignalChatConnectionTest.kt b/libsignal-service/src/test/java/org/whispersystems/signalservice/internal/websocket/LibSignalChatConnectionTest.kt
new file mode 100644
index 0000000000..4e86f6b67d
--- /dev/null
+++ b/libsignal-service/src/test/java/org/whispersystems/signalservice/internal/websocket/LibSignalChatConnectionTest.kt
@@ -0,0 +1,251 @@
+package org.whispersystems.signalservice.internal.websocket
+
+import io.mockk.clearAllMocks
+import io.mockk.every
+import io.mockk.mockk
+import io.mockk.verify
+import io.reactivex.rxjava3.observers.TestObserver
+import org.junit.Before
+import org.junit.Test
+import org.signal.libsignal.internal.CompletableFuture
+import org.signal.libsignal.net.ChatService
+import org.signal.libsignal.net.ChatService.DebugInfo
+import org.signal.libsignal.net.IpType
+import org.whispersystems.signalservice.api.websocket.HealthMonitor
+import org.whispersystems.signalservice.api.websocket.WebSocketConnectionState
+import java.util.concurrent.CountDownLatch
+import java.util.concurrent.ExecutorService
+import java.util.concurrent.Executors
+import java.util.concurrent.TimeUnit
+import org.signal.libsignal.net.ChatService.Response as LibSignalResponse
+import org.signal.libsignal.net.ChatService.ResponseAndDebugInfo as LibSignalDebugResponse
+
+class LibSignalChatConnectionTest {
+
+  private val executor: ExecutorService = Executors.newSingleThreadExecutor()
+  private val healthMonitor = mockk<HealthMonitor>()
+  private val chatService = mockk<ChatService>()
+  private val connection = LibSignalChatConnection("test", chatService, healthMonitor, isAuthenticated = false)
+
+  @Before
+  fun before() {
+    clearAllMocks()
+    every { healthMonitor.onMessageError(any(), any()) }
+    every { healthMonitor.onKeepAliveResponse(any(), any(), any()) }
+  }
+
+  @Test
+  fun orderOfStatesOnSuccessfulConnect() {
+    val latch = CountDownLatch(1)
+
+    every { chatService.connectUnauthenticated() } answers {
+      delay {
+        it.complete(DEBUG_INFO)
+        latch.countDown()
+      }
+    }
+
+    val observer = TestObserver<WebSocketConnectionState>()
+    connection.state.subscribe(observer)
+
+    connection.connect()
+
+    latch.await(100, TimeUnit.MILLISECONDS)
+
+    observer.assertNotComplete()
+    observer.assertValues(
+      WebSocketConnectionState.DISCONNECTED,
+      WebSocketConnectionState.CONNECTING,
+      WebSocketConnectionState.CONNECTED
+    )
+  }
+
+  @Test
+  fun orderOfStatesOnConnectionFailure() {
+    val connectionException = RuntimeException("connect failed")
+    val latch = CountDownLatch(1)
+
+    every { chatService.connectUnauthenticated() } answers {
+      delay {
+        it.completeExceptionally(connectionException)
+      }
+    }
+
+    val observer = TestObserver<WebSocketConnectionState>()
+    connection.state.subscribe(observer)
+
+    connection.connect()
+
+    latch.await(100, TimeUnit.MILLISECONDS)
+
+    observer.assertNotComplete()
+    observer.assertValues(
+      WebSocketConnectionState.DISCONNECTED,
+      WebSocketConnectionState.CONNECTING,
+      WebSocketConnectionState.FAILED
+    )
+  }
+
+  @Test
+  fun orderOfStatesOnConnectAndDisconnect() {
+    val connectLatch = CountDownLatch(1)
+    val disconnectLatch = CountDownLatch(1)
+
+    every { chatService.connectUnauthenticated() } answers {
+      delay {
+        it.complete(DEBUG_INFO)
+        connectLatch.countDown()
+      }
+    }
+    every { chatService.disconnect() } answers {
+      delay {
+        it.complete(null)
+        disconnectLatch.countDown()
+      }
+    }
+
+    val observer = TestObserver<WebSocketConnectionState>()
+
+    connection.state.subscribe(observer)
+
+    connection.connect()
+    connectLatch.await(100, TimeUnit.MILLISECONDS)
+    connection.disconnect()
+    disconnectLatch.await(100, TimeUnit.MILLISECONDS)
+
+    observer.assertNotComplete()
+    observer.assertValues(
+      WebSocketConnectionState.DISCONNECTED,
+      WebSocketConnectionState.CONNECTING,
+      WebSocketConnectionState.CONNECTED,
+      WebSocketConnectionState.DISCONNECTING,
+      WebSocketConnectionState.DISCONNECTED
+    )
+  }
+
+  @Test
+  fun orderOfStatesOnDisconnectFailure() {
+    val disconnectException = RuntimeException("disconnect failed")
+
+    val latch = CountDownLatch(1)
+
+    every { chatService.disconnect() } answers {
+      delay {
+        it.completeExceptionally(disconnectException)
+      }
+    }
+
+    val observer = TestObserver<WebSocketConnectionState>()
+
+    connection.state.subscribe(observer)
+
+    connection.disconnect()
+
+    latch.await(100, TimeUnit.MILLISECONDS)
+
+    observer.assertNotComplete()
+    observer.assertValues(
+      WebSocketConnectionState.DISCONNECTED,
+      WebSocketConnectionState.DISCONNECTING,
+      WebSocketConnectionState.DISCONNECTED
+    )
+  }
+
+  @Test
+  fun keepAliveSuccess() {
+    val latch = CountDownLatch(1)
+
+    every { chatService.unauthenticatedSendAndDebug(any()) } answers {
+      delay {
+        it.complete(make_debug_response(RESPONSE_SUCCESS))
+        latch.countDown()
+      }
+    }
+
+    connection.sendKeepAlive()
+
+    latch.await(100, TimeUnit.MILLISECONDS)
+
+    verify(exactly = 1) {
+      healthMonitor.onKeepAliveResponse(any(), false, any())
+    }
+    verify(exactly = 0) {
+      healthMonitor.onMessageError(any(), any())
+    }
+  }
+
+  @Test
+  fun keepAliveFailure() {
+    for (response in listOf(RESPONSE_ERROR, RESPONSE_SERVER_ERROR)) {
+      val latch = CountDownLatch(1)
+
+      every { chatService.unauthenticatedSendAndDebug(any()) } answers {
+        delay {
+          it.complete(make_debug_response(response))
+        }
+      }
+
+      connection.sendKeepAlive()
+      latch.await(100, TimeUnit.MILLISECONDS)
+
+      verify(exactly = 1) {
+        healthMonitor.onMessageError(response.status, false)
+      }
+      verify(exactly = 0) {
+        healthMonitor.onKeepAliveResponse(any(), any(), any())
+      }
+    }
+  }
+
+  @Test
+  fun keepAliveConnectionFailure() {
+    val connectionFailure = RuntimeException("Sending keep-alive failed")
+    val latch = CountDownLatch(1)
+
+    every {
+      chatService.unauthenticatedSendAndDebug(any())
+    } answers {
+      delay {
+        it.completeExceptionally(connectionFailure)
+      }
+    }
+
+    val observer = TestObserver<WebSocketConnectionState>()
+    connection.state.subscribe(observer)
+
+    connection.sendKeepAlive()
+
+    latch.await(100, TimeUnit.MILLISECONDS)
+
+    observer.assertNotComplete()
+    observer.assertValues(
+      // This is the starting state
+      WebSocketConnectionState.DISCONNECTED,
+      // This one is the result of a keep-alive failure
+      WebSocketConnectionState.DISCONNECTED
+    )
+    verify(exactly = 0) {
+      healthMonitor.onKeepAliveResponse(any(), any(), any())
+      healthMonitor.onMessageError(any(), any())
+    }
+  }
+
+  private fun <T> delay(action: ((CompletableFuture<T>) -> Unit)): CompletableFuture<T> {
+    val future = CompletableFuture<T>()
+    executor.submit {
+      action(future)
+    }
+    return future
+  }
+
+  companion object {
+    private val DEBUG_INFO: DebugInfo = DebugInfo(0, IpType.UNKNOWN, 100, "")
+    private val RESPONSE_SUCCESS = LibSignalResponse(200, "", emptyMap(), byteArrayOf())
+    private val RESPONSE_ERROR = LibSignalResponse(400, "", emptyMap(), byteArrayOf())
+    private val RESPONSE_SERVER_ERROR = LibSignalResponse(500, "", emptyMap(), byteArrayOf())
+
+    private fun make_debug_response(response: LibSignalResponse): LibSignalDebugResponse {
+      return LibSignalDebugResponse(response, DEBUG_INFO)
+    }
+  }
+}
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..0b41c96c40 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
@@ -45,7 +45,7 @@
 @SuppressWarnings("WeakerAccess")
 public final class MediaConverter {
     private static final String TAG = "media-converter";
-    private static final boolean VERBOSE = false; // lots of logging
+    private static final boolean VERBOSE = true; // lots of logging
 
     // Describes when the annotation will be discarded
     @Retention(RetentionPolicy.SOURCE)