Merge branch 'av/core-loglevel' into av/core-loglevel-android

2026-08-28 00:44:27 +00:00 · 2024-12-06 00:36:21 +00:00
parent be52436af3 94a10dc971
commit e8e46611a8
94 changed files with 2556 additions and 1368 deletions
@@ -33,6 +33,7 @@ import com.google.accompanist.permissions.rememberPermissionState
 import com.google.common.util.concurrent.ListenableFuture
 import dev.icerock.moko.resources.compose.painterResource
 import dev.icerock.moko.resources.compose.stringResource
+import kotlinx.coroutines.delay
 import java.util.concurrent.*

 // Adapted from learntodroid - https://gist.github.com/learntodroid/8f839be0b29d0378f843af70607bd7f5
@@ -41,13 +42,13 @@ import java.util.concurrent.*
 actual fun QRCodeScanner(
  showQRCodeScanner: MutableState<Boolean>,
  padding: PaddingValues,
-  onBarcode: (String) -> Unit
+  onBarcode: suspend (String) -> Boolean
 ) {
  val context = LocalContext.current
  val lifecycleOwner = LocalLifecycleOwner.current
-  var preview by remember { mutableStateOf<Preview?>(null) }
-  var lastAnalyzedTimeStamp = 0L
-  var contactLink = ""
+  val preview = remember { mutableStateOf<Preview?>(null) }
+  val contactLink = remember { mutableStateOf("") }
+  val checkingLink = remember { mutableStateOf(false) }

  val cameraProviderFuture by produceState<ListenableFuture<ProcessCameraProvider>?>(initialValue = null) {
    value = ProcessCameraProvider.getInstance(context)
@@ -86,28 +87,33 @@ actual fun QRCodeScanner(
          .build()
        val cameraExecutor: ExecutorService = Executors.newSingleThreadExecutor()
        cameraProviderFuture?.addListener({
-          preview = Preview.Builder().build().also {
+          preview.value = Preview.Builder().build().also {
            it.setSurfaceProvider(previewView.surfaceProvider)
          }
          val detector: QrCodeDetector<GrayU8> = FactoryFiducial.qrcode(null, GrayU8::class.java)
-          fun getQR(imageProxy: ImageProxy) {
-            val currentTimeStamp = System.currentTimeMillis()
-            if (currentTimeStamp - lastAnalyzedTimeStamp >= TimeUnit.SECONDS.toMillis(1)) {
-              detector.process(imageProxyToGrayU8(imageProxy))
-              val found = detector.detections
-              val qr = found.firstOrNull()
-              if (qr != null) {
-                if (qr.message != contactLink) {
-                  // Make sure link is new and not a repeat
-                  contactLink = qr.message
-                  onBarcode(contactLink)
+          suspend fun getQR(imageProxy: ImageProxy) {
+            if (checkingLink.value) return
+            checkingLink.value = true
+
+            detector.process(imageProxyToGrayU8(imageProxy))
+            val found = detector.detections
+            val qr = found.firstOrNull()
+            if (qr != null) {
+              if (qr.message != contactLink.value) {
+                // Make sure link is new and not a repeat if that link was handled successfully
+                if (onBarcode(qr.message)) {
+                  contactLink.value = qr.message
                }
+                // just some delay to not spam endlessly with alert in case the user scan something wrong, and it fails fast
+                // (for example, scan user's address while verifying contact code - it prevents alert spam)
+                delay(1000)
              }
            }
+            checkingLink.value = false
            imageProxy.close()
          }

-          val imageAnalyzer = ImageAnalysis.Analyzer { proxy -> getQR(proxy) }
+          val imageAnalyzer = ImageAnalysis.Analyzer { proxy -> withApi { getQR(proxy) } }
          val imageAnalysis: ImageAnalysis = ImageAnalysis.Builder()
            .setBackpressureStrategy(ImageAnalysis.STRATEGY_KEEP_ONLY_LATEST)
            .setImageQueueDepth(1)
@@ -115,7 +121,7 @@ actual fun QRCodeScanner(
            .also { it.setAnalyzer(cameraExecutor, imageAnalyzer) }
          try {
            cameraProviderFuture?.get()?.unbindAll()
-            cameraProviderFuture?.get()?.bindToLifecycle(lifecycleOwner, cameraSelector, preview, imageAnalysis)
+            cameraProviderFuture?.get()?.bindToLifecycle(lifecycleOwner, cameraSelector, preview.value, imageAnalysis)
          } catch (e: Exception) {
            Log.d(TAG, "CameraPreview: ${e.localizedMessage}")
          }
@@ -1546,8 +1546,9 @@ data class GroupProfile (

@Serializable
 data class BusinessChatInfo (
-  val memberId: String,
-  val chatType: BusinessChatType
+  val chatType: BusinessChatType,
+  val businessId: String,
+  val customerId: String,
 )

@Serializable
@@ -2436,9 +2436,7 @@ object ChatController {
          ) {
            receiveFile(rhId, r.user, file.fileId, auto = true)
          }
-          if (cItem.showNotification && (allowedToShowNotification() || chatModel.chatId.value != cInfo.id || chatModel.remoteHostId() != rhId)) {
-            ntfManager.notifyMessageReceived(r.user, cInfo, cItem)
-          }
+          ntfManager.notifyMessageReceived(rhId, r.user, cInfo, cItem)
        }
      }
      is CR.ChatItemsStatusesUpdated ->
@@ -2452,7 +2450,7 @@ object ChatController {
          }
        }
      is CR.ChatItemUpdated ->
-        chatItemSimpleUpdate(rhId, r.user, r.chatItem)
+        chatItemUpdateNotify(rhId, r.user, r.chatItem)
      is CR.ChatItemReaction -> {
        if (active(r.user)) {
          withChats {
@@ -2950,9 +2948,17 @@ object ChatController {
  }

  private suspend fun chatItemSimpleUpdate(rh: Long?, user: UserLike, aChatItem: AChatItem) {
+    if (activeUser(rh, user)) {
+      val cInfo = aChatItem.chatInfo
+      val cItem = aChatItem.chatItem
+      withChats { upsertChatItem(rh, cInfo, cItem) }
+    }
+  }
+
+  private suspend fun chatItemUpdateNotify(rh: Long?, user: UserLike, aChatItem: AChatItem) {
    val cInfo = aChatItem.chatInfo
    val cItem = aChatItem.chatItem
-    val notify = { ntfManager.notifyMessageReceived(user, cInfo, cItem) }
+    val notify = { ntfManager.notifyMessageReceived(rh, user, cInfo, cItem) }
    if (!activeUser(rh, user)) {
      notify()
    } else if (withChats { upsertChatItem(rh, cInfo, cItem) }) {
@@ -6498,7 +6504,7 @@ sealed class SQLiteError {
@Serializable
 sealed class AgentErrorType {
  val string: String get() = when (this) {
-    is CMD -> "CMD ${cmdErr.string}"
+    is CMD -> "CMD ${cmdErr.string} $errContext"
    is CONN -> "CONN ${connErr.string}"
    is SMP -> "SMP ${smpErr.string}"
    // is NTF -> "NTF ${ntfErr.string}"
@@ -6511,7 +6517,7 @@ sealed class AgentErrorType {
    is CRITICAL -> "CRITICAL $offerRestart $criticalErr"
    is INACTIVE -> "INACTIVE"
  }
-  @Serializable @SerialName("CMD") class CMD(val cmdErr: CommandErrorType): AgentErrorType()
+  @Serializable @SerialName("CMD") class CMD(val cmdErr: CommandErrorType, val errContext: String): AgentErrorType()
  @Serializable @SerialName("CONN") class CONN(val connErr: ConnectionErrorType): AgentErrorType()
  @Serializable @SerialName("SMP") class SMP(val serverAddress: String, val smpErr: SMPErrorType): AgentErrorType()
  // @Serializable @SerialName("NTF") class NTF(val ntfErr: SMPErrorType): AgentErrorType()
@@ -36,9 +36,17 @@ abstract class NtfManager {
    )
  )

-  fun notifyMessageReceived(user: UserLike, cInfo: ChatInfo, cItem: ChatItem) {
-    if (!cInfo.ntfsEnabled) return
-    displayNotification(user = user, chatId = cInfo.id, displayName = cInfo.displayName, msgText = hideSecrets(cItem))
+  fun notifyMessageReceived(rhId: Long?, user: UserLike, cInfo: ChatInfo, cItem: ChatItem) {
+    if (
+      cItem.showNotification &&
+      cInfo.ntfsEnabled &&
+      (
+          allowedToShowNotification() ||
+              chatModel.chatId.value != cInfo.id ||
+              chatModel.remoteHostId() != rhId)
+    ) {
+      displayNotification(user = user, chatId = cInfo.id, displayName = cInfo.displayName, msgText = hideSecrets(cItem))
+    }
  }

  fun acceptContactRequestAction(userId: Long?, incognito: Boolean, chatId: ChatId) {
@@ -13,19 +13,19 @@ import chat.simplex.res.MR
 import dev.icerock.moko.resources.compose.stringResource

@Composable
-fun ScanCodeView(verifyCode: (String?, cb: (Boolean) -> Unit) -> Unit, close: () -> Unit) {
+fun ScanCodeView(verifyCode: suspend (String?) -> Boolean, close: () -> Unit) {
  ColumnWithScrollBar {
    AppBarTitle(stringResource(MR.strings.scan_code))
    QRCodeScanner { text ->
-      verifyCode(text) {
-        if (it) {
-          close()
-        } else {
-          AlertManager.shared.showAlertMsg(
-            title = generalGetString(MR.strings.incorrect_code)
-          )
-        }
+      val success  = verifyCode(text)
+      if (success) {
+        close()
+      } else {
+        AlertManager.shared.showAlertMsg(
+          title = generalGetString(MR.strings.incorrect_code)
+        )
      }
+      success
    }
    Text(stringResource(MR.strings.scan_code_from_contacts_app), Modifier.padding(horizontal = DEFAULT_PADDING))
    SectionBottomSpacer()
@@ -35,14 +35,14 @@ fun VerifyCodeView(
      displayName,
      connectionCode,
      connectionVerified,
-      verifyCode = { newCode, cb ->
-        withBGApi {
-          val res = verify(newCode)
-          if (res != null) {
-            val (verified) = res
-            cb(verified)
-            if (verified) close()
-          }
+      verifyCode = { newCode ->
+        val res = verify(newCode)
+        if (res != null) {
+          val (verified) = res
+          if (verified) close()
+          verified
+        } else {
+          false
        }
      }
    )
@@ -54,7 +54,7 @@ private fun VerifyCodeLayout(
  displayName: String,
  connectionCode: String,
  connectionVerified: Boolean,
-  verifyCode: (String?, cb: (Boolean) -> Unit) -> Unit,
+  verifyCode: suspend (String?) -> Boolean,
 ) {
  ColumnWithScrollBar(Modifier.padding(horizontal = DEFAULT_PADDING)) {
    AppBarTitle(stringResource(MR.strings.security_code), withPadding = false)
@@ -100,7 +100,7 @@ private fun VerifyCodeLayout(
    ) {
      if (connectionVerified) {
        SimpleButton(generalGetString(MR.strings.clear_verification), painterResource(MR.images.ic_shield)) {
-          verifyCode(null) {}
+          withApi { verifyCode(null) }
        }
      } else {
        if (appPlatform.isAndroid) {
@@ -111,7 +111,8 @@ private fun VerifyCodeLayout(
          }
        }
        SimpleButton(generalGetString(MR.strings.mark_code_verified), painterResource(MR.images.ic_verified_user)) {
-          verifyCode(connectionCode) { verified ->
+          withApi {
+            val verified = verifyCode(connectionCode)
            if (!verified) {
              AlertManager.shared.showAlertMsg(
                title = generalGetString(MR.strings.incorrect_code)
@@ -347,7 +347,7 @@ fun ChatPreviewView(
            chatItemContentPreview(chat, ci)
          }
          if (mc !is MsgContent.MCVoice || !showContentPreview || mc.text.isNotEmpty() || chatModelDraftChatId == chat.id) {
-            Box(Modifier.offset(x = if (mc is MsgContent.MCFile) -15.sp.toDp() else 0.dp)) {
+            Box(Modifier.offset(x = if (mc is MsgContent.MCFile && ci.meta.itemDeleted == null) -15.sp.toDp() else 0.dp)) {
              chatPreviewText()
            }
          }
@@ -203,7 +203,7 @@ private fun MutableState<MigrationToState?>.PasteOrScanLinkView(close: () -> Uni
      if (appPlatform.isAndroid) {
        SectionView(stringResource(MR.strings.scan_QR_code).replace('\n', ' ').uppercase()) {
          QRCodeScanner(showQRCodeScanner = remember { mutableStateOf(true) }) { text ->
-            withBGApi { checkUserLink(text) }
+            checkUserLink(text)
          }
        }
        SectionSpacer()
@@ -518,8 +518,8 @@ private fun ProgressView() {
  DefaultProgressView(null)
 }

-private suspend fun MutableState<MigrationToState?>.checkUserLink(link: String) {
-  if (strHasSimplexFileLink(link.trim())) {
+private suspend fun MutableState<MigrationToState?>.checkUserLink(link: String): Boolean {
+  return if (strHasSimplexFileLink(link.trim())) {
    val data = MigrationFileLinkData.readFromLink(link)
    val hasProxyConfigured = data?.networkConfig?.hasProxyConfigured() ?: false
    val networkConfig = data?.networkConfig?.transformToPlatformSupported()
@@ -537,11 +537,13 @@ private suspend fun MutableState<MigrationToState?>.checkUserLink(link: String)
        networkProxy = null
      )
    }
+    true
  } else {
    AlertManager.shared.showAlertMsg(
      title = generalGetString(MR.strings.invalid_file_link),
      text = generalGetString(MR.strings.the_text_you_pasted_is_not_a_link)
    )
+    false
  }
 }

@@ -12,6 +12,7 @@ import chat.simplex.common.platform.*
 import chat.simplex.common.views.chatlist.*
 import chat.simplex.common.views.helpers.*
 import chat.simplex.res.MR
+import kotlinx.coroutines.*
 import java.net.URI

 enum class ConnectionLinkType {
@@ -26,8 +27,18 @@ suspend fun planAndConnect(
  cleanup: (() -> Unit)? = null,
  filterKnownContact: ((Contact) -> Unit)? = null,
  filterKnownGroup: ((GroupInfo) -> Unit)? = null,
-) {
-  val connectionPlan = chatModel.controller.apiConnectPlan(rhId, uri.toString())
+): CompletableDeferred<Boolean> {
+  val completable = CompletableDeferred<Boolean>()
+  val close: (() -> Unit)? = {
+    close?.invoke()
+    // if close was called, it means the connection was created
+    completable.complete(true)
+  }
+  val cleanup: (() -> Unit)? = {
+    cleanup?.invoke()
+    completable.complete(!completable.isActive)
+  }
+  val connectionPlan = chatModel.controller.apiConnectPlan(rhId, uri)
  if (connectionPlan != null) {
    val link = strHasSingleSimplexLink(uri.trim())
    val linkText = if (link?.format is Format.SimplexLink)
@@ -333,6 +344,7 @@ suspend fun planAndConnect(
      )
    }
  }
+  return completable
 }

 suspend fun connectViaUri(
@@ -343,7 +355,7 @@ suspend fun connectViaUri(
  connectionPlan: ConnectionPlan?,
  close: (() -> Unit)?,
  cleanup: (() -> Unit)?,
-) {
+): Boolean {
  val pcc = chatModel.controller.apiConnect(rhId, incognito, uri)
  val connLinkType = if (connectionPlan != null) planToConnectionLinkType(connectionPlan) else ConnectionLinkType.INVITATION
  if (pcc != null) {
@@ -363,6 +375,7 @@ suspend fun connectViaUri(
    )
  }
  cleanup?.invoke()
+  return pcc != null
 }

 fun planToConnectionLinkType(connectionPlan: ConnectionPlan): ConnectionLinkType {
@@ -38,8 +38,7 @@ import chat.simplex.common.views.chat.topPaddingToContent
 import chat.simplex.common.views.helpers.*
 import chat.simplex.common.views.usersettings.*
 import chat.simplex.res.MR
-import kotlinx.coroutines.delay
-import kotlinx.coroutines.launch
+import kotlinx.coroutines.*
 import java.net.URI

 enum class NewChatOption {
@@ -559,15 +558,14 @@ private fun ConnectView(rhId: Long?, showQRCodeScanner: MutableState<Boolean>, p

    SectionView(stringResource(MR.strings.or_scan_qr_code).uppercase(), headerBottomPadding = 5.dp) {
      QRCodeScanner(showQRCodeScanner) { text ->
-        withBGApi {
-          val res = verify(rhId, text, close)
-          if (!res) {
-            AlertManager.shared.showAlertMsg(
-              title = generalGetString(MR.strings.invalid_qr_code),
-              text = generalGetString(MR.strings.code_you_scanned_is_not_simplex_link_qr_code)
-            )
-          }
+        val linkVerified = verifyOnly(text)
+        if (!linkVerified) {
+          AlertManager.shared.showAlertMsg(
+            title = generalGetString(MR.strings.invalid_qr_code),
+            text = generalGetString(MR.strings.code_you_scanned_is_not_simplex_link_qr_code)
+          )
        }
+        verifyAndConnect(rhId, text, close)
      }
    }
  }
@@ -656,23 +654,25 @@ private fun filteredProfiles(users: List<User>, searchTextOrPassword: String): L
  }
 }

-private suspend fun verify(rhId: Long?, text: String?, close: () -> Unit): Boolean {
+private fun verifyOnly(text: String?): Boolean = text != null && strIsSimplexLink(text)
+
+private suspend fun verifyAndConnect(rhId: Long?, text: String?, close: () -> Unit): Boolean {
  if (text != null && strIsSimplexLink(text)) {
-    connect(rhId, text, close)
-    return true
+    return withContext(Dispatchers.Default) {
+      connect(rhId, text, close)
+    }
  }
  return false
 }

-private suspend fun connect(rhId: Long?, link: String, close: () -> Unit, cleanup: (() -> Unit)? = null) {
+private suspend fun connect(rhId: Long?, link: String, close: () -> Unit, cleanup: (() -> Unit)? = null): Boolean =
  planAndConnect(
    rhId,
    link,
    close = close,
    cleanup = cleanup,
    incognito = null
-  )
-}
+  ).await()

 private fun createInvitation(
  rhId: Long?,
@@ -10,5 +10,5 @@ import chat.simplex.common.ui.theme.DEFAULT_PADDING_HALF
 expect fun QRCodeScanner(
  showQRCodeScanner: MutableState<Boolean> = remember { mutableStateOf(true) },
  padding: PaddingValues = PaddingValues(horizontal = DEFAULT_PADDING * 2f, vertical = DEFAULT_PADDING_HALF),
-  onBarcode: (String) -> Unit
+  onBarcode: suspend (String) -> Boolean
 )
@@ -342,6 +342,7 @@ private fun ChooseServerOperatorsInfoView() {
  ColumnWithScrollBar(Modifier.padding(horizontal = DEFAULT_PADDING)) {
    AppBarTitle(stringResource(MR.strings.onboarding_network_operators), withPadding = false)
    ReadableText(stringResource(MR.strings.onboarding_network_operators_app_will_use_different_operators))
+    ReadableText(stringResource(MR.strings.onboarding_network_operators_cant_see_who_talks_to_whom))
    ReadableText(stringResource(MR.strings.onboarding_network_operators_app_will_use_for_routing))
    SectionBottomSpacer()
  }
@@ -181,7 +181,7 @@ fun OnboardingInformationButton(
      .clip(CircleShape)
      .clickable { onClick() }
  ) {
-    Row(Modifier.padding(8.dp), horizontalArrangement = Arrangement.spacedBy(4.dp) ) {
+    Row(Modifier.padding(8.dp), horizontalArrangement = Arrangement.spacedBy(4.dp)) {
      Icon(
        painterResource(MR.images.ic_info),
        null,
@@ -40,6 +40,8 @@ import chat.simplex.res.MR
 import dev.icerock.moko.resources.ImageResource
 import dev.icerock.moko.resources.compose.painterResource
 import dev.icerock.moko.resources.compose.stringResource
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.withContext

@Composable
 fun ConnectDesktopView(close: () -> Unit) {
@@ -233,7 +235,7 @@ private fun FoundDesktop(
  SectionSpacer()

  if (compatible) {
-    SectionItemView({ confirmKnownDesktop(sessionAddress, rc) }) {
+    SectionItemView({ withBGApi { confirmKnownDesktop(sessionAddress, rc) } }) {
      Icon(painterResource(MR.images.ic_check), generalGetString(MR.strings.connect_button), tint = MaterialTheme.colors.secondary)
      TextIconSpaced(false)
      Text(generalGetString(MR.strings.connect_button))
@@ -356,7 +358,7 @@ private fun ScanDesktopAddressView(sessionAddress: MutableState<String>) {
  SectionView(stringResource(MR.strings.scan_qr_code_from_desktop).uppercase()) {
    QRCodeScanner { text ->
      sessionAddress.value = text
-      processDesktopQRCode(sessionAddress, text)
+      connectDesktopAddress(sessionAddress, text)
    }
  }
 }
@@ -398,7 +400,7 @@ private fun DesktopAddressView(sessionAddress: MutableState<String>) {
      stringResource(MR.strings.connect_to_desktop),
      disabled = sessionAddress.value.isEmpty(),
      click = {
-        connectDesktopAddress(sessionAddress, sessionAddress.value)
+        withBGApi { connectDesktopAddress(sessionAddress, sessionAddress.value) }
      },
    )
  }
@@ -461,10 +463,6 @@ private suspend fun updateRemoteCtrls(remoteCtrls: SnapshotStateList<RemoteCtrlI
  }
 }

-private fun processDesktopQRCode(sessionAddress: MutableState<String>, resp: String) {
-  connectDesktopAddress(sessionAddress, resp)
-}
-
 private fun findKnownDesktop(showConnectScreen: MutableState<Boolean>) {
  withBGApi {
    if (controller.findKnownRemoteCtrl()) {
@@ -478,45 +476,48 @@ private fun findKnownDesktop(showConnectScreen: MutableState<Boolean>) {
  }
 }

-private fun confirmKnownDesktop(sessionAddress: MutableState<String>, rc: RemoteCtrlInfo) {
-  connectDesktop(sessionAddress) {
-    controller.confirmRemoteCtrl(rc.remoteCtrlId)
+private suspend fun confirmKnownDesktop(sessionAddress: MutableState<String>, rc: RemoteCtrlInfo): Boolean {
+  return withContext(Dispatchers.Default) {
+    connectDesktop(sessionAddress) {
+      controller.confirmRemoteCtrl(rc.remoteCtrlId)
+    }
  }
 }

-private fun connectDesktopAddress(sessionAddress: MutableState<String>, addr: String) {
-  connectDesktop(sessionAddress) {
-    controller.connectRemoteCtrl(addr)
+private suspend fun connectDesktopAddress(sessionAddress: MutableState<String>, addr: String): Boolean {
+  return withContext(Dispatchers.Default)  {
+    connectDesktop(sessionAddress) {
+      controller.connectRemoteCtrl(addr)
+    }
  }
 }

-private fun connectDesktop(sessionAddress: MutableState<String>, connect: suspend () -> Pair<SomeRemoteCtrl?, CR.ChatCmdError?>) {
-  withBGApi {
-    val res = connect()
-    if (res.first != null) {
-      val (rc_, ctrlAppInfo, v) = res.first!!
-      sessionAddress.value = ""
-      chatModel.remoteCtrlSession.value = RemoteCtrlSession(
-        ctrlAppInfo = ctrlAppInfo,
-        appVersion = v,
-        sessionState = UIRemoteCtrlSessionState.Connecting(remoteCtrl_ = rc_)
-      )
-    } else {
-      val e = res.second ?: return@withBGApi
-      when {
-        e.chatError is ChatError.ChatErrorRemoteCtrl && e.chatError.remoteCtrlError is RemoteCtrlError.BadInvitation -> showBadInvitationErrorAlert()
-        e.chatError is ChatError.ChatErrorChat && e.chatError.errorType is ChatErrorType.CommandError -> showBadInvitationErrorAlert()
-        e.chatError is ChatError.ChatErrorRemoteCtrl && e.chatError.remoteCtrlError is RemoteCtrlError.BadVersion -> showBadVersionAlert(v = e.chatError.remoteCtrlError.appVersion)
-        e.chatError is ChatError.ChatErrorAgent && e.chatError.agentError is AgentErrorType.RCP && e.chatError.agentError.rcpErr is RCErrorType.VERSION -> showBadVersionAlert(v = null)
-        e.chatError is ChatError.ChatErrorAgent && e.chatError.agentError is AgentErrorType.RCP && e.chatError.agentError.rcpErr is RCErrorType.CTRL_AUTH -> showDesktopDisconnectedErrorAlert()
-        else -> {
-          val errMsg = "${e.responseType}: ${e.details}"
-          Log.e(TAG, "bad response: $errMsg")
-          AlertManager.shared.showAlertMsg(generalGetString(MR.strings.error), errMsg)
-        }
+private suspend fun connectDesktop(sessionAddress: MutableState<String>, connect: suspend () -> Pair<SomeRemoteCtrl?, CR.ChatCmdError?>): Boolean {
+  val res = connect()
+  if (res.first != null) {
+    val (rc_, ctrlAppInfo, v) = res.first!!
+    sessionAddress.value = ""
+    chatModel.remoteCtrlSession.value = RemoteCtrlSession(
+      ctrlAppInfo = ctrlAppInfo,
+      appVersion = v,
+      sessionState = UIRemoteCtrlSessionState.Connecting(remoteCtrl_ = rc_)
+    )
+  } else {
+    val e = res.second ?: return false
+    when {
+      e.chatError is ChatError.ChatErrorRemoteCtrl && e.chatError.remoteCtrlError is RemoteCtrlError.BadInvitation -> showBadInvitationErrorAlert()
+      e.chatError is ChatError.ChatErrorChat && e.chatError.errorType is ChatErrorType.CommandError -> showBadInvitationErrorAlert()
+      e.chatError is ChatError.ChatErrorRemoteCtrl && e.chatError.remoteCtrlError is RemoteCtrlError.BadVersion -> showBadVersionAlert(v = e.chatError.remoteCtrlError.appVersion)
+      e.chatError is ChatError.ChatErrorAgent && e.chatError.agentError is AgentErrorType.RCP && e.chatError.agentError.rcpErr is RCErrorType.VERSION -> showBadVersionAlert(v = null)
+      e.chatError is ChatError.ChatErrorAgent && e.chatError.agentError is AgentErrorType.RCP && e.chatError.agentError.rcpErr is RCErrorType.CTRL_AUTH -> showDesktopDisconnectedErrorAlert()
+      else -> {
+        val errMsg = "${e.responseType}: ${e.details}"
+        Log.e(TAG, "bad response: $errMsg")
+        AlertManager.shared.showAlertMsg(generalGetString(MR.strings.error), errMsg)
      }
    }
  }
+  return res.first != null
 }

 private fun verifyDesktopSessionCode(remoteCtrls: SnapshotStateList<RemoteCtrlInfo>, sessCode: String) {
@@ -26,6 +26,7 @@ fun ScanProtocolServerLayout(rhId: Long?, onNext: (UserServer) -> Unit) {
          text = generalGetString(MR.strings.smp_servers_check_address)
        )
      }
+      res != null
    }
  }
 }
@@ -15,8 +15,7 @@
    <string name="delete_chat_profile_action_cannot_be_undone_warning">لا يمكن التراجع عن هذا الإجراء - سيتم فقد ملف التعريف وجهات الاتصال والرسائل والملفات الخاصة بك بشكل نهائي.</string>
    <string name="alert_message_no_group">هذه المجموعة لم تعد موجودة.</string>
    <string name="this_QR_code_is_not_a_link">رمز QR هذا ليس رابطًا!</string>
-    <string name="next_generation_of_private_messaging">الجيل القادم من
-\nالرسائل الخاصة</string>
+    <string name="next_generation_of_private_messaging">الجيل القادم من \nالرسائل الخاصة</string>
    <string name="delete_files_and_media_desc">لا يمكن التراجع عن هذا الإجراء - سيتم حذف جميع الملفات والوسائط المستلمة والمرسلة. ستبقى الصور منخفضة الدقة.</string>
    <string name="enable_automatic_deletion_message">لا يمكن التراجع عن هذا الإجراء - سيتم حذف الرسائل المرسلة والمستلمة قبل التحديد. قد تأخذ عدة دقائق.</string>
    <string name="messages_section_description">ينطبق هذا الإعداد على الرسائل الموجودة في ملف تعريف الدردشة الحالي الخاص بك</string>
@@ -1075,8 +1075,9 @@
  <!-- ChooseServerOperators.kt -->
  <string name="onboarding_choose_server_operators">Server operators</string>
  <string name="onboarding_network_operators">Network operators</string>
-  <string name="onboarding_network_operators_app_will_use_different_operators">When more than one network operator is enabled, the app will use the servers of different operators for each conversation.</string>
-  <string name="onboarding_network_operators_app_will_use_for_routing">For example, if you receive messages via SimpleX Chat server, the app will use one of Flux servers for private routing.</string>
+  <string name="onboarding_network_operators_app_will_use_different_operators">The app protects your privacy by using different operators in each conversation.</string>
+  <string name="onboarding_network_operators_cant_see_who_talks_to_whom">When more than one operator is enabled, none of them has metadata to learn who communicates with whom.</string>
+  <string name="onboarding_network_operators_app_will_use_for_routing">For example, if your contact receives messages via a SimpleX Chat server, your app will deliver them via a Flux server.</string>
  <string name="onboarding_select_network_operators_to_use">Select network operators to use.</string>
  <string name="how_it_helps_privacy">How it helps privacy</string>
  <string name="onboarding_network_operators_configure_via_settings">You can configure servers via settings.</string>
@@ -1745,10 +1746,10 @@
  <string name="use_servers_of_operator_x">Use %s</string>
  <string name="operator_conditions_failed_to_load">Current conditions text couldn\'t be loaded, you can review conditions via this link:</string>
  <string name="operator_conditions_accepted_for_some"><![CDATA[Conditions are already accepted for following operator(s): <b>%s</b>.]]></string>
-  <string name="operator_same_conditions_will_be_applied"><![CDATA[Same conditions will apply to operator <b>%s</b>.]]></string>
-  <string name="operator_same_conditions_will_apply_to_operators"><![CDATA[Same conditions will apply to operator(s): <b>%s</b>.]]></string>
+  <string name="operator_same_conditions_will_be_applied"><![CDATA[The same conditions will apply to operator <b>%s</b>.]]></string>
+  <string name="operator_same_conditions_will_apply_to_operators"><![CDATA[The same conditions will apply to operator(s): <b>%s</b>.]]></string>
  <string name="operator_conditions_will_be_applied"><![CDATA[These conditions will also apply for: <b>%s</b>.]]></string>
-  <string name="operator_same_conditions_will_be_applied"><![CDATA[Same conditions will apply to operator: <b>%s</b>.]]></string>
+  <string name="operator_same_conditions_will_be_applied"><![CDATA[The same conditions will apply to operator: <b>%s</b>.]]></string>
  <string name="operator_conditions_will_be_accepted_for_some"><![CDATA[Conditions will be accepted for operator(s): <b>%s</b>.]]></string>
  <string name="operators_conditions_will_also_apply"><![CDATA[These conditions will also apply for: <b>%s</b>.]]></string>
  <string name="view_conditions">View conditions</string>
@@ -462,8 +462,7 @@
    <string name="callstate_connected">Verbunden</string>
    <string name="callstate_ended">Beendet</string>
    <!-- SimpleXInfo -->
-    <string name="next_generation_of_private_messaging">Die nächste Generation
-\ndes privaten Messagings</string>
+    <string name="next_generation_of_private_messaging">Die nächste Generation \ndes privaten Messagings</string>
    <string name="privacy_redefined">Datenschutz neu definiert</string>
    <string name="first_platform_without_user_ids">Keine Benutzerkennungen.</string>
    <string name="immune_to_spam_and_abuse">Immun gegen Spam</string>
@@ -737,8 +737,7 @@
    <string name="connection_you_accepted_will_be_cancelled">¡La conexión que has aceptado se cancelará!</string>
    <string name="database_initialization_error_desc">La base de datos no funciona correctamente. Pulsa para conocer más</string>
    <string name="moderate_message_will_be_marked_warning">El mensaje será marcado como moderado para todos los miembros.</string>
-    <string name="next_generation_of_private_messaging">La nueva generación
-\nde mensajería privada</string>
+    <string name="next_generation_of_private_messaging">La nueva generación \nde mensajería privada</string>
    <string name="delete_files_and_media_desc">Esta acción es irreversible. Se eliminarán todos los archivos y multimedia recibidos y enviados. Las imágenes de baja resolución permanecerán.</string>
    <string name="enable_automatic_deletion_message">Esta acción es irreversible. Los mensajes enviados y recibidos anteriores a la selección serán eliminados. Podría tardar varios minutos.</string>
    <string name="messages_section_description">Esta configuración se aplica a los mensajes del perfil actual</string>
@@ -438,8 +438,7 @@
    <string name="callstate_waiting_for_confirmation">en attente de confirmation…</string>
    <string name="callstate_connected">connecté</string>
    <string name="callstate_ended">terminé</string>
-    <string name="next_generation_of_private_messaging">La nouvelle génération
-\nde messagerie privée</string>
+    <string name="next_generation_of_private_messaging">La nouvelle génération \nde messagerie privée</string>
    <string name="privacy_redefined">La vie privée redéfinie</string>
    <string name="first_platform_without_user_ids">Aucun identifiant d\'utilisateur.</string>
    <string name="immune_to_spam_and_abuse">Protégé du spam</string>
@@ -156,7 +156,7 @@
    <string name="allow_disappearing_messages_only_if">Az eltűnő üzenetek küldése csak abban az esetben van engedélyezve, ha az ismerőse is engedélyezi.</string>
    <string name="icon_descr_audio_off">Hang kikapcsolva</string>
    <string name="allow_direct_messages">A közvetlen üzenetek küldése a tagok között engedélyezve van.</string>
-    <string name="settings_section_title_app">Alkalmazás</string>
+    <string name="settings_section_title_app">ALKALMAZÁS</string>
    <string name="icon_descr_call_progress">Hívás folyamatban</string>
    <string name="both_you_and_your_contact_can_add_message_reactions">Mindkét fél küldhet üzenetreakciókat.</string>
    <string name="both_you_and_your_contact_can_make_calls">Mindkét fél tud hívásokat kezdeményezni.</string>
@@ -360,7 +360,7 @@
    <string name="receipts_groups_disable_for_all">Letiltás az összes csoport számára</string>
    <string name="receipts_groups_enable_for_all">Engedélyezés az összes csoport számára</string>
    <string name="feature_enabled_for_contact">engedélyezve az ismerős számára</string>
-    <string name="disappearing_messages_are_prohibited">Az eltűnő üzenetek küldése le van tiltva ebben a csoportban.</string>
+    <string name="disappearing_messages_are_prohibited">Az eltűnő üzenetek küldése le van tiltva.</string>
    <string name="delete_address">Cím törlése</string>
    <string name="ttl_week">%d hét</string>
    <string name="desktop_address">Számítógép címe</string>
@@ -547,15 +547,15 @@
    <string name="from_gallery_button">A galériából</string>
    <string name="receipts_groups_enable_keep_overrides">Engedélyezés (csoport felülírások megtartásával)</string>
    <string name="error_deleting_contact">Hiba az ismerős törlésekor</string>
-    <string name="group_members_can_delete">A csoport tagjai véglegesen törölhetik az elküldött üzeneteiket. (24 óra)</string>
+    <string name="group_members_can_delete">A tagok véglegesen törölhetik az elküldött üzeneteiket. (24 óra)</string>
    <string name="error_changing_role">Hiba a szerepkör megváltoztatásakor</string>
    <string name="fix_connection_confirm">Javítás</string>
-    <string name="group_members_can_send_disappearing">A csoport tagjai küldhetnek eltűnő üzeneteket.</string>
+    <string name="group_members_can_send_disappearing">A tagok küldhetnek eltűnő üzeneteket.</string>
    <string name="fix_connection">Kapcsolat javítása</string>
    <string name="failed_to_create_user_title">Hiba a profil létrehozásakor!</string>
    <string name="error_adding_members">Hiba a tag(ok) hozzáadásakor</string>
    <string name="icon_descr_file">Fájl</string>
-    <string name="group_members_can_send_files">A csoport tagjai küldhetnek fájlokat és médiatartalmakat.</string>
+    <string name="group_members_can_send_files">A tagok küldhetnek fájlokat és médiatartalmakat.</string>
    <string name="delete_after">Törlés ennyi idő után</string>
    <string name="error_changing_message_deletion">Hiba a beállítás megváltoztatásakor</string>
    <string name="error_updating_link_for_group">Hiba a csoporthivatkozás frissítésekor</string>
@@ -565,7 +565,7 @@
    <string name="error_importing_database">Hiba a csevegési adatbázis importálásakor</string>
    <string name="error_enabling_delivery_receipts">Hiba a kézbesítési jelentések engedélyezésekor!</string>
    <string name="error_saving_xftp_servers">Hiba az XFTP-kiszolgálók mentésekor</string>
-    <string name="group_members_can_send_dms">A csoport tagjai küldhetnek egymásnak közvetlen üzeneteket.</string>
+    <string name="group_members_can_send_dms">A tagok küldhetnek egymásnak közvetlen üzeneteket.</string>
    <string name="error_removing_member">Hiba a tag eltávolításakor</string>
    <string name="callstate_ended">befejeződött</string>
    <string name="v4_6_group_welcome_message">A csoport üdvözlőüzenete</string>
@@ -589,7 +589,7 @@
    <string name="fix_connection_not_supported_by_contact">Ismerős általi javítás nem támogatott</string>
    <string name="file_not_found">Fájl nem található</string>
    <string name="smp_server_test_disconnect">Kapcsolat bontása</string>
-    <string name="group_members_can_add_message_reactions">A csoport tagjai üzenetreakciókat adhatnak hozzá.</string>
+    <string name="group_members_can_add_message_reactions">A tagok reakciókat adhatnak hozzá az üzenetekhez.</string>
    <string name="export_database">Adatbázis exportálása</string>
    <string name="full_name__field">Teljes név:</string>
    <string name="v4_6_reduced_battery_usage">Tovább csökkentett akkumulátor-használat</string>
@@ -600,7 +600,7 @@
    <string name="error_deleting_database">Hiba a csevegési adatbázis törlésekor</string>
    <string name="simplex_link_mode_full">Teljes hivatkozás</string>
    <string name="error_changing_address">Hiba a cím megváltoztatásakor</string>
-    <string name="group_members_can_send_voice">A csoport tagjai küldhetnek hangüzeneteket.</string>
+    <string name="group_members_can_send_voice">A tagok küldhetnek hangüzeneteket.</string>
    <string name="group_preferences">Csoportbeállítások</string>
    <string name="error_with_info">Hiba: %s</string>
    <string name="v4_4_disappearing_messages">Eltűnő üzenetek</string>
@@ -614,7 +614,7 @@
    <string name="conn_event_ratchet_sync_required">titkosítás-újraegyeztetés szükséges</string>
    <string name="v4_6_hidden_chat_profiles">Rejtett csevegési profilok</string>
    <string name="files_and_media_section">Fájlok és médiatartalmak</string>
-    <string name="image_saved">A kép mentve a „Galériába”</string>
+    <string name="image_saved">A kép elmentve a „Galériába”</string>
    <string name="hide_notification">Elrejtés</string>
    <string name="la_immediately">Azonnal</string>
    <string name="files_and_media_prohibited">A fájlok- és a médiatartalmak küldése le van tiltva!</string>
@@ -657,7 +657,7 @@
    <string name="service_notifications_disabled">Az azonnali értesítések le vannak tiltva!</string>
    <string name="service_notifications">Azonnali értesítések!</string>
    <string name="image_descr">Kép</string>
-    <string name="files_are_prohibited_in_group">A fájlok- és a médiatartalmak le vannak tiltva ebben a csoportban.</string>
+    <string name="files_are_prohibited_in_group">A fájlok- és a médiatartalmak küldése le van tiltva.</string>
    <string name="how_it_works">Hogyan működik</string>
    <string name="hide_dev_options">Elrejtés:</string>
    <string name="error_creating_member_contact">Hiba az ismerőssel történő kapcsolat létrehozásában</string>
@@ -721,11 +721,11 @@
    <string name="v5_3_new_desktop_app">Új számítógép-alkalmazás!</string>
    <string name="v4_6_group_moderation_descr">Most már az adminisztrátorok is:\n- törölhetik a tagok üzeneteit.\n- letilthatnak tagokat (megfigyelő szerepkör)</string>
    <string name="rcv_group_event_member_added">meghívta őt: %1$s</string>
-    <string name="message_reactions_are_prohibited">Az üzenetreakciók küldése le van tiltva ebben a csoportban.</string>
+    <string name="message_reactions_are_prohibited">A reakciók küldése az üzenetekre le van tiltva.</string>
    <string name="network_use_onion_hosts_no">Nem</string>
    <string name="item_info_no_text">nincs szöveg</string>
    <string name="member_info_section_title_member">TAG</string>
-    <string name="onboarding_notifications_mode_subtitle">Ez később a beállításokon keresztül módosítható.</string>
+    <string name="onboarding_notifications_mode_subtitle">Hogyan befolyásolja az akkumulátort</string>
    <string name="new_member_role">Új tag szerepköre</string>
    <string name="la_mode_off">Kikapcsolva</string>
    <string name="invalid_contact_link">Érvénytelen hivatkozás!</string>
@@ -751,7 +751,7 @@
    <string name="moderate_verb">Moderálás</string>
    <string name="chat_preferences_on">bekapcsolva</string>
    <string name="v5_1_japanese_portuguese_interface">Japán és portugál kezelőfelület</string>
-    <string name="message_deletion_prohibited_in_chat">Az üzenetek végleges törlése le van tiltva ebben a csoportban.</string>
+    <string name="message_deletion_prohibited_in_chat">Az üzenetek végleges törlése le van tiltva.</string>
    <string name="remote_host_was_disconnected_toast"><![CDATA[Kapcsolat bontva a(z) <b>%s</b> nevű hordozható eszközzel]]></string>
    <string name="custom_time_unit_months">hónap</string>
    <string name="privacy_message_draft">Üzenetvázlat</string>
@@ -793,7 +793,7 @@
    <string name="link_a_mobile">Hordozható eszköz társítása</string>
    <string name="settings_notifications_mode_title">Értesítési szolgáltatás</string>
    <string name="only_group_owners_can_enable_voice">Csak a csoporttulajdonosok engedélyezhetik a hangüzenetek küldését.</string>
-    <string name="only_client_devices_store_contacts_groups_e2e_encrypted_messages"><![CDATA[Csak az alkalmazások tárolják a felhasználó-profilokat, ismerősöket, csoportokat és a <b>2 rétegű végpontok közötti titkosítással</b> küldött üzeneteket.]]></string>
+    <string name="only_client_devices_store_contacts_groups_e2e_encrypted_messages">A felhasználói profilok, névjegyek, csoportok és üzenetek csak az eszközön kerülnek tárolásra a kliensen belül.</string>
    <string name="invalid_migration_confirmation">Érvénytelen átköltöztetési visszaigazolás</string>
    <string name="only_group_owners_can_change_prefs">Csak a csoporttulajdonosok módosíthatják a csoportbeállításokat.</string>
    <string name="no_history">Nincsenek előzmények</string>
@@ -801,7 +801,7 @@
    <string name="mark_read">Megjelölés olvasottként</string>
    <string name="live">ÉLŐ</string>
    <string name="mark_unread">Megjelölés olvasatlanként</string>
-    <string name="icon_descr_more_button">Több</string>
+    <string name="icon_descr_more_button">Továbbiak</string>
    <string name="auth_log_in_using_credential">Bejelentkezés hitelesítőadatokkal</string>
    <string name="invalid_message_format">érvénytelen üzenet formátum</string>
    <string name="join_group_button">Csatlakozás</string>
@@ -1163,7 +1163,7 @@
    <string name="prohibit_sending_voice_messages">A hangüzenetek küldése le van tiltva.</string>
    <string name="set_contact_name">Ismerős nevének beállítása</string>
    <string name="only_you_can_send_disappearing">Csak Ön tud eltűnő üzeneteket küldeni.</string>
-    <string name="share_image">Média megosztása…</string>
+    <string name="share_image">Médiatartalom megosztása…</string>
    <string name="group_info_member_you">Ön: %1$s</string>
    <string name="your_preferences">Beállítások</string>
    <string name="reset_color">Színek visszaállítása</string>
@@ -1272,7 +1272,7 @@
    <string name="database_downgrade_warning">Figyelmeztetés: néhány adat elveszhet!</string>
    <string name="tap_to_start_new_chat">Koppintson ide az új csevegés indításához</string>
    <string name="waiting_for_desktop">Várakozás a számítógépre…</string>
-    <string name="next_generation_of_private_messaging">A privát üzenetküldés\nkövetkező generációja</string>
+    <string name="next_generation_of_private_messaging">Az üzenetküldés jövője</string>
    <string name="update_network_settings_question">Hálózati beállítások megváltoztatása?</string>
    <string name="waiting_for_mobile_to_connect">Várakozás a hordozható eszköz társítására:</string>
    <string name="v4_4_verify_connection_security">Biztonságos kapcsolat hitelesítése</string>
@@ -1287,7 +1287,7 @@
    <string name="periodic_notifications_desc">Az új üzenetek rendszeresen letöltésre kerülnek az alkalmazás által – naponta néhány százalékot használ az akkumulátorból. Az alkalmazás nem használ push-értesítéseket – az eszközről származó adatok nem kerülnek elküldésre a kiszolgálóknak.</string>
    <string name="paste_desktop_address">Számítógép címének beillesztése</string>
    <string name="description_via_contact_address_link">kapcsolattartási cím-hivatkozáson keresztül</string>
-    <string name="to_preserve_privacy_simplex_has_background_service_instead_of_push_notifications_it_uses_a_few_pc_battery"><![CDATA[Az adatvédelem megőrzése érdekében a push-értesítési rendszer helyett az alkalmazás a <b>SimpleX-háttérszolgáltatást</b> használja - az akkumulátornak csak néhány százalékát használja naponta.]]></string>
+    <string name="to_preserve_privacy_simplex_has_background_service_instead_of_push_notifications_it_uses_a_few_pc_battery"><![CDATA[Az adatvédelem növelése érdekében <b> a SimpleX a háttérben fut</b> a push értesítések használata helyett.]]></string>
    <string name="alert_text_connection_pending_they_need_to_be_online_can_delete_and_retry">Az ismerősének online kell lennie ahhoz, hogy a kapcsolat létrejöjjön.\nVisszavonhatja ezt az ismerőskérelmet és eltávolíthatja az ismerőst (ezt később ismét megpróbálhatja egy új hivatkozással).</string>
    <string name="restore_passphrase_not_found_desc">A jelszó nem található a Keystore-ban, ezért kézzel szükséges megadni. Ez akkor történhetett meg, ha visszaállította az alkalmazás adatait egy biztonságimentési eszközzel. Ha nem így történt, akkor lépjen kapcsolatba a fejlesztőkkel.</string>
    <string name="your_contacts_will_remain_connected">Az ismerősei továbbra is kapcsolódva maradnak.</string>
@@ -1306,7 +1306,7 @@
    <string name="profile_will_be_sent_to_contact_sending_link">A profilja elküldésre kerül az ismerőse számára, akitől ezt a hivatkozást kapta.</string>
    <string name="system_restricted_background_in_call_desc">Az alkalmazás 1 perc után bezárható a háttérben.</string>
    <string name="group_preview_you_are_invited">meghívást kapott a csoportba</string>
-    <string name="turn_off_battery_optimization"><![CDATA[Használatához <b>engedélyezze a SimpleX háttérben történő futását</b> a következő párbeszédpanelen. Ellenkező esetben az értesítések letiltásra kerülnek.]]></string>
+    <string name="turn_off_battery_optimization"><![CDATA[<b>Engedélyezze</b> a következő párbeszédpanelen az azonnali értesítések fogadásához.]]></string>
    <string name="error_smp_test_server_auth">A kiszolgálónak engedélyre van szüksége a sorbaállítás létrehozásához, ellenőrizze jelszavát</string>
    <string name="you_will_join_group">Kapcsolódni fog a csoport összes tagjához.</string>
    <string name="error_smp_test_certificate">Lehetséges, hogy a kiszolgáló címében szereplő tanúsítvány-ujjlenyomat helytelen</string>
@@ -1349,7 +1349,7 @@
    <string name="alert_title_cant_invite_contacts_descr">Inkognitóprofilt használ ehhez a csoporthoz - fő profilja megosztásának elkerülése érdekében a meghívók küldése le van tiltva</string>
    <string name="v4_5_transport_isolation">Átvitel-izoláció</string>
    <string name="you_will_be_connected_when_your_connection_request_is_accepted">Akkor lesz kapcsolódva, ha a kapcsolatkérése elfogadásra kerül, várjon, vagy ellenőrizze később!</string>
-    <string name="voice_messages_are_prohibited">A hangüzenetek küldése le van tiltva ebben a csoportban.</string>
+    <string name="voice_messages_are_prohibited">A hangüzenetek küldése le van tiltva.</string>
    <string name="system_restricted_background_in_call_warn"><![CDATA[A háttérben való hívásokhoz válassza ki az <b>Alkalmazás akkumulátor-használata</b> / <b>Korlátlan</b> módot az alkalmazás beállításaiban.]]></string>
    <string name="v5_4_link_mobile_desktop_descr">Biztonságos kvantumrezisztens-protokollon keresztül.</string>
    <string name="v5_1_better_messages_descr">- 5 perc hosszúságú hangüzenetek.\n- egyéni üzenet-eltűnési időkorlát.\n- előzmények szerkesztése.</string>
@@ -1363,7 +1363,7 @@
    <string name="your_profile_is_stored_on_device_and_shared_only_with_contacts_simplex_cannot_see_it">A profilja az eszközén van tárolva és csak az ismerőseivel kerül megosztásra. A SimpleX-kiszolgálók nem láthatják a profilját.</string>
    <string name="snd_group_event_changed_member_role">Ön megváltoztatta %s szerepkörét erre: %s</string>
    <string name="you_rejected_group_invitation">Csoportmeghívó elutasítva</string>
-    <string name="to_protect_privacy_simplex_has_ids_for_queues">Az adatvédelem érdekében (a más csevegési platformokon megszokott felhasználó-azonosítók helyett) a SimpleX csak az üzenetek sorbaállításához használ azonosítókat, az összes ismerőséhez különbözőt.</string>
+    <string name="to_protect_privacy_simplex_has_ids_for_queues">Az Ön adatainak védelme érdekében a SimpleX külön üzenet-azonosítókat használ minden egyes kapcsolatához.</string>
    <string name="to_share_with_your_contact">(a megosztáshoz az ismerősével)</string>
    <string name="you_sent_group_invitation">Csoportmeghívó elküldve</string>
    <string name="update_network_session_mode_question">Átvitel-izoláció módjának frissítése?</string>
@@ -1450,7 +1450,7 @@
    <string name="v4_5_message_draft_descr">Az utolsó üzenet tervezetének megőrzése a mellékletekkel együtt.</string>
    <string name="saved_ICE_servers_will_be_removed">A mentett WebRTC ICE-kiszolgálók eltávolításra kerülnek.</string>
    <string name="receipts_groups_override_enabled">A kézbesítési jelentések engedélyezve vannak %d csoportban</string>
-    <string name="member_role_will_be_changed_with_notification">A szerepkör meg fog változni erre: %s. A csoportban az összes tag értesítve lesz.</string>
+    <string name="member_role_will_be_changed_with_notification">A szerepkör meg fog változni erre: %s. A csoport tagjai értesítést fognak kapni.</string>
    <string name="users_delete_with_connections">Profil és kiszolgálókapcsolatok</string>
    <string name="the_messaging_and_app_platform_protecting_your_privacy_and_security">Egy üzenetküldő- és alkalmazásplatform, amely védi az adatait és biztonságát.</string>
    <string name="tap_to_activate_profile">A profil aktiválásához koppintson az ikonra.</string>
@@ -1685,23 +1685,23 @@
    <string name="network_type_network_wifi">Wi-Fi</string>
    <string name="forwarded_description">továbbított</string>
    <string name="simplex_links_not_allowed">A SimpleX-hivatkozások küldése le van tiltva</string>
-    <string name="group_members_can_send_simplex_links">A csoport tagjai küldhetnek SimpleX-hivatkozásokat.</string>
+    <string name="group_members_can_send_simplex_links">A tagok küldhetnek SimpleX-hivatkozásokat.</string>
    <string name="feature_roles_owners">tulajdonosok</string>
    <string name="feature_roles_admins">adminisztrátorok</string>
    <string name="feature_roles_all_members">összes tag</string>
    <string name="simplex_links">SimpleX-hivatkozások</string>
    <string name="voice_messages_not_allowed">A hangüzenetek küldése le van tiltva</string>
-    <string name="simplex_links_are_prohibited_in_group">A SimpleX-hivatkozások küldése le van tiltva ebben a csoportban.</string>
+    <string name="simplex_links_are_prohibited_in_group">A SimpleX-hivatkozások küldése le van tiltva.</string>
    <string name="prohibit_sending_simplex_links">A SimpleX-hivatkozások küldése le van tiltva</string>
    <string name="files_and_media_not_allowed">A fájlok- és médiatartalmak nincsenek engedélyezve</string>
    <string name="allow_to_send_simplex_links">A SimpleX-hivatkozások küldése engedélyezve van.</string>
    <string name="feature_enabled_for">Számukra engedélyezve:</string>
    <string name="saved_description">mentett</string>
-    <string name="saved_from_description">mentve innen: %s</string>
+    <string name="saved_from_description">elmentve innen: %s</string>
    <string name="forwarded_from_chat_item_info_title">Továbbítva innen:</string>
    <string name="recipients_can_not_see_who_message_from">A címzett(ek) nem látja(k), hogy kitől származik ez az üzenet.</string>
    <string name="saved_chat_item_info_tab">Mentett</string>
-    <string name="saved_from_chat_item_info_title">Mentve innen:</string>
+    <string name="saved_from_chat_item_info_title">Elmentve innen:</string>
    <string name="download_file">Letöltés</string>
    <string name="forward_chat_item">Továbbítás</string>
    <string name="forwarded_chat_item_info_tab">Továbbított</string>
@@ -1790,7 +1790,7 @@
    <string name="color_primary_variant2">További kiemelés 2</string>
    <string name="theme_destination_app_theme">Alkalmazás téma</string>
    <string name="v5_8_persian_ui">Perzsa kezelőfelület</string>
-    <string name="v5_8_private_routing_descr">Védje IP-címét az ismerősei által kiválasztott üzenet-közvetítő-kiszolgálókkal szemben.\nEngedélyezze a „Beállítások / Hálózat és kiszolgálók” menüben.</string>
+    <string name="v5_8_private_routing_descr">Védje IP-címét az ismerősei által kiválasztott üzenet-közvetítő-kiszolgálókkal szemben.\nEngedélyezze a *Hálózat és kiszolgálók* menüben.</string>
    <string name="v5_8_safe_files_descr">Ismeretlen kiszolgálókról származó fájlok megerősítése.</string>
    <string name="v5_8_message_delivery">Javított üzenetkézbesítés</string>
    <string name="chat_theme_reset_to_app_theme">Alkalmazás témájának visszaállítása</string>
@@ -1938,7 +1938,7 @@
    <string name="proxy_destination_error_broker_version">A(z) %1$s célkiszolgáló verziója nem kompatibilis a(z) %2$s továbbító kiszolgálóval.</string>
    <string name="proxy_destination_error_failed_to_connect">A(z) %1$s továbbító-kiszolgáló nem tudott csatlakozni a(z) %2$s célkiszolgálóhoz. Próbálja meg később.</string>
    <string name="proxy_destination_error_broker_host">A(z) %1$s célkiszolgáló címe nem kompatibilis a(z) %2$s továbbító-kiszolgáló beállításaival.</string>
-    <string name="privacy_media_blur_radius">Média elhomályosítása</string>
+    <string name="privacy_media_blur_radius">Médiatartalom elhomályosítása</string>
    <string name="privacy_media_blur_radius_medium">Közepes</string>
    <string name="privacy_media_blur_radius_off">Kikapcsolva</string>
    <string name="privacy_media_blur_radius_soft">Enyhe</string>
@@ -1966,7 +1966,7 @@
    <string name="keep_conversation">Beszélgetés megtartása</string>
    <string name="confirm_delete_contact_question">Biztosan törli az ismerőst?</string>
    <string name="info_view_connect_button">kapcsolódás</string>
-    <string name="one_hand_ui">Könnyen elérhető eszköztár</string>
+    <string name="one_hand_ui">Könnyen elérhető alkalmazás-eszköztárak</string>
    <string name="delete_without_notification">Törlés értesítés nélkül</string>
    <string name="toolbar_settings">Beállítások</string>
    <string name="info_view_search_button">keresés</string>
@@ -2108,7 +2108,7 @@
    <string name="or_to_share_privately">Vagy a privát megosztáshoz</string>
    <string name="simplex_address_or_1_time_link">SimpleX-cím vagy egyszer használható meghívó-hivatkozás?</string>
    <string name="create_1_time_link">Egyszer használható meghívó-hivatkozás létrehozása</string>
-    <string name="onboarding_choose_server_operators">Üzemeltetők kiválasztása</string>
+    <string name="onboarding_choose_server_operators">Kiszolgáló-üzemeltetők</string>
    <string name="onboarding_network_operators">Hálózati üzemeltetők</string>
    <string name="onboarding_network_operators_app_will_use_different_operators">Amikor egynél több hálózati üzemeltető van engedélyezve, akkor az alkalmazás minden egyes beszélgetéshez a különböző üzemeltetők kiszolgálóit használja.</string>
    <string name="onboarding_network_operators_app_will_use_for_routing">Ha például a SimpleX Chat kiszolgálón keresztül fogadja az üzeneteket, az alkalmazás a Flux egyik kiszolgálóját használja a privát útválasztáshoz.</string>
@@ -2170,4 +2170,39 @@
    <string name="xftp_servers_per_user">Az Ön jelenlegi csevegőprofiljához tartozó új fájlok kiszolgálói</string>
    <string name="chat_archive">Vagy archívumfájl importálása</string>
    <string name="remote_hosts_section">Távoli hordozható eszközök</string>
+    <string name="xiaomi_ignore_battery_optimization"><![CDATA[<b>Xiaomi eszközök</b>: engedélyezze az automatikus indítást a rendszerbeállításokban, hogy az értesítések működjenek.]]></string>
+    <string name="maximum_message_size_reached_forwarding">A küldéshez másolhatja és csökkentheti az üzenet méretét.</string>
+    <string name="add_your_team_members_to_conversations">Adja hozzá csapattagjait a beszélgetésekhez.</string>
+    <string name="business_address">Üzleti cím</string>
+    <string name="all_message_and_files_e2e_encrypted"><![CDATA[Az összes üzenet és fájl <b>végpontok közötti titkosítással</b>, a közvetlen üzenetek továbbá kvantumrezisztens titkosítással is rendelkeznek.]]></string>
+    <string name="how_it_helps_privacy">Hogyan segíti az adatvédelmet</string>
+    <string name="onboarding_notifications_mode_off_desc_short">Nincs háttérszolgáltatás</string>
+    <string name="onboarding_notifications_mode_battery">Értesítések és akkumulátor</string>
+    <string name="onboarding_notifications_mode_service_desc_short">Az alkalmazás mindig fut a háttérben</string>
+    <string name="leave_chat_question">Csevegés elhagyása?</string>
+    <string name="you_will_stop_receiving_messages_from_this_chat_chat_history_will_be_preserved">Ön nem fog több üzenetet kapni ebből a csevegésből, de a csevegés előzményei megmaradnak.</string>
+    <string name="button_delete_chat">Csevegés törlése</string>
+    <string name="invite_to_chat_button">Meghívás a csevegésbe</string>
+    <string name="button_add_friends">Barátok hozzáadása</string>
+    <string name="button_add_team_members">Csapattagok hozzáadása</string>
+    <string name="delete_chat_for_all_members_cannot_undo_warning">A csevegés minden tag számára törlésre kerül - ezt a műveletet nem lehet visszavonni!</string>
+    <string name="delete_chat_for_self_cannot_undo_warning">A csevegés törlésre kerül az Ön számára - ezt a műveletet nem lehet visszavonni!</string>
+    <string name="delete_chat_question">Csevegés törlése?</string>
+    <string name="button_leave_chat">Csevegés elhagyása</string>
+    <string name="only_chat_owners_can_change_prefs">Csak a csevegés tulajdonosai módosíthatják a beállításokat.</string>
+    <string name="chat_bottom_bar">Könnyen elérhető csevegési eszköztár</string>
+    <string name="member_will_be_removed_from_chat_cannot_be_undone">A tag el lesz távolítva a csevegésből - ezt a műveletet nem lehet visszavonni!</string>
+    <string name="info_row_chat">Csevegés</string>
+    <string name="member_role_will_be_changed_with_notification_chat">A szerepkör meg fog változni a következőre: %s. A csevegés tagjai értesítést fognak kapni.</string>
+    <string name="chat_main_profile_sent">Az Ön csevegési profilja el lesz küldve a csevegésben résztvevő tagok számára</string>
+    <string name="direct_messages_are_prohibited">A tagok közötti közvetlen üzenetek le vannak tiltva.</string>
+    <string name="v6_2_business_chats">Üzleti csevegések</string>
+    <string name="v6_2_business_chats_descr">Az Ön ügyfeleinek adatvédelme.</string>
+    <string name="connect_plan_you_are_already_connected_with_vName"><![CDATA[Ön már kapcsolódva van vele: <b>%1$s</b>.]]></string>
+    <string name="connect_plan_chat_already_exists">A csevegés már létezik!</string>
+    <string name="maximum_message_size_reached_text">Csökkentse az üzenet méretét, és küldje el újra.</string>
+    <string name="onboarding_notifications_mode_periodic_desc_short">Üzenetek ellenőrzése 10 percenként</string>
+    <string name="maximum_message_size_title">Az üzenet túl nagy!</string>
+    <string name="maximum_message_size_reached_non_text">Csökkentse az üzenet méretét vagy távolítsa el a médiát, és küldje el újra.</string>
+    <string name="direct_messages_are_prohibited_in_chat">A tagok közötti közvetlen üzenetek le vannak tiltva ebben a csevegésben.</string>
 </resources>
@@ -1294,4 +1294,57 @@
    <string name="button_remove_member_question">Hapus anggota?</string>
    <string name="button_remove_member">Hapus anggota</string>
    <string name="saved_message_title">Pesan tersimpan</string>
+    <string name="cant_call_member_alert_title">Tak dapat memanggil anggota grup</string>
+    <string name="operators_conditions_accepted_for"><![CDATA[Ketentuan diterima untuk operator: <b>%s</b>.]]></string>
+    <string name="operators_conditions_will_be_accepted_for"><![CDATA[Ketentuan akan diterima untuk operator: <b>%s</b>.]]></string>
+    <string name="operator">Operator</string>
+    <string name="operator_use_operator_toggle_description">Gunakan server</string>
+    <string name="use_servers_of_operator_x">Gunakan %s</string>
+    <string name="cant_send_message_to_member_alert_title">Tak dapat kirim pesan ke anggota grup</string>
+    <string name="group_welcome_title">Pesan sambutan</string>
+    <string name="save_welcome_message_question">Simpan pesan sambutan?</string>
+    <string name="fix_connection_not_supported_by_group_member">Perbaikan tidak didukung oleh anggota grup</string>
+    <string name="create_secret_group_title">Buat grup rahasia</string>
+    <string name="renegotiate_encryption">Negosiasi ulang enkripsi</string>
+    <string name="group_display_name_field">Masukkan nama grup:</string>
+    <string name="group_welcome_preview">Pratinjau</string>
+    <string name="cant_call_member_send_message_alert_text">Kirim pesan untuk aktifkan panggilan.</string>
+    <string name="cant_call_contact_deleted_alert_text">Kontak dihapus.</string>
+    <string name="cant_call_contact_alert_title">Tak dapat memanggil kontak</string>
+    <string name="fix_connection_confirm">Perbaiki</string>
+    <string name="group_is_decentralized">Sepenuhnya terdesentralisasi – hanya terlihat oleh anggota.</string>
+    <string name="fix_connection">Perbaiki koneksi</string>
+    <string name="fix_connection_question">Perbaiki koneksi?</string>
+    <string name="operator_review_conditions">Tinjau ketentuan</string>
+    <string name="network_preset_servers_title">Server prasetel</string>
+    <string name="operator_conditions_accepted">Ketentuan diterima</string>
+    <string name="operator_conditions_accepted_for_enabled_operators_on">Ketentuan akan otomatis diterima untuk operator yang diaktifkan pada: %s.</string>
+    <string name="you_need_to_allow_calls">Anda perlu izinkan kontak Anda agar dapat memanggilnya.</string>
+    <string name="message_too_large">Pesan terlalu besar</string>
+    <string name="enter_welcome_message">Masukkan pesan sambutan…</string>
+    <string name="save_and_update_group_profile">Simpan dan perbarui profil grup</string>
+    <string name="welcome_message_is_too_long">Pesan sambutan terlalu panjang</string>
+    <string name="fix_connection_not_supported_by_contact">Perbaikan tidak didukung oleh kontak</string>
+    <string name="info_row_chat">Obrolan</string>
+    <string name="accept_conditions">Terima kondisi</string>
+    <string name="conn_stats_section_title_servers">SERVER</string>
+    <string name="create_group_button">Buat grup</string>
+    <string name="group_full_name_field">Nama lengkap grup:</string>
+    <string name="save_group_profile">Simpan profil grup</string>
+    <string name="operator_website">Peramban</string>
+    <string name="your_servers">Server Anda</string>
+    <string name="error_saving_group_profile">Gagal simpan profil grup</string>
+    <string name="operator_servers_title">%s server</string>
+    <string name="operator_info_title">Operator jaringan</string>
+    <string name="operator_conditions_accepted_on">Ketentuan diterima pada: %s.</string>
+    <string name="operator_conditions_will_be_accepted_on">Ketentuan akan diterima pada: %s.</string>
+    <string name="info_row_connection">Koneksi</string>
+    <string name="role_in_group">Rol</string>
+    <string name="change_role">Ganti rol</string>
+    <string name="group_main_profile_sent">Profil obrolan Anda akan dikirim ke anggota grup</string>
+    <string name="chat_main_profile_sent">Profil obrolan Anda akan dikirim ke anggota obrolan</string>
+    <string name="group_profile_is_stored_on_members_devices">Profil grup disimpan di perangkat anggota, bukan di server.</string>
+    <string name="conn_level_desc_direct">langsung</string>
+    <string name="sending_via">Kirim via</string>
+    <string name="receiving_via">Terima via</string>
 </resources>
@@ -211,8 +211,8 @@
    <string name="connection_error_auth_desc">A meno che il tuo contatto non abbia eliminato la connessione o che questo link non sia già stato usato, potrebbe essere un errore; per favore segnalalo.
 \nPer connetterti, chiedi al tuo contatto di creare un altro link di connessione e controlla di avere una connessione di rete stabile.</string>
    <string name="error_smp_test_certificate">Probabilmente l\'impronta del certificato nell\'indirizzo del server è sbagliata</string>
-    <string name="to_preserve_privacy_simplex_has_background_service_instead_of_push_notifications_it_uses_a_few_pc_battery"><![CDATA[Per rispettare la tua privacy, invece delle notifiche push l\'app ha un <b>servizio SimpleX in secondo piano</b>; usa una piccola percentuale di batteria al giorno.]]></string>
-    <string name="turn_off_battery_optimization"><![CDATA[Per usarlo, <b>consenti a SimpleX di funzionare in secondo piano</b> nella prossima schermata. Altrimenti le notifiche saranno disattivate.]]></string>
+    <string name="to_preserve_privacy_simplex_has_background_service_instead_of_push_notifications_it_uses_a_few_pc_battery"><![CDATA[Per migliorare la privacy, <b>SimpleX funziona in secondo piano</b> invece di usare le notifiche push.]]></string>
+    <string name="turn_off_battery_optimization"><![CDATA[<b>Consentilo</b> nella prossima schermata per ricevere le notifiche immediatamente.]]></string>
    <string name="simplex_service_notification_title">Servizio SimpleX Chat</string>
    <string name="notifications_mode_service_desc">Servizio in secondo piano sempre attivo. Le notifiche verranno mostrate appena i messaggi saranno disponibili.</string>
    <string name="la_notice_title_simplex_lock">SimpleX Lock</string>
@@ -478,7 +478,7 @@
    <string name="ttl_h">%do</string>
    <string name="ttl_hour">%d ora</string>
    <string name="ttl_hours">%d ore</string>
-    <string name="disappearing_messages_are_prohibited">I messaggi a tempo sono vietati in questo gruppo.</string>
+    <string name="disappearing_messages_are_prohibited">I messaggi a tempo sono vietati.</string>
    <string name="ttl_m">%dm</string>
    <string name="ttl_min">%d min</string>
    <string name="ttl_month">%d mese</string>
@@ -490,10 +490,10 @@
    <string name="ttl_week">%d settimana</string>
    <string name="ttl_weeks">%d settimane</string>
    <string name="v4_2_group_links">Link del gruppo</string>
-    <string name="group_members_can_delete">I membri del gruppo possono eliminare irreversibilmente i messaggi inviati. (24 ore)</string>
-    <string name="group_members_can_send_dms">I membri del gruppo possono inviare messaggi diretti.</string>
-    <string name="group_members_can_send_disappearing">I membri del gruppo possono inviare messaggi a tempo.</string>
-    <string name="group_members_can_send_voice">I membri del gruppo possono inviare messaggi vocali.</string>
+    <string name="group_members_can_delete">I membri possono eliminare irreversibilmente i messaggi inviati. (24 ore)</string>
+    <string name="group_members_can_send_dms">I membri possono inviare messaggi diretti.</string>
+    <string name="group_members_can_send_disappearing">I membri possono inviare messaggi a tempo.</string>
+    <string name="group_members_can_send_voice">I membri possono inviare messaggi vocali.</string>
    <string name="v4_4_verify_connection_security_desc">Confronta i codici di sicurezza con i tuoi contatti.</string>
    <string name="v4_4_disappearing_messages">Messaggi a tempo</string>
    <string name="v4_3_improved_privacy_and_security_desc">Nascondi la schermata dell\'app nelle app recenti.</string>
@@ -648,9 +648,9 @@
    <string name="incoming_audio_call">Chiamata in arrivo</string>
    <string name="incoming_video_call">Videochiamata in arrivo</string>
    <string name="onboarding_notifications_mode_service">Istantaneo</string>
-    <string name="onboarding_notifications_mode_subtitle">Può essere cambiato in seguito via impostazioni.</string>
+    <string name="onboarding_notifications_mode_subtitle">Come influisce sulla batteria</string>
    <string name="make_private_connection">Crea una connessione privata</string>
-    <string name="only_client_devices_store_contacts_groups_e2e_encrypted_messages"><![CDATA[Solo i dispositivi client memorizzano i profili utente, i contatti, i gruppi e i messaggi inviati con <b>crittografia end-to-end a 2 livelli</b>.]]></string>
+    <string name="only_client_devices_store_contacts_groups_e2e_encrypted_messages">Solo i dispositivi client memorizzano i profili utente, i contatti, i gruppi e i messaggi.</string>
    <string name="opensource_protocol_and_code_anybody_can_run_servers">Chiunque può installare i server.</string>
    <string name="paste_the_link_you_received">Incolla il link che hai ricevuto</string>
    <string name="people_can_connect_only_via_links_you_share">Sei tu a decidere chi può connettersi.</string>
@@ -660,9 +660,8 @@
    <string name="read_more_in_github_with_link"><![CDATA[Maggiori informazioni nel nostro <font color="#0088ff">repository GitHub</font>.]]></string>
    <string name="reject">Rifiuta</string>
    <string name="first_platform_without_user_ids">Nessun identificatore utente.</string>
-    <string name="next_generation_of_private_messaging">La nuova generazione
-\ndi messaggistica privata</string>
-    <string name="to_protect_privacy_simplex_has_ids_for_queues">Per proteggere la privacy, invece degli ID utente usati da tutte le altre piattaforme, SimpleX dispone di identificatori per le code dei messaggi, separati per ciascuno dei tuoi contatti.</string>
+    <string name="next_generation_of_private_messaging">Il futuro dei messaggi</string>
+    <string name="to_protect_privacy_simplex_has_ids_for_queues">Per proteggere la tua privacy, SimpleX usa ID separati per ciascuno dei tuoi contatti.</string>
    <string name="use_chat">Usa la chat</string>
    <string name="icon_descr_video_call">videochiamata</string>
    <string name="video_call_no_encryption">videochiamata (non crittografata e2e)</string>
@@ -843,7 +842,7 @@
    <string name="your_preferences">Le tue preferenze</string>
    <string name="v4_3_improved_server_configuration">Configurazione del server migliorata</string>
    <string name="v4_3_irreversible_message_deletion">Eliminazione irreversibile del messaggio</string>
-    <string name="message_deletion_prohibited_in_chat">L\'eliminazione irreversibile dei messaggi è vietata in questo gruppo.</string>
+    <string name="message_deletion_prohibited_in_chat">L\'eliminazione irreversibile dei messaggi è vietata.</string>
    <string name="v4_3_voice_messages_desc">Max 40 secondi, ricevuto istantaneamente.</string>
    <string name="new_in_version">Novità nella %s</string>
    <string name="only_you_can_send_voice">Solo tu puoi inviare messaggi vocali.</string>
@@ -856,7 +855,7 @@
    <string name="v4_2_security_assessment_desc">La sicurezza di SimpleX Chat è stata verificata da Trail of Bits.</string>
    <string name="v4_3_voice_messages">Messaggi vocali</string>
    <string name="voice_prohibited_in_this_chat">I messaggi vocali sono vietati in questa chat.</string>
-    <string name="voice_messages_are_prohibited">I messaggi vocali sono vietati in questo gruppo.</string>
+    <string name="voice_messages_are_prohibited">I messaggi vocali sono vietati.</string>
    <string name="whats_new">Novità</string>
    <string name="v4_2_auto_accept_contact_requests_desc">Con messaggio di benvenuto facoltativo.</string>
    <string name="v4_3_irreversible_message_deletion_desc">I tuoi contatti possono consentire l\'eliminazione completa dei messaggi.</string>
@@ -1171,7 +1170,7 @@
    <string name="change_self_destruct_passcode">Cambia codice di autodistruzione</string>
    <string name="message_reactions">Reazioni ai messaggi</string>
    <string name="message_reactions_prohibited_in_this_chat">Le reazioni ai messaggi sono vietate in questa chat.</string>
-    <string name="message_reactions_are_prohibited">Le reazioni ai messaggi sono vietate in questo gruppo.</string>
+    <string name="message_reactions_are_prohibited">Le reazioni ai messaggi sono vietate.</string>
    <string name="only_you_can_add_message_reactions">Solo tu puoi aggiungere reazioni ai messaggi.</string>
    <string name="prohibit_message_reactions">Proibisci le reazioni ai messaggi.</string>
    <string name="prohibit_message_reactions_group">Proibisci le reazioni ai messaggi.</string>
@@ -1180,7 +1179,7 @@
    <string name="only_your_contact_can_add_message_reactions">Solo il tuo contatto può aggiungere reazioni ai messaggi.</string>
    <string name="allow_your_contacts_adding_message_reactions">Consenti ai tuoi contatti di aggiungere reazioni ai messaggi.</string>
    <string name="allow_message_reactions_only_if">Consenti reazioni ai messaggi solo se il tuo contatto le consente.</string>
-    <string name="group_members_can_add_message_reactions">I membri del gruppo possono aggiungere reazioni ai messaggi.</string>
+    <string name="group_members_can_add_message_reactions">I membri possono aggiungere reazioni ai messaggi.</string>
    <string name="send_disappearing_message_30_seconds">30 secondi</string>
    <string name="send_disappearing_message_send">Invia</string>
    <string name="send_disappearing_message">Invia messaggio a tempo</string>
@@ -1244,10 +1243,10 @@
    <string name="error_aborting_address_change">Errore nell\'interruzione del cambio di indirizzo</string>
    <string name="only_owners_can_enable_files_and_media">Solo i proprietari del gruppo possono attivare file e contenuti multimediali.</string>
    <string name="files_and_media">File e multimediali</string>
-    <string name="group_members_can_send_files">I membri del gruppo possono inviare file e contenuti multimediali.</string>
+    <string name="group_members_can_send_files">I membri possono inviare file e contenuti multimediali.</string>
    <string name="prohibit_sending_files">Proibisci l\'invio di file e contenuti multimediali.</string>
    <string name="abort_switch_receiving_address_desc">Il cambio di indirizzo verrà interrotto. Verrà usato il vecchio indirizzo di ricezione.</string>
-    <string name="files_are_prohibited_in_group">File e contenuti multimediali sono vietati in questo gruppo.</string>
+    <string name="files_are_prohibited_in_group">File e contenuti multimediali sono vietati.</string>
    <string name="files_and_media_prohibited">File e contenuti multimediali vietati!</string>
    <string name="la_mode_off">Off</string>
    <string name="no_filtered_chats">Nessuna chat filtrata</string>
@@ -1723,11 +1722,11 @@
    <string name="allow_to_send_simplex_links">Consenti di inviare link di SimpleX.</string>
    <string name="prohibit_sending_simplex_links">Vieta l\'invio di link di SimpleX</string>
    <string name="feature_enabled_for">Attivo per</string>
-    <string name="group_members_can_send_simplex_links">I membri del gruppo possono inviare link di Simplex.</string>
+    <string name="group_members_can_send_simplex_links">I membri possono inviare link di Simplex.</string>
    <string name="feature_roles_owners">proprietari</string>
    <string name="feature_roles_admins">amministratori</string>
    <string name="feature_roles_all_members">tutti i membri</string>
-    <string name="simplex_links_are_prohibited_in_group">I link di SimpleX sono vietati in questo gruppo.</string>
+    <string name="simplex_links_are_prohibited_in_group">I link di SimpleX sono vietati.</string>
    <string name="saved_description">salvato</string>
    <string name="saved_from_chat_item_info_title">Salvato da</string>
    <string name="forward_message">Inoltra messaggio…</string>
@@ -1999,7 +1998,7 @@
    <string name="no_filtered_contacts">Nessun contatto filtrato</string>
    <string name="paste_link">Incolla link</string>
    <string name="contact_list_header_title">I tuoi contatti</string>
-    <string name="one_hand_ui">Barra degli strumenti di chat accessibile</string>
+    <string name="one_hand_ui">Barre degli strumenti dell\'app accessibili</string>
    <string name="action_button_add_members">Invita</string>
    <string name="allow_calls_question">Consentire le chiamate?</string>
    <string name="calls_prohibited_alert_title">Chiamate proibite!</string>
@@ -2135,7 +2134,7 @@
    <string name="onboarding_network_operators">Operatori di rete</string>
    <string name="onboarding_network_operators_app_will_use_different_operators">Quando più di un operatore di rete è attivato, l\'app userà i server di diversi operatori per ogni conversazione.</string>
    <string name="onboarding_network_operators_conditions_you_can_configure">Puoi configurare gli operatori nelle impostazioni di rete e server.</string>
-    <string name="onboarding_choose_server_operators">Scegli gli operatori</string>
+    <string name="onboarding_choose_server_operators">Operatori del server</string>
    <string name="onboarding_select_network_operators_to_use">Seleziona gli operatori di rete da usare.</string>
    <string name="onboarding_network_operators_continue">Continua</string>
    <string name="onboarding_network_operators_update">Aggiorna</string>
@@ -2213,4 +2212,39 @@
    <string name="share_simplex_address_on_social_media">Condividi indirizzo SimpleX sui social media.</string>
    <string name="chat_archive">O importa file archivio</string>
    <string name="remote_hosts_section">Telefoni remoti</string>
+    <string name="direct_messages_are_prohibited_in_chat">I messaggi diretti tra i membri sono vietati in questa chat.</string>
+    <string name="xiaomi_ignore_battery_optimization"><![CDATA[<b>Dispositivi Xiaomi</b>: attiva l\'avvio automatico nelle impostazioni di sistema per fare funzionare le notifiche.]]></string>
+    <string name="add_your_team_members_to_conversations">Aggiungi i membri del tuo team alle conversazioni.</string>
+    <string name="business_address">Indirizzo di lavoro</string>
+    <string name="all_message_and_files_e2e_encrypted"><![CDATA[Tutti i messaggi e i file sono <b>cifrati end-to-end</b>, con sicurezza quantistica nei messaggi diretti.]]></string>
+    <string name="onboarding_notifications_mode_periodic_desc_short">Controlla i messaggi ogni 10 minuti</string>
+    <string name="how_it_helps_privacy">Come aiuta la privacy</string>
+    <string name="invite_to_chat_button">Invita in chat</string>
+    <string name="button_add_team_members">Aggiungi membri del team</string>
+    <string name="info_row_chat">Chat</string>
+    <string name="direct_messages_are_prohibited">I messaggi diretti tra i membri sono vietati.</string>
+    <string name="connect_plan_chat_already_exists">La chat esiste già!</string>
+    <string name="connect_plan_you_are_already_connected_with_vName"><![CDATA[Sei già connesso/a con <b>%1$s</b>.]]></string>
+    <string name="leave_chat_question">Uscire dalla chat?</string>
+    <string name="delete_chat_for_self_cannot_undo_warning">La chat verrà eliminata solo per te, non è reversibile!</string>
+    <string name="button_leave_chat">Esci dalla chat</string>
+    <string name="v6_2_business_chats">Chat di lavoro</string>
+    <string name="delete_chat_for_all_members_cannot_undo_warning">La chat verrà eliminata per tutti i membri, non è reversibile!</string>
+    <string name="button_add_friends">Aggiungi amici</string>
+    <string name="onboarding_notifications_mode_service_desc_short">L\'app funziona sempre in secondo piano</string>
+    <string name="button_delete_chat">Elimina chat</string>
+    <string name="delete_chat_question">Eliminare la chat?</string>
+    <string name="maximum_message_size_title">Il messaggio è troppo grande!</string>
+    <string name="maximum_message_size_reached_text">Riduci la dimensione del messaggio e invialo di nuovo.</string>
+    <string name="maximum_message_size_reached_non_text">Riduci la dimensione del messaggio o rimuovi i media e invialo di nuovo.</string>
+    <string name="onboarding_notifications_mode_off_desc_short">Nessun servizio in secondo piano</string>
+    <string name="member_will_be_removed_from_chat_cannot_be_undone">Il membro verrà rimosso dalla chat, non è reversibile!</string>
+    <string name="v6_2_business_chats_descr">Privacy per i tuoi clienti.</string>
+    <string name="chat_bottom_bar">Barra degli strumenti di chat accessibile</string>
+    <string name="only_chat_owners_can_change_prefs">Solo i proprietari della chat possono modificarne le preferenze.</string>
+    <string name="onboarding_notifications_mode_battery">Notifiche e batteria</string>
+    <string name="maximum_message_size_reached_forwarding">Puoi copiare e ridurre la dimensione del messaggio per inviarlo.</string>
+    <string name="member_role_will_be_changed_with_notification_chat">Il ruolo verrà cambiato in %s. Verrà notificato a tutti nella chat.</string>
+    <string name="chat_main_profile_sent">Il tuo profilo di chat verrà inviato ai membri della chat</string>
+    <string name="you_will_stop_receiving_messages_from_this_chat_chat_history_will_be_preserved">Non riceverai più messaggi da questa chat. La cronologia della chat verrà conservata.</string>
 </resources>
@@ -19,7 +19,7 @@
    <string name="network_enable_socks_info">Toegang tot de servers via SOCKS proxy op poort %d\? De proxy moet worden gestart voordat u deze optie inschakelt.</string>
    <string name="alert_title_cant_invite_contacts">Kan geen contacten uitnodigen!</string>
    <string name="allow_direct_messages">Sta het verzenden van directe berichten naar leden toe.</string>
-    <string name="allow_to_delete_messages">Sta toe om verzonden berichten onomkeerbaar te verwijderen. (24 uur)</string>
+    <string name="allow_to_delete_messages">Sta toe om verzonden berichten definitief te verwijderen. (24 uur)</string>
    <string name="allow_to_send_voice">Sta toe om spraak berichten te verzenden.</string>
    <string name="chat_is_running">Chat is actief</string>
    <string name="clear_chat_menu_action">Wissen</string>
@@ -57,7 +57,7 @@
    <string name="v4_2_auto_accept_contact_requests">Contact verzoeken automatisch accepteren</string>
    <string name="bold_text">vetgedrukt</string>
    <string name="attach">Bijvoegen</string>
-    <string name="allow_irreversible_message_deletion_only_if">Sta het onomkeerbaar verwijderen van berichten alleen toe als uw contact dit toestaat. (24 uur)</string>
+    <string name="allow_irreversible_message_deletion_only_if">Sta het definitief verwijderen van berichten alleen toe als uw contact dit toestaat. (24 uur)</string>
    <string name="allow_to_send_disappearing">Sta toe om verdwijnende berichten te verzenden.</string>
    <string name="allow_your_contacts_to_send_voice_messages">Sta toe dat uw contacten spraak berichten verzenden.</string>
    <string name="all_your_contacts_will_remain_connected">Al uw contacten blijven verbonden.</string>
@@ -74,7 +74,7 @@
    <string name="clear_chat_warning">Alle berichten worden verwijderd, dit kan niet ongedaan worden gemaakt! De berichten worden ALLEEN voor jou verwijderd.</string>
    <string name="allow_disappearing_messages_only_if">Sta verdwijnende berichten alleen toe als uw contact dit toestaat.</string>
    <string name="allow_voice_messages_only_if">Sta spraak berichten alleen toe als uw contact ze toestaat.</string>
-    <string name="allow_your_contacts_irreversibly_delete">Laat uw contacten verzonden berichten onomkeerbaar verwijderen. (24 uur)</string>
+    <string name="allow_your_contacts_irreversibly_delete">Laat uw contacten verzonden berichten definitief verwijderen. (24 uur)</string>
    <string name="allow_your_contacts_to_send_disappearing_messages">Sta toe dat uw contacten verdwijnende berichten verzenden.</string>
    <string name="chat_preferences_always">altijd</string>
    <string name="icon_descr_audio_off">Geluid uit</string>
@@ -95,7 +95,7 @@
    <string name="turning_off_service_and_periodic">Batterijoptimalisatie is actief, waardoor achtergrondservice en periodieke verzoeken om nieuwe berichten worden uitgeschakeld. Je kunt ze weer inschakelen via instellingen.</string>
    <string name="onboarding_notifications_mode_off_desc"><![CDATA[<b>Het beste voor de batterij</b>. U ontvangt alleen meldingen wanneer de app wordt uitgevoerd (GEEN achtergrondservice).]]></string>
    <string name="it_can_disabled_via_settings_notifications_still_shown"><![CDATA[<b>Het kan worden uitgeschakeld via instellingen</b>, meldingen worden nog steeds weergegeven terwijl de app actief is.]]></string>
-    <string name="both_you_and_your_contacts_can_delete">Zowel u als uw contact kunnen verzonden berichten onomkeerbaar verwijderen. (24 uur)</string>
+    <string name="both_you_and_your_contacts_can_delete">Zowel u als uw contact kunnen verzonden berichten definitief verwijderen. (24 uur)</string>
    <string name="both_you_and_your_contact_can_send_disappearing">Zowel jij als je contact kunnen verdwijnende berichten sturen.</string>
    <string name="both_you_and_your_contact_can_send_voice">Zowel jij als je contact kunnen spraak berichten verzenden.</string>
    <string name="impossible_to_recover_passphrase"><![CDATA[<b>Let op</b>: u kunt het wachtwoord NIET herstellen of wijzigen als u het kwijt raakt.]]></string>
@@ -254,12 +254,12 @@
    <string name="auth_device_authentication_is_disabled_turning_off">Apparaatverificatie is uitgeschakeld. SimpleX Vergrendelen uitschakelen.</string>
    <string name="display_name">Vul uw naam in:</string>
    <string name="auth_device_authentication_is_not_enabled_you_can_turn_on_in_settings_once_enabled">Apparaatverificatie is niet ingeschakeld. Je kunt SimpleX Vergrendelen inschakelen via Instellingen zodra je apparaatverificatie hebt ingeschakeld.</string>
-    <string name="direct_messages_are_prohibited_in_group">Directe berichten tussen leden zijn verboden in deze groep.</string>
+    <string name="direct_messages_are_prohibited_in_group">Directe berichten tussen leden zijn niet toegestaan in deze groep.</string>
    <string name="total_files_count_and_size">%d bestand(en) met een totale grootte van %s</string>
    <string name="ttl_hour">%d uur</string>
    <string name="no_call_on_lock_screen">Uitzetten</string>
    <string name="v4_4_disappearing_messages">Verdwijnende berichten</string>
-    <string name="disappearing_prohibited_in_this_chat">Verdwijnende berichten zijn verboden in dit gesprek.</string>
+    <string name="disappearing_prohibited_in_this_chat">Verdwijnende berichten zijn niet toegestaan in dit gesprek.</string>
    <string name="auth_disable_simplex_lock">SimpleX Vergrendelen uitschakelen</string>
    <string name="timed_messages">Verdwijnende berichten</string>
    <string name="smp_server_test_disconnect">Verbinding verbreken</string>
@@ -272,7 +272,7 @@
    <string name="ttl_s">%ds</string>
    <string name="button_delete_contact">Verwijder contact</string>
    <string name="smp_servers_delete_server">Server verwijderen</string>
-    <string name="disappearing_messages_are_prohibited">Verdwijnende berichten zijn verboden in deze groep.</string>
+    <string name="disappearing_messages_are_prohibited">Verdwijnende berichten zijn niet toegestaan.</string>
    <string name="ttl_sec">%d sec</string>
    <string name="ttl_m">%dm</string>
    <string name="ttl_mth">%dmth</string>
@@ -338,9 +338,9 @@
    <string name="feature_enabled">ingeschakeld</string>
    <string name="feature_enabled_for_contact">ingeschakeld voor contact</string>
    <string name="feature_enabled_for_you">voor u ingeschakeld</string>
-    <string name="group_members_can_delete">Groepsleden kunnen verzonden berichten onomkeerbaar verwijderen. (24 uur)</string>
-    <string name="group_members_can_send_dms">Groepsleden kunnen directe berichten sturen</string>
-    <string name="group_members_can_send_voice">Groepsleden kunnen spraak berichten verzenden.</string>
+    <string name="group_members_can_delete">Leden kunnen verzonden berichten definitief verwijderen. (24 uur)</string>
+    <string name="group_members_can_send_dms">Leden kunnen directe berichten sturen.</string>
+    <string name="group_members_can_send_voice">Leden kunnen spraak berichten verzenden.</string>
    <string name="v4_5_transport_isolation_descr">Per chatprofiel (standaard) of per verbinding (BETA).</string>
    <string name="v4_5_multiple_chat_profiles_descr">Verschillende namen, avatars en transportisolatie.</string>
    <string name="v4_4_french_interface">Franse interface</string>
@@ -373,7 +373,7 @@
    <string name="gallery_video_button">Video</string>
    <string name="error_saving_ICE_servers">Fout bij opslaan van ICE servers</string>
    <string name="callstate_ended">geëindigd</string>
-    <string name="group_members_can_send_disappearing">Groepsleden kunnen verdwijnende berichten sturen.</string>
+    <string name="group_members_can_send_disappearing">Leden kunnen verdwijnende berichten sturen.</string>
    <string name="ttl_week">%d week</string>
    <string name="ttl_w">%dw</string>
    <string name="ttl_weeks">%d weken</string>
@@ -396,7 +396,7 @@
    <string name="icon_descr_image_snd_complete">Afbeelding verzonden</string>
    <string name="live_message">Live bericht!</string>
    <string name="if_you_received_simplex_invitation_link_you_can_open_in_browser">Als je een uitnodiging link voor SimpleX Chat hebt ontvangen, kun je deze in je browser openen:</string>
-    <string name="onboarding_notifications_mode_subtitle">Dit kan later worden gewijzigd via instellingen.</string>
+    <string name="onboarding_notifications_mode_subtitle">Hoe dit de batterij beïnvloedt</string>
    <string name="join_group_question">Deelnemen aan groep\?</string>
    <string name="icon_descr_add_members">Nodig leden uit</string>
    <string name="no_contacts_selected">Geen contacten geselecteerd</string>
@@ -439,7 +439,7 @@
    <string name="button_leave_group">Groep verlaten</string>
    <string name="info_row_local_name">Lokale naam</string>
    <string name="users_delete_data_only">Alleen lokale profielgegevens</string>
-    <string name="message_deletion_prohibited_in_chat">Het onomkeerbaar verwijderen van berichten is verboden in deze groep.</string>
+    <string name="message_deletion_prohibited_in_chat">Het definitief verwijderen van berichten is niet toegestaan.</string>
    <string name="v4_3_improved_privacy_and_security_desc">App scherm verbergen in de recente apps.</string>
    <string name="settings_section_title_incognito">Incognito modus</string>
    <string name="messages_section_title">Berichten</string>
@@ -458,7 +458,7 @@
    <string name="v4_5_reduced_battery_usage_descr">Meer verbeteringen volgen snel!</string>
    <string name="button_add_members">Nodig leden uit</string>
    <string name="notification_display_mode_hidden_desc">Verberg contact en bericht</string>
-    <string name="turn_off_battery_optimization"><![CDATA[Om het te gebruiken, kunt u Simplex in het volgende dialoogvenster \u0020<b>op de achtergrond uitvoeren</b>. Anders worden de meldingen uitgeschakeld.]]></string>
+    <string name="turn_off_battery_optimization"><![CDATA[<b>Sta dit toe</b> in het volgende dialoogvenster om direct meldingen te ontvangen.]]></string>
    <string name="if_you_choose_to_reject_the_sender_will_not_be_notified">Als u ervoor kiest om te weigeren, wordt de afzender NIET op de hoogte gesteld.</string>
    <string name="onboarding_notifications_mode_service">Onmiddellijk</string>
    <string name="rcv_group_event_member_added">heeft %1$s uitgenodigd</string>
@@ -508,7 +508,7 @@
    <string name="network_use_onion_hosts_no">Nee</string>
    <string name="immune_to_spam_and_abuse">Immuun voor spam</string>
    <string name="make_private_connection">Maak een privéverbinding</string>
-    <string name="message_deletion_prohibited">Het onomkeerbaar verwijderen van berichten is verboden in dit gesprek.</string>
+    <string name="message_deletion_prohibited">Het definitief verwijderen van berichten is niet toegestaan in dit gesprek.</string>
    <string name="new_in_version">Nieuw in %s</string>
    <string name="v4_3_voice_messages_desc">Max 40 seconden, direct ontvangen.</string>
    <string name="v4_3_improved_server_configuration">Verbeterde serverconfiguratie</string>
@@ -552,7 +552,7 @@
    <string name="chat_preferences_on">aan</string>
    <string name="only_you_can_send_disappearing">Alleen jij kunt verdwijnende berichten verzenden.</string>
    <string name="only_your_contact_can_send_disappearing">Alleen uw contact kan verdwijnende berichten verzenden.</string>
-    <string name="only_you_can_delete_messages">Alleen u kunt berichten onomkeerbaar verwijderen (uw contact kan ze markeren voor verwijdering). (24 uur)</string>
+    <string name="only_you_can_delete_messages">Alleen u kunt berichten definitief verwijderen (uw contact kan ze markeren voor verwijdering). (24 uur)</string>
    <string name="feature_offered_item_with_param">voorgesteld %s: %2s</string>
    <string name="old_database_archive">Oud database archief</string>
    <string name="enter_correct_current_passphrase">Voer het juiste huidige wachtwoord in.</string>
@@ -581,7 +581,7 @@
    <string name="only_your_contact_can_delete">Alleen uw contact kan berichten onherroepelijk verwijderen (u kunt ze markeren voor verwijdering). (24 uur)</string>
    <string name="only_you_can_send_voice">Alleen jij kunt spraak berichten verzenden.</string>
    <string name="only_your_contact_can_send_voice">Alleen uw contact kan spraak berichten verzenden.</string>
-    <string name="prohibit_message_deletion">Verbied het onomkeerbaar verwijderen van berichten.</string>
+    <string name="prohibit_message_deletion">Verbied het definitief verwijderen van berichten.</string>
    <string name="feature_offered_item">voorgesteld %s</string>
    <string name="store_passphrase_securely_without_recover">Sla het wachtwoord veilig op. Als u deze kwijtraakt, heeft u GEEN toegang tot de chats.</string>
    <string name="store_passphrase_securely">Bewaar het wachtwoord veilig, u kunt deze NIET wijzigen als u deze kwijtraakt.</string>
@@ -590,7 +590,7 @@
    <string name="icon_descr_call_pending_sent">Oproep in behandeling</string>
    <string name="simplex_link_mode_browser_warning">Het openen van de link in de browser kan de privacy en beveiliging van de verbinding verminderen. Niet vertrouwde SimpleX links worden rood weergegeven.</string>
    <string name="contact_developers">Werk de app bij en neem contact op met de ontwikkelaars.</string>
-    <string name="only_client_devices_store_contacts_groups_e2e_encrypted_messages"><![CDATA[Alleen client apparaten slaan gebruikers profielen, contacten, groepen en berichten op die zijn verzonden met <b>2-laags end-to-end codering</b>.]]></string>
+    <string name="only_client_devices_store_contacts_groups_e2e_encrypted_messages">Alleen clientapparaten slaan gebruikersprofielen, contacten, groepen en berichten op.</string>
    <string name="sender_may_have_deleted_the_connection_request">De afzender heeft mogelijk het verbindingsverzoek verwijderd.</string>
    <string name="la_notice_to_protect_your_information_turn_on_simplex_lock_you_will_be_prompted_to_complete_authentication_before_this_feature_is_enabled">Schakel SimpleX Vergrendelen in om uw informatie te beschermen.
 \nU wordt gevraagd de authenticatie te voltooien voordat deze functie wordt ingeschakeld.</string>
@@ -611,7 +611,7 @@
    <string name="your_profile_is_stored_on_your_device">Uw profiel, contacten en afgeleverde berichten worden op uw apparaat opgeslagen.</string>
    <string name="callstate_starting">beginnen…</string>
    <string name="icon_descr_video_on">Video aan</string>
-    <string name="delete_chat_profile_action_cannot_be_undone_warning">Deze actie kan niet ongedaan worden gemaakt. Uw profiel, contacten, berichten en bestanden gaan onomkeerbaar verloren.</string>
+    <string name="delete_chat_profile_action_cannot_be_undone_warning">Deze actie kan niet ongedaan worden gemaakt. Uw profiel, contacten, berichten en bestanden gaan definitief verloren.</string>
    <string name="messages_section_description">Deze instelling is van toepassing op berichten in uw huidige chatprofiel</string>
    <string name="rcv_group_event_updated_group_profile">bijgewerkt groep profiel</string>
    <string name="group_member_status_removed">verwijderd</string>
@@ -710,10 +710,9 @@
    <string name="you_can_use_markdown_to_format_messages__prompt">U kunt markdown gebruiken voor opmaak in berichten:</string>
    <string name="callstatus_rejected">geweigerde oproep</string>
    <string name="secret_text">geheim</string>
-    <string name="next_generation_of_private_messaging">De volgende generatie
-\nprivéberichten</string>
+    <string name="next_generation_of_private_messaging">De toekomst van berichtenuitwisseling</string>
    <string name="callstate_waiting_for_answer">wachten op antwoord…</string>
-    <string name="to_protect_privacy_simplex_has_ids_for_queues">Om de privacy te beschermen, heeft SimpleX in plaats van gebruikers-ID\'s die door alle andere platforms worden gebruikt, ID\'s voor berichten wachtrijen, afzonderlijk voor elk van uw contacten.</string>
+    <string name="to_protect_privacy_simplex_has_ids_for_queues">Om uw privacy te beschermen, gebruikt SimpleX voor elk van uw contacten afzonderlijke ID\'s.</string>
    <string name="use_chat">Gebruik chat</string>
    <string name="onboarding_notifications_mode_off">Wanneer de app actief is</string>
    <string name="video_call_no_encryption">video gesprek (niet e2e versleuteld)</string>
@@ -764,7 +763,7 @@
    <string name="group_is_decentralized">Volledig gedecentraliseerd – alleen zichtbaar voor leden.</string>
    <string name="network_option_tcp_connection_timeout">Timeout van TCP-verbinding</string>
    <string name="voice_messages">Spraak berichten</string>
-    <string name="voice_prohibited_in_this_chat">Spraak berichten zijn verboden in dit gesprek.</string>
+    <string name="voice_prohibited_in_this_chat">Spraak berichten zijn niet toegestaan in dit gesprek.</string>
    <string name="prohibit_sending_disappearing">Verbied het verzenden van verdwijnende berichten.</string>
    <string name="v4_5_reduced_battery_usage">Verminderd batterijgebruik</string>
    <string name="v4_5_private_filenames_descr">Om de tijdzone te beschermen, gebruiken afbeeldings-/spraakbestanden UTC.</string>
@@ -804,7 +803,7 @@
    <string name="reset_color">Kleuren resetten</string>
    <string name="theme_system">Systeem</string>
    <string name="chat_preferences_yes">ja</string>
-    <string name="feature_received_prohibited">gekregen, verboden</string>
+    <string name="feature_received_prohibited">gekregen, niet toegestaan</string>
    <string name="your_preferences">Jouw voorkeuren</string>
    <string name="accept_feature_set_1_day">Stel 1 dag in</string>
    <string name="whats_new">Wat is er nieuw</string>
@@ -824,7 +823,7 @@
    <string name="voice_message_send_text">Spraakbericht…</string>
    <string name="voice_message_with_duration">Spraakbericht (%1$s)</string>
    <string name="text_field_set_contact_placeholder">Contactnaam instellen…</string>
-    <string name="voice_messages_prohibited">Spraak berichten verboden!</string>
+    <string name="voice_messages_prohibited">Spraak berichten niet toegestaan!</string>
    <string name="reset_verb">Resetten</string>
    <string name="send_verb">Verstuur</string>
    <string name="send_live_message_desc">Stuur een live bericht, het wordt bijgewerkt voor de ontvanger(s) terwijl u het typt</string>
@@ -886,21 +885,20 @@
    <string name="this_string_is_not_a_connection_link">Deze string is geen verbinding link!</string>
    <string name="enable_automatic_deletion_message">Deze actie kan niet ongedaan worden gemaakt, de berichten die eerder zijn verzonden en ontvangen dan geselecteerd, worden verwijderd. Het kan enkele minuten duren.</string>
    <string name="switch_receiving_address_desc">Het ontvangstadres wordt gewijzigd naar een andere server. Adres wijziging wordt voltooid nadat de afzender online is.</string>
-    <string name="to_preserve_privacy_simplex_has_background_service_instead_of_push_notifications_it_uses_a_few_pc_battery"><![CDATA[Om je privacy te behouden, heeft de app in plaats van push meldingen een <b>SimpleX achtergrond service</b> - deze gebruikt een paar procent van de batterij per dag.]]></string>
+    <string name="to_preserve_privacy_simplex_has_background_service_instead_of_push_notifications_it_uses_a_few_pc_battery"><![CDATA[Om de privacy te verbeteren, <b>draait SimpleX op de achtergrond</b> in plaats van pushmeldingen te gebruiken.]]></string>
    <string name="chat_preferences_you_allow">Jij staat toe</string>
    <string name="you_are_invited_to_group">Je bent uitgenodigd voor de groep</string>
    <string name="you_can_connect_to_simplex_chat_founder"><![CDATA[U kunt <font color="#0088ff">verbinding maken met SimpleX Chat ontwikkelaars om vragen te stellen en updates te ontvangen</font>.]]></string>
    <string name="connection_error_auth_desc">Tenzij uw contact de verbinding heeft verwijderd of deze link al is gebruikt, kan het een bug zijn. Meld het alstublieft.
 \nOm verbinding te maken, vraagt u uw contact om een andere verbinding link te maken en te controleren of u een stabiele netwerkverbinding heeft.</string>
    <string name="use_simplex_chat_servers__question">SimpleX Chat servers gebruiken\?</string>
-    <string name="voice_messages_are_prohibited">Spraak berichten zijn verboden in deze groep.</string>
+    <string name="voice_messages_are_prohibited">Spraak berichten zijn niet toegestaan.</string>
    <string name="personal_welcome">Welkom %1$s!</string>
    <string name="you_can_start_chat_via_setting_or_by_restarting_the_app">U kunt de chat starten via app Instellingen / Database of door de app opnieuw op te starten.</string>
    <string name="snd_conn_event_switch_queue_phase_completed_for_member">je hebt het adres gewijzigd voor %s</string>
    <string name="snd_group_event_member_deleted">je hebt %1$s verwijderd</string>
    <string name="contact_sent_large_file">Je contact heeft een bestand verzonden dat groter is dan de momenteel ondersteunde maximale grootte (%1$s).</string>
-    <string name="your_current_chat_database_will_be_deleted_and_replaced_with_the_imported_one">Uw huidige chatdatabase wordt VERWIJDERD en VERVANGEN door de geïmporteerde.
-\nDeze actie kan niet ongedaan worden gemaakt. Uw profiel, contacten, berichten en bestanden gaan onomkeerbaar verloren.</string>
+    <string name="your_current_chat_database_will_be_deleted_and_replaced_with_the_imported_one">Uw huidige chatdatabase wordt VERWIJDERD en VERVANGEN door de geïmporteerde. \nDeze actie kan niet ongedaan worden gemaakt. Uw profiel, contacten, berichten en bestanden gaan definitief verloren.</string>
    <string name="invite_prohibited_description">Je probeert een contact met wie je een incognito profiel hebt gedeeld uit te nodigen voor de groep waarin je je hoofdprofiel gebruikt</string>
    <string name="your_profile_is_stored_on_device_and_shared_only_with_contacts_simplex_cannot_see_it">Uw profiel wordt op uw apparaat opgeslagen en alleen gedeeld met uw contacten. SimpleX servers kunnen uw profiel niet zien.</string>
    <string name="auth_you_will_be_required_to_authenticate_when_you_start_or_resume">U moet zich authenticeren wanneer u de app na 30 seconden op de achtergrond start of hervat.</string>
@@ -1090,7 +1088,7 @@
    <string name="available_in_v51">"
 \nBeschikbaar in v5.1"</string>
    <string name="prohibit_calls">Audio/video gesprekken verbieden.</string>
-    <string name="calls_prohibited_with_this_contact">Audio/video gesprekken zijn verboden.</string>
+    <string name="calls_prohibited_with_this_contact">Audio/video gesprekken zijn niet toegestaan.</string>
    <string name="v5_0_large_files_support_descr">Snel en niet wachten tot de afzender online is!</string>
    <string name="v5_0_app_passcode">App toegangscode</string>
    <string name="v5_0_app_passcode_descr">Stel het in in plaats van systeemverificatie.</string>
@@ -1165,19 +1163,19 @@
    <string name="self_destruct_passcode_enabled">Zelfvernietigings wachtwoord ingeschakeld!</string>
    <string name="app_passcode_replaced_with_self_destruct">De app-toegangscode wordt vervangen door een zelfvernietigings wachtwoord.</string>
    <string name="if_you_enter_self_destruct_code">Als u uw zelfvernietigings wachtwoord invoert tijdens het openen van de app:</string>
-    <string name="if_you_enter_passcode_data_removed">Als u deze toegangscode invoert bij het openen van de app, worden alle app-gegevens onomkeerbaar verwijderd!</string>
+    <string name="if_you_enter_passcode_data_removed">Als u deze toegangscode invoert bij het openen van de app, worden alle app-gegevens definitief verwijderd!</string>
    <string name="set_passcode">Toegangscode instellen</string>
    <string name="prohibit_message_reactions">Bericht reacties verbieden.</string>
    <string name="only_you_can_add_message_reactions">Alleen jij kunt bericht reacties toevoegen.</string>
-    <string name="message_reactions_are_prohibited">Reacties op berichten zijn verboden in deze groep.</string>
+    <string name="message_reactions_are_prohibited">Reacties op berichten zijn niet toegestaan.</string>
    <string name="prohibit_message_reactions_group">Berichten reacties verbieden.</string>
    <string name="allow_message_reactions_only_if">Sta bericht reacties alleen toe als uw contact dit toestaat.</string>
    <string name="allow_your_contacts_adding_message_reactions">Sta uw contactpersonen toe om bericht reacties toe te voegen.</string>
    <string name="allow_message_reactions">Sta bericht reacties toe.</string>
-    <string name="group_members_can_add_message_reactions">Groepsleden kunnen bericht reacties toevoegen.</string>
+    <string name="group_members_can_add_message_reactions">Leden kunnen reacties op berichten toevoegen.</string>
    <string name="both_you_and_your_contact_can_add_message_reactions">Zowel u als uw contact kunnen bericht reacties toevoegen.</string>
    <string name="message_reactions">Reacties op berichten</string>
-    <string name="message_reactions_prohibited_in_this_chat">Reacties op berichten zijn verboden in deze chat.</string>
+    <string name="message_reactions_prohibited_in_this_chat">Reacties op berichten zijn niet toegestaan in deze chat.</string>
    <string name="only_your_contact_can_add_message_reactions">Alleen uw contact kan bericht reacties toevoegen.</string>
    <string name="custom_time_unit_days">dagen</string>
    <string name="custom_time_unit_hours">uren</string>
@@ -1241,14 +1239,14 @@
    <string name="abort_switch_receiving_address_confirm">Afbreken</string>
    <string name="no_filtered_chats">Geen gefilterde chats</string>
    <string name="only_owners_can_enable_files_and_media">Alleen groep eigenaren kunnen bestanden en media inschakelen.</string>
-    <string name="files_are_prohibited_in_group">Bestanden en media zijn verboden in deze groep.</string>
+    <string name="files_are_prohibited_in_group">Bestanden en media zijn niet toegestaan.</string>
    <string name="favorite_chat">Favoriet</string>
-    <string name="files_and_media_prohibited">Bestanden en media verboden!</string>
+    <string name="files_and_media_prohibited">Bestanden en media niet toegestaan!</string>
    <string name="unfavorite_chat">Niet favoriet</string>
    <string name="files_and_media">Bestanden en media</string>
    <string name="prohibit_sending_files">Verbied het verzenden van bestanden en media.</string>
    <string name="allow_to_send_files">Sta toe om bestanden en media te verzenden.</string>
-    <string name="group_members_can_send_files">Groepsleden kunnen bestanden en media verzenden.</string>
+    <string name="group_members_can_send_files">Leden kunnen bestanden en media verzenden.</string>
    <string name="search_verb">Zoeken</string>
    <string name="la_mode_off">Uit</string>
    <string name="network_option_protocol_timeout_per_kb">Protocol timeout per KB</string>
@@ -1722,10 +1720,10 @@
    <string name="feature_roles_admins">beheerders</string>
    <string name="feature_roles_all_members">alle leden</string>
    <string name="feature_roles_owners">eigenaren</string>
-    <string name="simplex_links_are_prohibited_in_group">SimpleX-links zijn in deze groep verboden.</string>
+    <string name="simplex_links_are_prohibited_in_group">SimpleX-links zijn niet toegestaan.</string>
    <string name="feature_enabled_for">Ingeschakeld voor</string>
    <string name="allow_to_send_simplex_links">Sta het verzenden van SimpleX-links toe.</string>
-    <string name="group_members_can_send_simplex_links">Groepsleden kunnen SimpleX-links verzenden.</string>
+    <string name="group_members_can_send_simplex_links">Leden kunnen SimpleX-links verzenden.</string>
    <string name="saved_description">opgeslagen</string>
    <string name="saved_from_description">opgeslagen van %s</string>
    <string name="forward_chat_item">Doorsturen</string>
@@ -1988,7 +1986,7 @@
    <string name="allow_calls_question">Oproepen toestaan?</string>
    <string name="info_view_call_button">bellen</string>
    <string name="cant_call_member_alert_title">Kan geen groepslid bellen</string>
-    <string name="calls_prohibited_alert_title">Bellen verboden!</string>
+    <string name="calls_prohibited_alert_title">Bellen niet toegestaan!</string>
    <string name="confirm_delete_contact_question">Contact verwijderen bevestigen?</string>
    <string name="conversation_deleted">Gesprek verwijderd!</string>
    <string name="delete_without_notification">Verwijderen zonder melding</string>
@@ -2009,7 +2007,7 @@
    <string name="info_view_open_button">open</string>
    <string name="paste_link">Plak de link</string>
    <string name="action_button_add_members">Uitnodiging</string>
-    <string name="one_hand_ui">Toegankelijke chatwerkbalk</string>
+    <string name="one_hand_ui">Bereikbare app-toolbars</string>
    <string name="calls_prohibited_ask_to_enable_calls_alert_text">Vraag uw contactpersoon om oproepen in te schakelen.</string>
    <string name="no_filtered_contacts">Geen gefilterde contacten</string>
    <string name="select_verb">Selecteer</string>
@@ -2144,7 +2142,7 @@
    <string name="or_to_share_privately">Of om privé te delen</string>
    <string name="address_settings">Adres instellingen</string>
    <string name="create_1_time_link">Eenmalige link maken</string>
-    <string name="onboarding_choose_server_operators">Operators kiezen</string>
+    <string name="onboarding_choose_server_operators">Serverbeheerders</string>
    <string name="onboarding_network_operators_conditions_will_be_accepted">Voor ingeschakelde operators worden de voorwaarden na 30 dagen geaccepteerd.</string>
    <string name="onboarding_network_operators">Netwerkbeheerders</string>
    <string name="onboarding_network_operators_review_later">Later beoordelen</string>
@@ -2209,4 +2207,40 @@
    <string name="operator_use_for_sending">Om te verzenden</string>
    <string name="onboarding_network_operators_configure_via_settings">U kunt servers configureren via instellingen.</string>
    <string name="chat_archive">Of importeer archiefbestand</string>
+    <string name="direct_messages_are_prohibited_in_chat">Directe berichten tussen leden zijn in deze chat niet toegestaan.</string>
+    <string name="remote_hosts_section">Externe mobiele telefoons</string>
+    <string name="xiaomi_ignore_battery_optimization"><![CDATA[<b>Xiaomi-apparaten</b>: schakel Automatisch starten in de systeeminstellingen in om meldingen te laten werken.]]></string>
+    <string name="maximum_message_size_title">Bericht is te groot!</string>
+    <string name="maximum_message_size_reached_text">Verklein het bericht en verstuur het opnieuw.</string>
+    <string name="maximum_message_size_reached_forwarding">U kunt het bericht kopiëren en verkleinen om het te verzenden.</string>
+    <string name="add_your_team_members_to_conversations">Voeg uw teamleden toe aan de gesprekken.</string>
+    <string name="business_address">Zakelijk adres</string>
+    <string name="all_message_and_files_e2e_encrypted"><![CDATA[Alle berichten en bestanden worden <b>end-to-end-versleuteld</b> verzonden, met post-kwantumbeveiliging in directe berichten.]]></string>
+    <string name="onboarding_notifications_mode_service_desc_short">App draait altijd op de achtergrond</string>
+    <string name="onboarding_notifications_mode_periodic_desc_short">Controleer berichten elke 10 minuten</string>
+    <string name="onboarding_notifications_mode_battery">Meldingen en batterij</string>
+    <string name="how_it_helps_privacy">Hoe het de privacy helpt</string>
+    <string name="you_will_stop_receiving_messages_from_this_chat_chat_history_will_be_preserved">U ontvangt geen berichten meer van deze chat. De chatgeschiedenis blijft bewaard.</string>
+    <string name="leave_chat_question">Chat verlaten?</string>
+    <string name="button_add_friends">Vrienden toevoegen</string>
+    <string name="button_add_team_members">Teamleden toevoegen</string>
+    <string name="invite_to_chat_button">Uitnodigen voor een chat</string>
+    <string name="delete_chat_for_self_cannot_undo_warning">De chat wordt voor je verwijderd - dit kan niet ongedaan worden gemaakt!</string>
+    <string name="info_row_chat">Chat</string>
+    <string name="direct_messages_are_prohibited">Directe berichten tussen leden zijn niet toegestaan.</string>
+    <string name="connect_plan_chat_already_exists">Chat bestaat al!</string>
+    <string name="button_delete_chat">Chat verwijderen</string>
+    <string name="delete_chat_question">Chat verwijderen?</string>
+    <string name="button_leave_chat">Chat verlaten</string>
+    <string name="member_will_be_removed_from_chat_cannot_be_undone">Lid wordt verwijderd uit de chat - dit kan niet ongedaan worden gemaakt!</string>
+    <string name="member_role_will_be_changed_with_notification_chat">De rol wordt gewijzigd naar %s. Iedereen in de chat wordt op de hoogte gebracht.</string>
+    <string name="chat_main_profile_sent">Uw chatprofiel wordt naar chatleden verzonden</string>
+    <string name="v6_2_business_chats_descr">Privacy voor uw klanten.</string>
+    <string name="connect_plan_you_are_already_connected_with_vName"><![CDATA[U bent al verbonden met <b>%1$s</b>.]]></string>
+    <string name="delete_chat_for_all_members_cannot_undo_warning">De chat wordt voor alle leden verwijderd - dit kan niet ongedaan worden gemaakt!</string>
+    <string name="chat_bottom_bar">Bereikbare chat-toolbar</string>
+    <string name="v6_2_business_chats">Zakelijke chats</string>
+    <string name="onboarding_notifications_mode_off_desc_short">Geen achtergrondservice</string>
+    <string name="only_chat_owners_can_change_prefs">Alleen chateigenaren kunnen voorkeuren wijzigen.</string>
+    <string name="maximum_message_size_reached_non_text">Verklein de berichtgrootte of verwijder de media en verzend het bericht opnieuw.</string>
 </resources>
@@ -420,8 +420,7 @@
    <string name="callstate_starting">uruchamianie…</string>
    <string name="strikethrough_text">strajk</string>
    <string name="first_platform_without_user_ids">Brak identyfikatorów użytkownika.</string>
-    <string name="next_generation_of_private_messaging">Następna generacja
-\nprywatnych wiadomości</string>
+    <string name="next_generation_of_private_messaging">Następna generacja \nprywatnych wiadomości</string>
    <string name="callstate_waiting_for_answer">oczekiwanie na odpowiedź…</string>
    <string name="callstate_waiting_for_confirmation">oczekiwanie na potwierdzenie…</string>
    <string name="you_can_use_markdown_to_format_messages__prompt">Możesz używać markdown do formatowania wiadomości:</string>
@@ -849,8 +849,7 @@
    <string name="to_start_a_new_chat_help_header">Para começar um novo bate-papo</string>
    <string name="la_notice_turn_on">Ligar</string>
    <string name="welcome">Bem-vindo(a)!</string>
-    <string name="next_generation_of_private_messaging">A próxima geração
-\nde mensageiros privados</string>
+    <string name="next_generation_of_private_messaging">A próxima geração \nde mensageiros privados</string>
    <string name="settings_section_title_socks">PROXY SOCKS</string>
    <string name="database_backup_can_be_restored">A tentativa de alterar a senha do banco de dados não foi concluída.</string>
    <string name="stop_chat_to_export_import_or_delete_chat_database">Pare o bate-papo para exportar, importar ou excluir o banco de dados do chat. Você não poderá receber e enviar mensagens enquanto o chat estiver interrompido.</string>
@@ -88,9 +88,9 @@
    <string name="icon_descr_instant_notifications">Мгновенные уведомления</string>
    <string name="service_notifications">Мгновенные уведомления!</string>
    <string name="service_notifications_disabled">Мгновенные уведомления выключены!</string>
-    <string name="to_preserve_privacy_simplex_has_background_service_instead_of_push_notifications_it_uses_a_few_pc_battery"><![CDATA[Чтобы защитить Ваши личные данные, вместо уведомлений от сервера приложение запускает <b>фоновый сервис SimpleX</b>, который потребляет несколько процентов батареи в день.]]></string>
+    <string name="to_preserve_privacy_simplex_has_background_service_instead_of_push_notifications_it_uses_a_few_pc_battery"><![CDATA[Чтобы улучшить конфиденциальность, <b>SimpleX выполняется в фоне</b> вместо уведомлений через сервер.]]></string>
    <string name="it_can_disabled_via_settings_notifications_still_shown"><![CDATA[<b>Он может быть выключен через Настройки</b> – Вы продолжите получать уведомления о сообщениях пока приложение запущено.]]></string>
-    <string name="turn_off_battery_optimization"><![CDATA[Для использования этой функции, <b>разрешите SimpleX выполняться в фоне</b> в следующем диалоге. Иначе уведомления будут выключены.]]></string>
+    <string name="turn_off_battery_optimization"><![CDATA[<b>Разрешите это</b> в следующем окне чтобы получать нотификации мгновенно.]]></string>
    <string name="turning_off_service_and_periodic">Оптимизация батареи включена, поэтому сервис уведомлений выключен. Вы можете снова включить его через Настройки.</string>
    <string name="periodic_notifications">Периодические уведомления</string>
    <string name="periodic_notifications_disabled">Периодические уведомления выключены!</string>
@@ -463,7 +463,7 @@
    <string name="callstate_connected">соединено</string>
    <string name="callstate_ended">завершен</string>
    <!-- SimpleXInfo -->
-    <string name="next_generation_of_private_messaging">Новое поколение\nприватных сообщений</string>
+    <string name="next_generation_of_private_messaging">Будущее коммуникаций</string>
    <string name="privacy_redefined">Более конфиденциальный</string>
    <string name="first_platform_without_user_ids">Без идентификаторов пользователей.</string>
    <string name="immune_to_spam_and_abuse">Защищен от спама</string>
@@ -475,8 +475,8 @@
    <string name="how_it_works">Как это работает</string>
    <!-- How SimpleX Works -->
    <string name="how_simplex_works">Как SimpleX работает</string>
-    <string name="to_protect_privacy_simplex_has_ids_for_queues">Чтобы защитить Вашу конфиденциальность, вместо ID пользователей, которые есть в других платформах, SimpleX использует ID для очередей сообщений, разные для каждого контакта.</string>
-    <string name="only_client_devices_store_contacts_groups_e2e_encrypted_messages"><![CDATA[Только пользовательские устройства хранят контакты, группы и сообщения, которые отправляются <b>с двухуровневым end-to-end шифрованием</b>.]]></string>
+    <string name="to_protect_privacy_simplex_has_ids_for_queues">Чтобы защитить Вашу конфиденциальность, SimpleX использует разные ID для всех ваших контактов.</string>
+    <string name="only_client_devices_store_contacts_groups_e2e_encrypted_messages">Только пользовательские устройства хранят контакты, группы и сообщения.</string>
    <string name="read_more_in_github_with_link"><![CDATA[Узнайте больше из нашего <font color="#0088ff">GitHub репозитория</font>.]]></string>
    <!-- SetNotificationsMode.kt -->
    <string name="use_chat">Использовать чат</string>
@@ -878,12 +878,12 @@
    <string name="prohibit_message_deletion">Запретить необратимое удаление сообщений.</string>
    <string name="allow_to_send_voice">Разрешить отправлять голосовые сообщения.</string>
    <string name="prohibit_sending_voice">Запретить отправлять голосовые сообщений.</string>
-    <string name="group_members_can_send_dms">Члены группы могут посылать прямые сообщения.</string>
+    <string name="group_members_can_send_dms">Члены могут посылать прямые сообщения.</string>
    <string name="direct_messages_are_prohibited_in_group">Прямые сообщения между членами группы запрещены.</string>
-    <string name="group_members_can_delete">Члены группы могут необратимо удалять отправленные сообщения. (24 часа)</string>
-    <string name="message_deletion_prohibited_in_chat">Необратимое удаление сообщений запрещено в этой группе.</string>
-    <string name="group_members_can_send_voice">Члены группы могут отправлять голосовые сообщения.</string>
-    <string name="voice_messages_are_prohibited">Голосовые сообщения запрещены в этой группе.</string>
+    <string name="group_members_can_delete">Члены могут необратимо удалять отправленные сообщения. (24 часа)</string>
+    <string name="message_deletion_prohibited_in_chat">Необратимое удаление сообщений запрещено.</string>
+    <string name="group_members_can_send_voice">Члены могут отправлять голосовые сообщения.</string>
+    <string name="voice_messages_are_prohibited">Голосовые сообщения запрещены.</string>
    <string name="onboarding_notifications_mode_off_desc"><![CDATA[<b>Минимальный расход батареи</b>. Вы получите уведомления только когда приложение запущено, без фонового сервиса.]]></string>
    <string name="onboarding_notifications_mode_title">Уведомления</string>
    <string name="onboarding_notifications_mode_off">Когда приложение запущено</string>
@@ -891,7 +891,7 @@
    <string name="onboarding_notifications_mode_service">Мгновенно</string>
    <string name="onboarding_notifications_mode_service_desc"><![CDATA[<b>Больше расход батареи</b>! Приложение постоянно запущено в фоне - уведомления будут показаны сразу же.]]></string>
    <string name="onboarding_notifications_mode_periodic_desc"><![CDATA[<b>Меньше расход батареи</b>. Приложение проверяет сообщения каждые 10 минут. Вы можете пропустить звонки и срочные сообщения.]]></string>
-    <string name="onboarding_notifications_mode_subtitle">Можно изменить позже в настройках.</string>
+    <string name="onboarding_notifications_mode_subtitle">Как это влияет на потребление энергии</string>
    <string name="live">LIVE</string>
    <string name="send_live_message">Отправить живое сообщение</string>
    <string name="live_message">Живое сообщение!</string>
@@ -927,7 +927,7 @@
    <string name="send_live_message_desc">Отправить живое сообщение — оно будет обновляться для получателей по мере того, как Вы его вводите</string>
    <string name="create_group_link">Создать ссылку группы</string>
    <string name="prohibit_sending_disappearing_messages">Запретить отправлять исчезающие сообщения.</string>
-    <string name="disappearing_messages_are_prohibited">Исчезающие сообщения запрещены в этой группе.</string>
+    <string name="disappearing_messages_are_prohibited">Исчезающие сообщения запрещены.</string>
    <string name="ttl_w">%dнед</string>
    <string name="ttl_d">%dд</string>
    <string name="ttl_weeks">%d нед.</string>
@@ -940,7 +940,7 @@
    <string name="clear_verification">Сбросить подтверждение</string>
    <string name="allow_disappearing_messages_only_if">Разрешить исчезающие сообщения, только если Ваш контакт разрешает их Вам.</string>
    <string name="prohibit_sending_disappearing">Запретить посылать исчезающие сообщения.</string>
-    <string name="group_members_can_send_disappearing">Члены группы могут посылать исчезающие сообщения.</string>
+    <string name="group_members_can_send_disappearing">Члены могут посылать исчезающие сообщения.</string>
    <string name="whats_new">Что нового</string>
    <string name="new_in_version">Новое в %s</string>
    <string name="v4_2_security_assessment">Аудит безопасности</string>
@@ -1193,7 +1193,7 @@
    <string name="set_passcode">Установить код доступа</string>
    <string name="edit_history">История</string>
    <string name="info_menu">Информация</string>
-    <string name="auth_open_chat_profiles">Открыть профили чата</string>
+    <string name="auth_open_chat_profiles">Изменить профили чата</string>
    <string name="received_message">Полученное сообщение</string>
    <string name="sent_message">Отправленное сообщение</string>
    <string name="disappearing_message">Исчезающее сообщение</string>
@@ -1227,9 +1227,9 @@
    <string name="allow_message_reactions">Разрешить реакции на сообщения.</string>
    <string name="allow_message_reactions_only_if">Разрешить реакции на сообщения, только если ваш контакт разрешает их.</string>
    <string name="allow_your_contacts_adding_message_reactions">Разрешить контактам добавлять реакции на сообщения.</string>
-    <string name="group_members_can_add_message_reactions">Члены группы могут добавлять реакции на сообщения.</string>
+    <string name="group_members_can_add_message_reactions">Члены могут добавлять реакции на сообщения.</string>
    <string name="message_reactions_prohibited_in_this_chat">Реакции на сообщения в этом чате запрещены.</string>
-    <string name="message_reactions_are_prohibited">Реакции на сообщения запрещены в этой группе.</string>
+    <string name="message_reactions_are_prohibited">Реакции на сообщения запрещены.</string>
    <string name="only_your_contact_can_add_message_reactions">Только Ваш контакт может добавлять реакции на сообщения.</string>
    <string name="prohibit_message_reactions">Запретить реакции на сообщения.</string>
    <string name="prohibit_message_reactions_group">Запретить реакции на сообщения.</string>
@@ -1348,8 +1348,8 @@
    <string name="shutdown_alert_desc">Нотификации перестанут работать, пока вы не перезапустите приложение</string>
    <string name="network_option_protocol_timeout_per_kb">Таймаут протокола на KB</string>
    <string name="allow_to_send_files">Разрешить посылать файлы и медиа.</string>
-    <string name="group_members_can_send_files">Члены группы могут слать файлы и медиа.</string>
-    <string name="files_are_prohibited_in_group">Файлы и медиа запрещены в этой группе.</string>
+    <string name="group_members_can_send_files">Члены могут слать файлы и медиа.</string>
+    <string name="files_are_prohibited_in_group">Файлы и медиа запрещены.</string>
    <string name="files_and_media_prohibited">Файлы и медиа запрещены!</string>
    <string name="only_owners_can_enable_files_and_media">Только владельцы группы могут разрешить файлы и медиа.</string>
    <string name="files_and_media">Файлы и медиа</string>
@@ -1818,7 +1818,7 @@
    <string name="simplex_links">Ссылки SimpleX</string>
    <string name="allow_to_send_simplex_links">Разрешить отправлять ссылки SimpleX.</string>
    <string name="prohibit_sending_simplex_links">Запретить отправку ссылок SimpleX</string>
-    <string name="group_members_can_send_simplex_links">Члены группы могут отправлять ссылки SimpleX</string>
+    <string name="group_members_can_send_simplex_links">Члены могут отправлять ссылки SimpleX</string>
    <string name="feature_roles_admins">админы</string>
    <string name="feature_roles_all_members">все члены</string>
    <string name="feature_roles_owners">владельцы</string>
@@ -1828,7 +1828,7 @@
    <string name="feature_enabled_for">Включено для</string>
    <string name="forward_chat_item">Переслать</string>
    <string name="v5_7_forward">Переслать и сохранить сообщение</string>
-    <string name="simplex_links_are_prohibited_in_group">Ссылки SimpleX запрещены в этой группе.</string>
+    <string name="simplex_links_are_prohibited_in_group">Ссылки SimpleX запрещены.</string>
    <string name="forward_message">Переслать сообщение…</string>
    <string name="v5_7_new_interface_languages">Литовский интерфейс</string>
    <string name="v5_7_forward_descr">Источник сообщения остаётся конфиденциальным.</string>
@@ -2021,7 +2021,7 @@
    <string name="privacy_media_blur_radius_soft">Слабое</string>
    <string name="privacy_media_blur_radius_medium">Среднее</string>
    <string name="privacy_media_blur_radius_off">Выключено</string>
-    <string name="one_hand_ui">Доступная панель чата</string>
+    <string name="one_hand_ui">Доступная панель приложения</string>
    <string name="current_user">Текущий профиль</string>
    <string name="servers_info_missing">Нет информации, попробуйте перезагрузить</string>
    <string name="servers_info">Информация о серверах</string>
@@ -2199,4 +2199,135 @@
    <string name="network_proxy_auth_mode_username_password">Ваши учетные данные могут быть отправлены в незашифрованном виде.</string>
    <string name="migrate_from_device_remove_archive_question">Удалить архив?</string>
    <string name="migrate_from_device_uploaded_archive_will_be_removed">Загруженный архив базы данных будет навсегда удален с серверов.</string>
+    <string name="operator_conditions_accepted">Принятые условия</string>
+    <string name="accept_conditions">Принять условия</string>
+    <string name="no_message_servers_configured">Нет серверов сообщений.</string>
+    <string name="no_message_servers_configured_for_receiving">Нет серверов для приема сообщений.</string>
+    <string name="errors_in_servers_configuration">Ошибки в настройках серверов.</string>
+    <string name="for_chat_profile">Для профиля %s:</string>
+    <string name="no_media_servers_configured">Нет серверов файлов и медиа.</string>
+    <string name="no_media_servers_configured_for_private_routing">Нет серверов для приема файлов.</string>
+    <string name="no_media_servers_configured_for_sending">Нет серверов для отправки файлов.</string>
+    <string name="connection_error_quota">Недоставленные сообщения</string>
+    <string name="address_creation_instruction">Нажмите Создать адрес SimpleX в меню, чтобы создать его позже.</string>
+    <string name="address_or_1_time_link">Адрес или одноразовая ссылка?</string>
+    <string name="connection_security">Безопасность соединения</string>
+    <string name="onboarding_choose_server_operators">Операторы серверов</string>
+    <string name="your_servers">Ваши серверы</string>
+    <string name="view_conditions">Посмотреть условия</string>
+    <string name="operator_review_conditions">Посмотреть условия</string>
+    <string name="operators_conditions_accepted_for"><![CDATA[Условия приняты для оператора(ов): <b>%s</b>.]]></string>
+    <string name="operator_conditions_accepted_for_enabled_operators_on">Условия будут автоматически приняты для включенных операторов: %s</string>
+    <string name="operator_conditions_accepted_on">Условия приняты: %s.</string>
+    <string name="operator_website">Вебсайт</string>
+    <string name="operator_conditions_accepted_for_some"><![CDATA[Условия уже приняты для следующих операторов: <b>%s</b>.]]></string>
+    <string name="operator_conditions_will_be_applied"><![CDATA[Эти условия также будут применены к: <b>%s</b>.]]></string>
+    <string name="operator_in_order_to_use_accept_conditions"><![CDATA[Чтобы использовать серверы оператора <b>%s</b>, примите условия использования.]]></string>
+    <string name="operator_use_for_sending">Для оправки</string>
+    <string name="operator_added_message_servers">Дополнительные серверы сообщений</string>
+    <string name="operator_use_for_files">Использовать для файлов</string>
+    <string name="operator_open_conditions">Открыть условия</string>
+    <string name="error_adding_server">Ошибка добавления сервера</string>
+    <string name="operator_server_alert_title">Сервер оператора</string>
+    <string name="server_added_to_operator__name">Сервер добавлен к оператору %s.</string>
+    <string name="appearance_app_toolbars">Тулбары приложения</string>
+    <string name="appearance_in_app_bars_alpha">Прозрачность</string>
+    <string name="v6_2_network_decentralization">Децентрализация сети</string>
+    <string name="v6_2_network_decentralization_descr">Второй оператор серверов в приложении!</string>
+    <string name="v6_2_network_decentralization_enable_flux">Включить Flux</string>
+    <string name="v6_2_network_decentralization_enable_flux_reason">для лучшей конфиденциальности метаданных.</string>
+    <string name="v6_2_improved_chat_navigation">Улучшенная навигация в разговоре</string>
+    <string name="view_updated_conditions">Посмотреть измененные условия</string>
+    <string name="xiaomi_ignore_battery_optimization"><![CDATA[<b>Устройства Xiaomi</b>: пожалуйста, включите опцию Autostart в системных настройках для работы нотификаций.]]></string>
+    <string name="message_deleted_or_not_received_error_title">Нет сообщения</string>
+    <string name="message_deleted_or_not_received_error_desc">Это сообщение было удалено или еще не получено.</string>
+    <string name="maximum_message_size_title">Сообщение слишком большое!</string>
+    <string name="maximum_message_size_reached_text">Пожалуйста, уменьшите размер сообщения и отправьте снова.</string>
+    <string name="maximum_message_size_reached_non_text">Пожалуйста, уменьшите размер сообщения или уберите медиа и отправьте снова.</string>
+    <string name="maximum_message_size_reached_forwarding">Чтобы отправить сообщение, скопируйте и уменьшите его размер.</string>
+    <string name="share_1_time_link_with_a_friend">Поделитесь одноразовой ссылкой с другом</string>
+    <string name="share_address_publicly">Поделитесь адресом</string>
+    <string name="share_simplex_address_on_social_media">Поделитесь SimpleX адресом в социальных сетях.</string>
+    <string name="simplex_address_and_1_time_links_are_safe_to_share">Адрес SimpleX и одноразовые ссылки безопасно отправлять через любой мессенджер.</string>
+    <string name="you_can_set_connection_name_to_remember">Вы можете установить имя соединения, чтобы запомнить кому Вы отправили ссылку.</string>
+    <string name="smp_servers_new_server">Новый сервер</string>
+    <string name="create_1_time_link">Создать одноразовую ссылку</string>
+    <string name="for_social_media">Для социальных сетей</string>
+    <string name="or_to_share_privately">Или поделиться конфиденциально</string>
+    <string name="simplex_address_or_1_time_link">Адрес SimpleX или одноразовая ссылка?</string>
+    <string name="address_settings">Настройки адреса</string>
+    <string name="add_your_team_members_to_conversations">Добавьте сотрудников в разговор.</string>
+    <string name="business_address">Бизнес адрес</string>
+    <string name="all_message_and_files_e2e_encrypted"><![CDATA[Все сообщения и файлы отправляются с <b>end-to-end шифрованием</b>, с пост-квантовой безопасностью в прямых разговорах.]]></string>
+    <string name="onboarding_notifications_mode_service_desc_short">Приложение всегда выполняется в фоне</string>
+    <string name="onboarding_notifications_mode_periodic_desc_short">Проверять сообщения каждые 10 минут</string>
+    <string name="onboarding_notifications_mode_off_desc_short">Без фонового сервиса</string>
+    <string name="onboarding_notifications_mode_battery">Нотификации и батарейка</string>
+    <string name="how_it_helps_privacy">Как это улучшает конфиденциальность</string>
+    <string name="onboarding_network_operators">Операторы серверов</string>
+    <string name="onboarding_select_network_operators_to_use">Выберите операторов сети.</string>
+    <string name="onboarding_network_operators_conditions_you_can_configure">Вы можете настроить операторов в настройках Сеть и серверы.</string>
+    <string name="onboarding_network_operators_continue">Продолжить</string>
+    <string name="onboarding_network_operators_review_later">Посмотреть позже</string>
+    <string name="onboarding_network_operators_update">Обновить</string>
+    <string name="remote_hosts_section">Связанные мобильные устройства</string>
+    <string name="leave_chat_question">Покинуть разговор?</string>
+    <string name="you_will_stop_receiving_messages_from_this_chat_chat_history_will_be_preserved">Вы прекратите получать сообщения в этом разговоре. История будет сохранена.</string>
+    <string name="button_add_friends">Добавить друзей</string>
+    <string name="button_add_team_members">Добавить сотрудников</string>
+    <string name="button_delete_chat">Удалить разговор</string>
+    <string name="delete_chat_question">Удалить разговор?</string>
+    <string name="invite_to_chat_button">Пригласить в разговор</string>
+    <string name="delete_chat_for_all_members_cannot_undo_warning">Разговор будет удален для всех участников - это действие нельзя отменить!</string>
+    <string name="operator">Оператор</string>
+    <string name="operator_servers_title">%s серверы</string>
+    <string name="operators_conditions_will_be_accepted_for"><![CDATA[Условия будут приняты для оператора(ов): <b>%s</b>.]]></string>
+    <string name="operator_conditions_will_be_accepted_on">Условия будут приняты: %s</string>
+    <string name="operator_info_title">Оператор сети</string>
+    <string name="use_servers_of_operator_x">Использовать %s</string>
+    <string name="operator_use_operator_toggle_description">Использовать серверы</string>
+    <string name="operator_conditions_will_be_accepted_for_some"><![CDATA[Условия будут приняты для оператора(ов): <b>%s</b>.]]></string>
+    <string name="operators_conditions_will_also_apply"><![CDATA[Эти условия также будут применены к: <b>%s</b>.]]></string>
+    <string name="chat_archive">Или импортировать файл архива</string>
+    <string name="chat_bottom_bar">Доступная панель чата</string>
+    <string name="delete_chat_for_self_cannot_undo_warning">Разговор будет удален для Вас - это действие нельзя отменить!</string>
+    <string name="button_leave_chat">Покинуть разговор</string>
+    <string name="only_chat_owners_can_change_prefs">Только владельцы разговора могут поменять предпочтения.</string>
+    <string name="operator_conditions_failed_to_load">Текст условий использования не может быть показан, вы можете посмотреть их через ссылку:</string>
+    <string name="info_row_chat">Разговор</string>
+    <string name="member_will_be_removed_from_chat_cannot_be_undone">Член будет удален из разговора - это действие нельзя отменить!</string>
+    <string name="network_preset_servers_title">Серверы по умолчанию</string>
+    <string name="member_role_will_be_changed_with_notification_chat">Роль будет изменена на %s. Все участники разговора получат уведомление.</string>
+    <string name="chat_main_profile_sent">Ваш профиль будет отправлен участникам разговора.</string>
+    <string name="operator_same_conditions_will_be_applied"><![CDATA[Те же самые условия будут приняты для оператора <b>%s</b>.]]></string>
+    <string name="operator_same_conditions_will_apply_to_operators"><![CDATA[Те же самые условия будут приняты для оператора(ов): <b>%s</b>.]]></string>
+    <string name="operator_conditions_of_use">Условия использования</string>
+    <string name="operator_added_xftp_servers">Дополнительные серверы файлов и медиа</string>
+    <string name="error_updating_server_title">Ошибка сохранения сервера</string>
+    <string name="operator_use_for_messages_private_routing">Для доставки сообщений</string>
+    <string name="operator_open_changes">Открыть изменения</string>
+    <string name="error_server_operator_changed">Оператор серверов изменен.</string>
+    <string name="error_server_protocol_changed">Протокол сервера изменен.</string>
+    <string name="xftp_servers_per_user">Серверы для новых файлов Вашего текущего профиля</string>
+    <string name="operator_use_for_messages_receiving">Для получения</string>
+    <string name="operator_use_for_messages">Использовать для сообщений</string>
+    <string name="appearance_bars_blur_radius">Размыть</string>
+    <string name="direct_messages_are_prohibited">Прямые сообщения между членами запрещены.</string>
+    <string name="v6_2_business_chats">Бизнес разговоры</string>
+    <string name="v6_2_improved_chat_navigation_descr">- Открывает разговор на первом непрочитанном сообщении.\n- Перейти к цитируемому сообщению.</string>
+    <string name="v6_2_business_chats_descr">Конфиденциальность для ваших покупателей.</string>
+    <string name="connect_plan_you_are_already_connected_with_vName"><![CDATA[Вы уже соединены с <b>%1$s</b>.]]></string>
+    <string name="connect_plan_chat_already_exists">Разговор уже существует!</string>
+    <string name="one_time_link_can_be_used_with_one_contact_only"><![CDATA[Одноразовая ссылка может быть использована <i>только с одним контактом</i> - поделитесь при встрече или через любой мессенджер.]]></string>
+    <string name="no_message_servers_configured_for_private_routing">Нет серверов для доставки сообщений.</string>
+    <string name="onboarding_network_operators_configure_via_settings">Вы можете настроить серверы позже.</string>
+    <string name="onboarding_network_operators_app_will_use_different_operators">Приложение улучшает конфиденциальность используя разных операторов в каждом разговоре.</string>
+    <string name="onboarding_network_operators_cant_see_who_talks_to_whom">Когда больше чем один оператор включен, ни один из них не видит метаданные, чтобы определить, кто соединен с кем.</string>
+    <string name="failed_to_save_servers">Ошибка сохранения серверов</string>
+    <string name="onboarding_network_operators_conditions_will_be_accepted">Условия будут приняты для включенных операторов через 30 дней.</string>
+    <string name="error_accepting_operator_conditions">Ошибка приема условий</string>
+    <string name="connection_error_quota_desc">Соединение достигло предела недоставленных сообщений. Возможно, Ваш контакт не в сети.</string>
+    <string name="to_protect_against_your_link_replaced_compare_codes">Чтобы защитить Вашу ссылку от замены, Вы можете сравнить код безопасности.</string>
+    <string name="onboarding_network_operators_app_will_use_for_routing">Например, если Ваш контакт получает сообщения через сервер SimpleX Chat, Ваше приложение доставит их через сервер Flux.</string>
+    <string name="direct_messages_are_prohibited_in_chat">Прямые сообщения между членами запрещены в этом разговоре.</string>
 </resources>
@@ -1162,8 +1162,7 @@
    <string name="colored_text">кольоровий</string>
    <string name="callstatus_ended">дзвінок завершено %1$s</string>
    <string name="callstatus_error">помилка дзвінка</string>
-    <string name="next_generation_of_private_messaging">Наступне покоління
-\nприватних повідомлень</string>
+    <string name="next_generation_of_private_messaging">Наступне покоління \nприватних повідомлень</string>
    <string name="opensource_protocol_and_code_anybody_can_run_servers">Кожен може хостити сервери.</string>
    <string name="settings_developer_tools">Інструменти розробника</string>
    <string name="settings_experimental_features">Експериментальні функції</string>
@@ -7,7 +7,7 @@ import androidx.compose.runtime.*
 actual fun QRCodeScanner(
  showQRCodeScanner: MutableState<Boolean>,
  padding: PaddingValues,
-  onBarcode: (String) -> Unit
+  onBarcode: suspend (String) -> Boolean
 ) {
  //LALAL
 }
@@ -24,11 +24,11 @@ android.nonTransitiveRClass=true
 kotlin.mpp.androidSourceSetLayoutVersion=2
 kotlin.jvm.target=11

-android.version_name=6.2-beta.5
-android.version_code=256
+android.version_name=6.2-beta.6
+android.version_code=258

-desktop.version_name=6.2-beta.5
-desktop.version_code=80
+desktop.version_name=6.2-beta.6
+desktop.version_code=81

 kotlin.version=1.9.23
 gradle.plugin.version=8.2.0