Delete README.md

* Create 20220808-simplex-chat-v3.1-chat-groups.md

* Update 20220808-simplex-chat-v3.1-chat-groups.md

.github/workflows/build.yml

@@ -62,14 +62,6 @@ jobs:
             cache_path: C:/cabal
             asset_name: simplex-chat-windows-x86-64
     steps:
-      - name: Configure pagefile (Windows)
-        if: matrix.os == 'windows-latest'
-        uses: al-cheb/configure-pagefile-action@v1.3
-        with:
-          minimum-size: 16GB
-          maximum-size: 16GB
-          disk-root: "C:"
-
       - name: Clone project
         uses: actions/checkout@v2
 

.gitignore

@@ -49,8 +49,8 @@ logs/
 # for website
 website/node_modules/
 website/src/blog/
-website/src/docs/
 website/translations.json
+website/src/_data/supported_languages.json
 website/src/img/images/
 website/src/images/
 # Generated files

apps/android/README.md

@@ -4,6 +4,7 @@ This readme is currently a stub and as such is in development.
 
 Ultimately, this readme will act as a guide to contributing to the develop of the SimpleX android app.
 
+
 ## Gotchas
 
 #### SHA Signature for verification for app links/deep links
@@ -22,15 +23,3 @@ To find your SHA certificate fingerprint perform the following steps.
 More information is available [here](https://developer.android.com/training/app-links/verify-site-associations#manual-verification). If there is no response when running the `pm get-app-links` command, the intents in `AndroidManifest.xml` are likely misspecified. A verification attempt can be triggered using `adb shell pm verify-app-links --re-verify chat.simplex.app`. 
 
 Note that this is not an issue for the app store build of the app as this is signed with our app store credentials and thus there is a stable signature over users. Developers do not have general access to these credentials for development and testing.
-
-## Adding icons
-
-1. Find a [Material symbol](https://fonts.google.com/icons?icon.style=Rounded) in Rounded category.
-
-2. Set weight to 400, grade to -25 and size to 48px.
-
-3. Click on the icon, choose Android and download XML file.
-
-4. Update the color to black (#FF000000) and the size to "24.dp", as in other icons.
-
-For example, this is [add reaction icon](https://fonts.google.com/icons?selected=Material+Symbols+Rounded:add_reaction:FILL@0;wght@300;GRAD@-25;opsz@24&icon.style=Rounded).

apps/android/app/build.gradle

@@ -11,10 +11,8 @@ android {
         applicationId "chat.simplex.app"
         minSdk 26
         targetSdk 32
-        // !!!
-        // skip version code after release to F-Droid, as it uses two version codes
-        versionCode 121
-        versionName "5.1"
+        versionCode 117
+        versionName "5.0"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables {
@@ -86,10 +84,8 @@ android {
         "es",
         "fr",
         "it",
-        "ja",
         "nl",
         "pl",
-        "pt-rBR",
         "ru",
         "zh-rCN"
     )
@@ -162,9 +158,6 @@ dependencies {
     // Video support
     implementation "com.google.android.exoplayer:exoplayer:2.17.1"
 
-    // Wheel picker
-    implementation 'com.github.zj565061763:compose-wheel-picker:1.0.0-alpha10'
-
     testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test.ext:junit:1.1.3'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'

apps/android/app/src/main/java/chat/simplex/app/MainActivity.kt

@@ -10,12 +10,14 @@ import android.view.WindowManager
 import androidx.activity.compose.setContent
 import androidx.activity.viewModels
 import androidx.compose.animation.core.*
+import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.*
 import androidx.compose.material.*
 import androidx.compose.runtime.*
 import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.graphicsLayer
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
@@ -30,12 +32,10 @@ import chat.simplex.app.views.SplashView
 import chat.simplex.app.views.call.ActiveCallView
 import chat.simplex.app.views.call.IncomingCallAlertView
 import chat.simplex.app.views.chat.ChatView
-import chat.simplex.app.views.chat.group.ProgressIndicator
 import chat.simplex.app.views.chatlist.*
 import chat.simplex.app.views.database.DatabaseErrorView
 import chat.simplex.app.views.helpers.*
 import chat.simplex.app.views.helpers.DatabaseUtils.ksAppPassword
-import chat.simplex.app.views.helpers.DatabaseUtils.ksSelfDestructPassword
 import chat.simplex.app.views.localauth.SetAppPasscodeView
 import chat.simplex.app.views.newchat.*
 import chat.simplex.app.views.onboarding.*
@@ -61,7 +61,6 @@ class MainActivity: FragmentActivity() {
     }
   }
   private val vm by viewModels<SimplexViewModel>()
-  private val destroyedAfterBackPress = mutableStateOf(false)
 
   override fun onCreate(savedInstanceState: Bundle?) {
     super.onCreate(savedInstanceState)
@@ -84,17 +83,14 @@ class MainActivity: FragmentActivity() {
     }
     setContent {
       SimpleXTheme {
-        Surface(color = MaterialTheme.colors.background) {
-          MainPage(
-            m,
-            userAuthorized,
-            laFailed,
-            destroyedAfterBackPress,
-            ::runAuthenticate,
-            ::setPerformLA,
-            showLANotice = { showLANotice(m.controller.appPrefs.laNoticeShown, this) }
-          )
-        }
+        MainPage(
+          m,
+          userAuthorized,
+          laFailed,
+          ::runAuthenticate,
+          ::setPerformLA,
+          showLANotice = { showLANotice(m.controller.appPrefs.laNoticeShown, this) }
+        )
       }
     }
     SimplexApp.context.schedulePeriodicServiceRestartWorker()
@@ -112,12 +108,7 @@ class MainActivity: FragmentActivity() {
     val enteredBackgroundVal = enteredBackground.value
     val delay = vm.chatModel.controller.appPrefs.laLockDelay.get()
     if (enteredBackgroundVal == null || elapsedRealtime() - enteredBackgroundVal >= delay * 1000) {
-      if (userAuthorized.value != false) {
-        /** [runAuthenticate] will be called in [MainPage] if needed. Making like this prevents double showing of passcode on start */
-        setAuthState()
-      } else if (!vm.chatModel.activeCallViewIsVisible.value) {
-        runAuthenticate()
-      }
+      runAuthenticate()
     }
   }
 
@@ -151,7 +142,6 @@ class MainActivity: FragmentActivity() {
       // When pressed Back and there is no one wants to process the back event, clear auth state to force re-auth on launch
       clearAuthState()
       laFailed.value = true
-      destroyedAfterBackPress.value = true
     }
     if (!onBackPressedDispatcher.hasEnabledCallbacks()) {
       // Drop shared content
@@ -159,14 +149,13 @@ class MainActivity: FragmentActivity() {
     }
   }
 
-  private fun setAuthState() {
-    userAuthorized.value = !vm.chatModel.controller.appPrefs.performLA.get()
-  }
-
   private fun runAuthenticate() {
     val m = vm.chatModel
-    setAuthState()
-    if (userAuthorized.value == false) {
+    if (!m.controller.appPrefs.performLA.get()) {
+      userAuthorized.value = true
+    } else {
+      userAuthorized.value = false
+      ModalManager.shared.closeModals()
       // To make Main thread free in order to allow to Compose to show blank view that hiding content underneath of it faster on slow devices
       CoroutineScope(Dispatchers.Default).launch {
         delay(50)
@@ -180,7 +169,6 @@ class MainActivity: FragmentActivity() {
               generalGetString(R.string.auth_log_in_using_credential)
             else
               generalGetString(R.string.auth_unlock),
-            selfDestruct = true,
             this@MainActivity,
             completed = { laResult ->
               when (laResult) {
@@ -250,7 +238,7 @@ class MainActivity: FragmentActivity() {
     authenticate(
       generalGetString(R.string.auth_enable_simplex_lock),
       generalGetString(R.string.auth_confirm_credential),
-      activity = activity,
+      activity,
       completed = { laResult ->
         when (laResult) {
           LAResult.Success -> {
@@ -291,8 +279,7 @@ class MainActivity: FragmentActivity() {
             appPrefs.performLA.set(false)
             laPasscodeNotSetAlert()
           },
-          close = close
-        )
+          close)
       }
     }
   }
@@ -317,7 +304,7 @@ class MainActivity: FragmentActivity() {
         generalGetString(R.string.auth_confirm_credential)
       else
         "",
-      activity = activity,
+      activity,
       completed = { laResult ->
         val prefPerformLA = m.controller.appPrefs.performLA
         when (laResult) {
@@ -353,17 +340,14 @@ class MainActivity: FragmentActivity() {
         generalGetString(R.string.auth_confirm_credential)
       else
         generalGetString(R.string.auth_disable_simplex_lock),
-      activity = activity,
+      activity,
       completed = { laResult ->
         val prefPerformLA = m.controller.appPrefs.performLA
-        val selfDestructPref = m.controller.appPrefs.selfDestruct
         when (laResult) {
           LAResult.Success -> {
             m.performLA.value = false
             prefPerformLA.set(false)
             ksAppPassword.remove()
-            selfDestructPref.set(false)
-            ksSelfDestructPassword.remove()
           }
           is LAResult.Failed -> { /* Can be called multiple times on every failure */ }
           is LAResult.Error -> {
@@ -392,7 +376,6 @@ fun MainPage(
   chatModel: ChatModel,
   userAuthorized: MutableState<Boolean?>,
   laFailed: MutableState<Boolean>,
-  destroyedAfterBackPress: MutableState<Boolean>,
   runAuthenticate: () -> Unit,
   setPerformLA: (Boolean, FragmentActivity) -> Unit,
   showLANotice: () -> Unit
@@ -429,38 +412,43 @@ fun MainPage(
   }
 
   @Composable
-  fun AuthView() {
-    Surface(color = MaterialTheme.colors.background) {
-      Box(
-        Modifier.fillMaxSize(),
-        contentAlignment = Alignment.Center
-      ) {
-        SimpleButton(
-          stringResource(R.string.auth_unlock),
-          icon = painterResource(R.drawable.ic_lock),
-          click = {
-            laFailed.value = false
-            runAuthenticate()
-          }
-        )
-      }
+  fun authView() {
+    Box(
+      Modifier.fillMaxSize().background(MaterialTheme.colors.background),
+      contentAlignment = Alignment.Center
+    ) {
+      SimpleButton(
+        stringResource(R.string.auth_unlock),
+        icon = painterResource(R.drawable.ic_lock),
+        click = {
+          laFailed.value = false
+          runAuthenticate()
+        }
+      )
     }
   }
 
   Box {
     val onboarding = chatModel.onboardingStage.value
     val userCreated = chatModel.userCreated.value
-    var showInitializationView by remember { mutableStateOf(false) }
     when {
-      chatModel.chatDbStatus.value == null && showInitializationView -> InitializationView()
       showChatDatabaseError -> {
         chatModel.chatDbStatus.value?.let {
           DatabaseErrorView(chatModel.chatDbStatus, chatModel.controller.appPrefs)
         }
       }
       onboarding == null || userCreated == null -> SplashView()
+      userAuthorized.value != true -> {
+        if (chatModel.controller.appPrefs.performLA.get() && laFailed.value) {
+          authView()
+        } else {
+          SplashView()
+        }
+      }
       onboarding == OnboardingStage.OnboardingComplete && userCreated -> {
         Box {
+          if (chatModel.showCallView.value) ActiveCallView(chatModel)
+          else {
             showAdvertiseLAAlert = true
             BoxWithConstraints {
               var currentChatId by rememberSaveable { mutableStateOf(chatModel.chatId.value) }
@@ -506,41 +494,16 @@ fun MainPage(
               }
             }
           }
+        }
       }
       onboarding == OnboardingStage.Step1_SimpleXInfo -> SimpleXInfo(chatModel, onboarding = true)
       onboarding == OnboardingStage.Step2_CreateProfile -> CreateProfile(chatModel) {}
-      onboarding == OnboardingStage.Step3_CreateSimpleXAddress -> CreateSimpleXAddress(chatModel)
-      onboarding == OnboardingStage.Step4_SetNotificationsMode -> SetNotificationsMode(chatModel)
+      onboarding == OnboardingStage.Step3_SetNotificationsMode -> SetNotificationsMode(chatModel)
     }
     ModalManager.shared.showInView()
-    val unauthorized = remember { derivedStateOf { userAuthorized.value != true } }
-    if (unauthorized.value && !(chatModel.activeCallViewIsVisible.value && chatModel.showCallView.value)) {
-      LaunchedEffect(Unit) {
-        // With these constrains when user presses back button while on ChatList, activity destroys and shows auth request
-        // while the screen moves to a launcher. Detect it and prevent showing the auth
-        if (!(destroyedAfterBackPress.value && chatModel.controller.appPrefs.laMode.get() == LAMode.SYSTEM)) {
-          runAuthenticate()
-        }
-      }
-      if (chatModel.controller.appPrefs.performLA.get() && laFailed.value) {
-        AuthView()
-      } else {
-        SplashView()
-      }
-    } else if (chatModel.showCallView.value) {
-      ActiveCallView(chatModel)
-    }
-    ModalManager.shared.showPasscodeInView()
     val invitation = chatModel.activeCallInvitation.value
     if (invitation != null) IncomingCallAlertView(invitation, chatModel)
     AlertManager.shared.showInView()
-
-    LaunchedEffect(Unit) {
-      delay(1000)
-      if (chatModel.chatDbStatus.value == null) {
-        showInitializationView = true
-      }
-    }
   }
 
   DisposableEffectOnRotate {
@@ -552,22 +515,6 @@ fun MainPage(
   }
 }
 
-@Composable
-private fun InitializationView() {
-  Box(Modifier.fillMaxSize(), contentAlignment = Alignment.Center) {
-    Column(horizontalAlignment = Alignment.CenterHorizontally) {
-      CircularProgressIndicator(
-        Modifier
-          .padding(bottom = DEFAULT_PADDING)
-          .size(30.dp),
-        color = MaterialTheme.colors.secondary,
-        strokeWidth = 2.5.dp
-      )
-      Text(stringResource(R.string.opening_database))
-    }
-  }
-}
-
 fun processNotificationIntent(intent: Intent?, chatModel: ChatModel) {
   val userId = getUserIdFromIntent(intent)
   when (intent?.action) {

apps/android/app/src/main/java/chat/simplex/app/SimplexApp.kt

@@ -36,11 +36,13 @@ external fun chatParseServer(str: String): String
 external fun chatPasswordHash(pwd: String, salt: String): String
 
 class SimplexApp: Application(), LifecycleEventObserver {
+  lateinit var chatController: ChatController
+
   var isAppOnForeground: Boolean = false
 
   val defaultLocale: Locale = Locale.getDefault()
 
-  suspend fun initChatController(useKey: String? = null, confirmMigrations: MigrationConfirmation? = null, startChat: Boolean = true) {
+  fun initChatController(useKey: String? = null, confirmMigrations: MigrationConfirmation? = null, startChat: Boolean = true) {
     val dbKey = useKey ?: DatabaseUtils.useDatabaseKey()
     val dbAbsolutePathPrefix = getFilesDirectory(SimplexApp.context)
     val confirm = confirmMigrations ?: if (appPreferences.confirmDBUpgrades.get()) MigrationConfirmation.Error else MigrationConfirmation.YesUp
@@ -51,7 +53,11 @@ class SimplexApp: Application(), LifecycleEventObserver {
     val ctrl = if (res is DBMigrationResult.OK) {
       migrated[1] as Long
     } else null
-    chatController.ctrl = ctrl
+    if (::chatController.isInitialized) {
+      chatController.ctrl = ctrl
+    } else {
+      chatController = ChatController(ctrl, ntfManager, applicationContext, appPreferences)
+    }
     chatModel.chatDbEncrypted.value = dbKey != ""
     chatModel.chatDbStatus.value = res
     if (res != DBMigrationResult.OK) {
@@ -59,22 +65,12 @@ class SimplexApp: Application(), LifecycleEventObserver {
     } else if (startChat) {
       // If we migrated successfully means previous re-encryption process on database level finished successfully too
       if (appPreferences.encryptionStartedAt.get() != null) appPreferences.encryptionStartedAt.set(null)
-      val user = chatController.apiGetActiveUser()
-      if (user == null) {
-        chatModel.controller.appPrefs.onboardingStage.set(OnboardingStage.Step1_SimpleXInfo)
-        chatModel.onboardingStage.value = OnboardingStage.Step1_SimpleXInfo
-        chatModel.currentUser.value = null
-        chatModel.users.clear()
-      } else {
-        val savedOnboardingStage = appPreferences.onboardingStage.get()
-        chatModel.onboardingStage.value = if (listOf(OnboardingStage.Step1_SimpleXInfo, OnboardingStage.Step2_CreateProfile).contains(savedOnboardingStage) && chatModel.users.size == 1) {
-          OnboardingStage.Step3_CreateSimpleXAddress
+      withApi {
+        val user = chatController.apiGetActiveUser()
+        if (user == null) {
+          chatModel.onboardingStage.value = OnboardingStage.Step1_SimpleXInfo
         } else {
-          savedOnboardingStage
-        }
-        chatController.startChat(user)
-        // Prevents from showing "Enable notifications" alert when onboarding wasn't complete yet
-        if (chatModel.onboardingStage.value == OnboardingStage.OnboardingComplete) {
+          chatController.startChat(user)
           chatController.showBackgroundServiceNoticeIfNeeded()
           if (appPreferences.notificationsMode.get() == NotificationsMode.SERVICE.name)
             SimplexService.start(applicationContext)
@@ -94,20 +90,13 @@ class SimplexApp: Application(), LifecycleEventObserver {
     AppPreferences(applicationContext)
   }
 
-  val chatController: ChatController by lazy {
-    ChatController(0L, ntfManager, applicationContext, appPreferences)
-  }
-
-
   override fun onCreate() {
     super.onCreate()
     context = this
+    initChatController()
+    ProcessLifecycleOwner.get().lifecycle.addObserver(this)
     context.getDir("temp", MODE_PRIVATE).deleteRecursively()
-    withBGApi {
-      initChatController()
-      runMigrations()
-    }
-    ProcessLifecycleOwner.get().lifecycle.addObserver(this@SimplexApp)
+    runMigrations()
   }
 
   override fun onStateChanged(source: LifecycleOwner, event: Lifecycle.Event) {

apps/android/app/src/main/java/chat/simplex/app/model/ChatModel.kt

@@ -4,6 +4,8 @@ import android.net.Uri
 import androidx.compose.material.MaterialTheme
 import androidx.compose.runtime.*
 import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.painter.Painter
+import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.text.SpanStyle
 import androidx.compose.ui.text.font.*
 import androidx.compose.ui.text.style.TextDecoration
@@ -17,16 +19,12 @@ import chat.simplex.app.views.usersettings.NotificationPreviewMode
 import chat.simplex.app.views.usersettings.NotificationsMode
 import kotlinx.coroutines.*
 import kotlinx.datetime.*
-import kotlinx.datetime.TimeZone
 import kotlinx.serialization.*
 import kotlinx.serialization.descriptors.*
 import kotlinx.serialization.encoding.Decoder
 import kotlinx.serialization.encoding.Encoder
 import kotlinx.serialization.json.*
 import java.io.File
-import java.time.format.DateTimeFormatter
-import java.time.format.FormatStyle
-import java.util.*
 import kotlin.random.Random
 import kotlin.time.*
 
@@ -43,6 +41,7 @@ class ChatModel(val controller: ChatController) {
   val chatDbChanged = mutableStateOf<Boolean>(false)
   val chatDbEncrypted = mutableStateOf<Boolean?>(false)
   val chatDbStatus = mutableStateOf<DBMigrationResult?>(null)
+  val chatDbDeleted = mutableStateOf(false)
   val chats = mutableStateListOf<Chat>()
   // map of connections network statuses, key is agent connection id
   val networkStatuses = mutableStateMapOf<String, NetworkStatus>()
@@ -76,7 +75,6 @@ class ChatModel(val controller: ChatController) {
   val callInvitations = mutableStateMapOf<String, RcvCallInvitation>()
   val activeCallInvitation = mutableStateOf<RcvCallInvitation?>(null)
   val activeCall = mutableStateOf<Call?>(null)
-  val activeCallViewIsVisible = mutableStateOf<Boolean>(false)
   val callCommand = mutableStateOf<WCallCommand?>(null)
   val showCallView = mutableStateOf(false)
   val switchingCall = mutableStateOf(false)
@@ -240,17 +238,6 @@ class ChatModel(val controller: ChatController) {
     }
   }
 
-  suspend fun updateChatItem(cInfo: ChatInfo, cItem: ChatItem) {
-    if (chatId.value == cInfo.id) {
-      withContext(Dispatchers.Main) {
-        val itemIndex = chatItems.indexOfFirst { it.id == cItem.id }
-        if (itemIndex >= 0) {
-          chatItems[itemIndex] = cItem
-        }
-      }
-    }
-  }
-
   fun removeChatItem(cInfo: ChatInfo, cItem: ChatItem) {
     if (cItem.isRcvNew) {
       decreaseCounterInChat(cInfo.id)
@@ -474,8 +461,6 @@ data class User(
 
   val showNotifications: Boolean = activeUser || showNtfs
 
-  val addressShared: Boolean = profile.contactLink != null
-
   companion object {
     val sampleData = User(
       userId = 1,
@@ -742,7 +727,6 @@ data class Contact(
   override fun featureEnabled(feature: ChatFeature) = when (feature) {
     ChatFeature.TimedMessages -> mergedPreferences.timedMessages.enabled.forUser
     ChatFeature.FullDelete -> mergedPreferences.fullDelete.enabled.forUser
-    ChatFeature.Reactions -> mergedPreferences.reactions.enabled.forUser
     ChatFeature.Voice -> mergedPreferences.voice.enabled.forUser
     ChatFeature.Calls -> mergedPreferences.calls.enabled.forUser
   }
@@ -750,7 +734,6 @@ data class Contact(
   override val displayName get() = localAlias.ifEmpty { profile.displayName }
   override val fullName get() = profile.fullName
   override val image get() = profile.image
-  val contactLink: String? = profile.contactLink
   override val localAlias get() = profile.localAlias
   val verified get() = activeConn.connectionCode != null
 
@@ -764,14 +747,12 @@ data class Contact(
     ChatFeature.TimedMessages -> mergedPreferences.timedMessages.contactPreference.allow != FeatureAllowed.NO
     ChatFeature.FullDelete -> mergedPreferences.fullDelete.contactPreference.allow != FeatureAllowed.NO
     ChatFeature.Voice -> mergedPreferences.voice.contactPreference.allow != FeatureAllowed.NO
-    ChatFeature.Reactions -> mergedPreferences.reactions.contactPreference.allow != FeatureAllowed.NO
     ChatFeature.Calls -> mergedPreferences.calls.contactPreference.allow != FeatureAllowed.NO
   }
 
   fun userAllowsFeature(feature: ChatFeature): Boolean = when (feature) {
     ChatFeature.TimedMessages -> mergedPreferences.timedMessages.userPreference.pref.allow != FeatureAllowed.NO
     ChatFeature.FullDelete -> mergedPreferences.fullDelete.userPreference.pref.allow != FeatureAllowed.NO
-    ChatFeature.Reactions -> mergedPreferences.reactions.userPreference.pref.allow != FeatureAllowed.NO
     ChatFeature.Voice -> mergedPreferences.voice.userPreference.pref.allow != FeatureAllowed.NO
     ChatFeature.Calls -> mergedPreferences.calls.userPreference.pref.allow != FeatureAllowed.NO
   }
@@ -833,7 +814,6 @@ data class Profile(
   override val fullName: String,
   override val image: String? = null,
   override val localAlias : String = "",
-  val contactLink: String? = null,
   val preferences: ChatPreferences? = null
 ): NamedChat {
   val profileViewName: String
@@ -841,7 +821,7 @@ data class Profile(
       return if (fullName == "" || displayName == fullName) displayName else "$displayName ($fullName)"
     }
 
-  fun toLocalProfile(profileId: Long): LocalProfile = LocalProfile(profileId, displayName, fullName, image, localAlias, contactLink, preferences)
+  fun toLocalProfile(profileId: Long): LocalProfile = LocalProfile(profileId, displayName, fullName, image, localAlias, preferences)
 
   companion object {
     val sampleData = Profile(
@@ -852,18 +832,17 @@ data class Profile(
 }
 
 @Serializable
-data class LocalProfile(
+class LocalProfile(
   val profileId: Long,
   override val displayName: String,
   override val fullName: String,
   override val image: String? = null,
   override val localAlias: String,
-  val contactLink: String? = null,
   val preferences: ChatPreferences? = null
 ): NamedChat {
   val profileViewName: String = localAlias.ifEmpty { if (fullName == "" || displayName == fullName) displayName else "$displayName ($fullName)" }
 
-  fun toProfile(): Profile = Profile(displayName, fullName, image, localAlias, contactLink, preferences)
+  fun toProfile(): Profile = Profile(displayName, fullName, image, localAlias, preferences)
 
   companion object {
     val sampleData = LocalProfile(
@@ -904,7 +883,6 @@ data class GroupInfo (
   override fun featureEnabled(feature: ChatFeature) = when (feature) {
     ChatFeature.TimedMessages -> fullGroupPreferences.timedMessages.on
     ChatFeature.FullDelete -> fullGroupPreferences.fullDelete.on
-    ChatFeature.Reactions -> fullGroupPreferences.reactions.on
     ChatFeature.Voice -> fullGroupPreferences.voice.on
     ChatFeature.Calls -> false
   }
@@ -974,7 +952,6 @@ data class GroupMember (
   val displayName: String get() = memberProfile.localAlias.ifEmpty { memberProfile.displayName }
   val fullName: String get() = memberProfile.fullName
   val image: String? get() = memberProfile.image
-  val contactLink: String? = memberProfile.contactLink
   val verified get() = activeConn?.connectionCode != null
 
   val chatViewName: String
@@ -1274,20 +1251,6 @@ class AChatItem (
   val chatItem: ChatItem
 )
 
-@Serializable
-class ACIReaction(
-  val chatInfo: ChatInfo,
-  val chatReaction: CIReaction
-)
-
-@Serializable
-class CIReaction(
-  val chatDir: CIDirection,
-  val chatItem: ChatItem,
-  val sentAt: Instant,
-  val reaction: MsgReaction
-)
-
 @Serializable @Stable
 data class ChatItem (
   val chatDir: CIDirection,
@@ -1295,7 +1258,6 @@ data class ChatItem (
   val content: CIContent,
   val formattedText: List<FormattedText>? = null,
   val quotedItem: CIQuote? = null,
-  val reactions: List<CIReactionCount>,
   val file: CIFile? = null
 ) {
   val id: Long get() = meta.itemId
@@ -1312,11 +1274,6 @@ data class ChatItem (
 
   val isRcvNew: Boolean get() = meta.isRcvNew
 
-  val allowAddReaction: Boolean get() =
-    meta.itemDeleted == null && !isLiveDummy && (reactions.count { it.userReacted } < 3)
-
-  private val isLiveDummy: Boolean get() = meta.itemId == TEMP_LIVE_CHAT_ITEM_ID
-
   val memberDisplayName: String? get() =
     if (chatDir is CIDirection.GroupRcv) chatDir.groupMember.displayName
     else null
@@ -1406,7 +1363,6 @@ data class ChatItem (
         meta = CIMeta.getSample(id, ts, text, status, itemDeleted, itemEdited, itemTimed, editable),
         content = CIContent.SndMsgContent(msgContent = MsgContent.MCText(text)),
         quotedItem = quotedItem,
-        reactions = listOf(),
         file = file
       )
 
@@ -1422,7 +1378,6 @@ data class ChatItem (
         meta = CIMeta.getSample(id, Clock.System.now(), text, CIStatus.RcvRead()),
         content = CIContent.RcvMsgContent(msgContent = MsgContent.MCFile(text)),
         quotedItem = null,
-        reactions = listOf(),
         file = CIFile.getSample(fileName = fileName, fileSize = fileSize, fileStatus = fileStatus)
       )
 
@@ -1438,7 +1393,6 @@ data class ChatItem (
         meta = CIMeta.getSample(id, ts, text, status),
         content = CIContent.RcvDeleted(deleteMode = CIDeleteMode.cidmBroadcast),
         quotedItem = null,
-        reactions = listOf(),
         file = null
       )
 
@@ -1448,7 +1402,6 @@ data class ChatItem (
         meta = CIMeta.getSample(1, Clock.System.now(), "received invitation to join group team as admin", CIStatus.RcvRead()),
         content = CIContent.RcvGroupInvitation(groupInvitation = CIGroupInvitation.getSample(status = status), memberRole = GroupMemberRole.Admin),
         quotedItem = null,
-        reactions = listOf(),
         file = null
       )
 
@@ -1458,7 +1411,6 @@ data class ChatItem (
         meta = CIMeta.getSample(1, Clock.System.now(), "group event text", CIStatus.RcvRead()),
         content = CIContent.RcvGroupEventContent(rcvGroupEvent = RcvGroupEvent.MemberAdded(groupMemberId = 1, profile = Profile.sampleData)),
         quotedItem = null,
-        reactions = listOf(),
         file = null
       )
 
@@ -1469,7 +1421,6 @@ data class ChatItem (
         meta = CIMeta.getSample(1, Clock.System.now(), content.text, CIStatus.RcvRead()),
         content = content,
         quotedItem = null,
-        reactions = listOf(),
         file = null
       )
     }
@@ -1495,7 +1446,6 @@ data class ChatItem (
         ),
         content = CIContent.RcvDeleted(deleteMode = CIDeleteMode.cidmBroadcast),
         quotedItem = null,
-        reactions = listOf(),
         file = null
       )
 
@@ -1516,7 +1466,6 @@ data class ChatItem (
         ),
         content = CIContent.SndMsgContent(MsgContent.MCText("")),
         quotedItem = null,
-        reactions = listOf(),
         file = null
       )
 
@@ -1526,7 +1475,6 @@ data class ChatItem (
         meta = meta ?: CIMeta.invalidJSON(),
         content = CIContent.InvalidJSON(json),
         quotedItem = null,
-        reactions = listOf(),
         file = null
       )
   }
@@ -1626,28 +1574,8 @@ fun getTimestampText(t: Instant): String {
   val time: LocalDateTime = t.toLocalDateTime(tz)
   val recent = now.date == time.date ||
       (now.date.minus(time.date).days == 1 && now.hour < 12 && time.hour >= 18 )
-  val dateFormatter =
-    if (recent) {
-      DateTimeFormatter.ofLocalizedTime(FormatStyle.SHORT)
-    } else {
-      DateTimeFormatter.ofPattern(
-        when (Locale.getDefault().country) {
-          "US" -> "M/dd"
-          "DE" -> "dd.MM"
-          "RU" -> "dd.MM"
-          else -> "dd/MM"
-        }
-      )
-//      DateTimeFormatter.ofLocalizedDate(FormatStyle.SHORT)
-    }
-  return time.toJavaLocalDateTime().format(dateFormatter)
-}
-
-fun localTimestamp(t: Instant): String {
-  val tz = TimeZone.currentSystemDefault()
-  val ts: LocalDateTime = t.toLocalDateTime(tz)
-  val dateFormatter = DateTimeFormatter.ofLocalizedDateTime(FormatStyle.MEDIUM)
-  return ts.toJavaLocalDateTime().format(dateFormatter)
+  return if (recent) String.format("%02d:%02d", time.hour, time.minute)
+                else String.format("%02d/%02d", time.dayOfMonth, time.monthNumber)
 }
 
 @Serializable
@@ -1662,8 +1590,8 @@ sealed class CIStatus {
 
 @Serializable
 sealed class CIDeleted {
-  @Serializable @SerialName("deleted") class Deleted(val deletedTs: Instant?): CIDeleted()
-  @Serializable @SerialName("moderated") class Moderated(val deletedTs: Instant?, val byGroupMember: GroupMember): CIDeleted()
+  @Serializable @SerialName("deleted") class Deleted: CIDeleted()
+  @Serializable @SerialName("moderated") class Moderated(val byGroupMember: GroupMember): CIDeleted()
 }
 
 @Serializable
@@ -1737,18 +1665,18 @@ sealed class CIContent: ItemContent {
   companion object {
     fun featureText(feature: Feature, enabled: String, param: Int?): String =
       if (feature.hasParam) {
-        "${feature.text}: ${timeText(param)}"
+        "${feature.text}: ${TimedMessagesPreference.ttlText(param)}"
       } else {
         "${feature.text}: $enabled"
       }
 
     fun preferenceText(feature: Feature, allowed: FeatureAllowed, param: Int?): String = when {
       allowed != FeatureAllowed.NO && feature.hasParam && param != null ->
-        String.format(generalGetString(R.string.feature_offered_item_with_param), feature.text, timeText(param))
+        String.format(generalGetString(R.string.feature_offered_item_with_param), feature.text, TimedMessagesPreference.ttlText(param))
       allowed != FeatureAllowed.NO ->
-        String.format(generalGetString(R.string.feature_offered_item), feature.text, timeText(param))
+        String.format(generalGetString(R.string.feature_offered_item), feature.text, TimedMessagesPreference.ttlText(param))
       else ->
-        String.format(generalGetString(R.string.feature_cancelled_item), feature.text, timeText(param))
+        String.format(generalGetString(R.string.feature_cancelled_item), feature.text, TimedMessagesPreference.ttlText(param))
     }
   }
 }
@@ -1795,75 +1723,6 @@ class CIQuote (
   }
 }
 
-@Serializable
-class CIReactionCount(val reaction: MsgReaction, val userReacted: Boolean, val totalReacted: Int)
-
-@Serializable(with = MsgReactionSerializer::class)
-sealed class MsgReaction {
-  @Serializable(with = MsgReactionSerializer::class) class Emoji(val emoji: MREmojiChar): MsgReaction()
-  @Serializable(with = MsgReactionSerializer::class) class Unknown(val type: String? = null, val json: JsonElement): MsgReaction()
-
-  val text: String get() = when (this) {
-    is Emoji -> when (emoji) {
-      MREmojiChar.Heart -> "❤️"
-      else -> emoji.value
-    }
-    is Unknown -> ""
-  }
-
-  companion object {
-    val values: List<MsgReaction> get() = MREmojiChar.values().map(::Emoji)
-  }
-}
-
-object MsgReactionSerializer : KSerializer<MsgReaction> {
-  override val descriptor: SerialDescriptor = buildSerialDescriptor("MsgReaction", PolymorphicKind.SEALED) {
-    element("Emoji", buildClassSerialDescriptor("Emoji") {
-      element<String>("emoji")
-    })
-    element("Unknown", buildClassSerialDescriptor("Unknown"))
-  }
-
-  override fun deserialize(decoder: Decoder): MsgReaction {
-    require(decoder is JsonDecoder)
-    val json = decoder.decodeJsonElement()
-    return if (json is JsonObject && "type" in json) {
-      when(val t = json["type"]?.jsonPrimitive?.content ?: "") {
-        "emoji" -> {
-          val emoji = Json.decodeFromString<MREmojiChar>(json["emoji"].toString())
-          if (emoji == null) MsgReaction.Unknown(t, json) else MsgReaction.Emoji(emoji)
-        }
-        else -> MsgReaction.Unknown(t, json)
-      }
-    } else {
-      MsgReaction.Unknown("", json)
-    }
-  }
-
-  override fun serialize(encoder: Encoder, value: MsgReaction) {
-    require(encoder is JsonEncoder)
-    val json = when (value) {
-      is MsgReaction.Emoji ->
-        buildJsonObject {
-          put("type", "emoji")
-          put("emoji", json.encodeToJsonElement(value.emoji))
-        }
-      is MsgReaction.Unknown -> value.json
-    }
-    encoder.encodeJsonElement(json)
-  }
-}
-
-@Serializable
-enum class MREmojiChar(val value: String) {
-  @SerialName("👍") ThumbsUp("👍"),
-  @SerialName("👎") ThumbsDown("👎"),
-  @SerialName("😀") Smile("😀"),
-  @SerialName("😢") Sad("😢"),
-  @SerialName("❤") Heart("❤"),
-  @SerialName("🚀") Launch("🚀");
-}
-
 @Serializable
 class CIFile(
   val fileId: Long,
@@ -2384,17 +2243,3 @@ sealed class ChatItemTTL: Comparable<ChatItemTTL?> {
       }
   }
 }
-
-@Serializable
-class ChatItemInfo(
-  val itemVersions: List<ChatItemVersion>,
-)
-
-@Serializable
-data class ChatItemVersion(
-  val chatItemVersionId: Long,
-  val msgContent: MsgContent,
-  val formattedText: List<FormattedText>?,
-  val itemVersionTs: Instant,
-  val createdAt: Instant,
-)

apps/android/app/src/main/java/chat/simplex/app/model/NtfManager.kt

@@ -231,10 +231,6 @@ class NtfManager(val context: Context, private val appPreferences: AppPreference
     manager.cancel(CallNotificationId)
   }
 
-  fun cancelAllNotifications() {
-    manager.cancelAll()
-  }
-
   fun hasNotificationsForChat(chatId: String): Boolean = manager.activeNotifications.any { it.id == chatId.hashCode() }
 
   private fun hideSecrets(cItem: ChatItem) : String {

apps/android/app/src/main/java/chat/simplex/app/model/SimpleXAPI.kt

@@ -141,19 +141,14 @@ class AppPreferences(val context: Context) {
   val showMuteProfileAlert = mkBoolPreference(SHARED_PREFS_SHOW_MUTE_PROFILE_ALERT, true)
   val appLanguage = mkStrPreference(SHARED_PREFS_APP_LANGUAGE, null)
 
-  val onboardingStage = mkEnumPreference(SHARED_PREFS_ONBOARDING_STAGE, OnboardingStage.OnboardingComplete) { OnboardingStage.values().firstOrNull { it.name == this } }
   val storeDBPassphrase = mkBoolPreference(SHARED_PREFS_STORE_DB_PASSPHRASE, true)
   val initialRandomDBPassphrase = mkBoolPreference(SHARED_PREFS_INITIAL_RANDOM_DB_PASSPHRASE, false)
   val encryptedDBPassphrase = mkStrPreference(SHARED_PREFS_ENCRYPTED_DB_PASSPHRASE, null)
   val initializationVectorDBPassphrase = mkStrPreference(SHARED_PREFS_INITIALIZATION_VECTOR_DB_PASSPHRASE, null)
   val encryptedAppPassphrase = mkStrPreference(SHARED_PREFS_ENCRYPTED_APP_PASSPHRASE, null)
   val initializationVectorAppPassphrase = mkStrPreference(SHARED_PREFS_INITIALIZATION_VECTOR_APP_PASSPHRASE, null)
-  val encryptedSelfDestructPassphrase = mkStrPreference(SHARED_PREFS_ENCRYPTED_SELF_DESTRUCT_PASSPHRASE, null)
-  val initializationVectorSelfDestructPassphrase = mkStrPreference(SHARED_PREFS_INITIALIZATION_VECTOR_SELF_DESTRUCT_PASSPHRASE, null)
   val encryptionStartedAt = mkDatePreference(SHARED_PREFS_ENCRYPTION_STARTED_AT, null, true)
   val confirmDBUpgrades = mkBoolPreference(SHARED_PREFS_CONFIRM_DB_UPGRADES, false)
-  val selfDestruct = mkBoolPreference(SHARED_PREFS_SELF_DESTRUCT, false)
-  val selfDestructDisplayName = mkStrPreference(SHARED_PREFS_SELF_DESTRUCT_DISPLAY_NAME, null)
 
   val currentTheme = mkStrPreference(SHARED_PREFS_CURRENT_THEME, DefaultTheme.SYSTEM.name)
   val systemDarkTheme = mkStrPreference(SHARED_PREFS_SYSTEM_DARK_THEME, DefaultTheme.SIMPLEX.name)
@@ -165,7 +160,6 @@ class AppPreferences(val context: Context) {
 
   val whatsNewVersion = mkStrPreference(SHARED_PREFS_WHATS_NEW_VERSION, null)
   val lastMigratedVersionCode = mkIntPreference(SHARED_PREFS_LAST_MIGRATED_VERSION_CODE, 0)
-  val customDisappearingMessageTime = mkIntPreference(SHARED_PREFS_CUSTOM_DISAPPEARING_MESSAGE_TIME, 300)
 
   private fun mkIntPreference(prefName: String, default: Int) =
     SharedPreference(
@@ -252,7 +246,6 @@ class AppPreferences(val context: Context) {
     private const val SHARED_PREFS_CHAT_ARCHIVE_NAME = "ChatArchiveName"
     private const val SHARED_PREFS_CHAT_ARCHIVE_TIME = "ChatArchiveTime"
     private const val SHARED_PREFS_APP_LANGUAGE = "AppLanguage"
-    private const val SHARED_PREFS_ONBOARDING_STAGE = "OnboardingStage"
     private const val SHARED_PREFS_CHAT_LAST_START = "ChatLastStart"
     private const val SHARED_PREFS_DEVELOPER_TOOLS = "DeveloperTools"
     private const val SHARED_PREFS_NETWORK_USE_SOCKS_PROXY = "NetworkUseSocksProxy"
@@ -279,18 +272,13 @@ class AppPreferences(val context: Context) {
     private const val SHARED_PREFS_INITIALIZATION_VECTOR_DB_PASSPHRASE = "InitializationVectorDBPassphrase"
     private const val SHARED_PREFS_ENCRYPTED_APP_PASSPHRASE = "EncryptedAppPassphrase"
     private const val SHARED_PREFS_INITIALIZATION_VECTOR_APP_PASSPHRASE = "InitializationVectorAppPassphrase"
-    private const val SHARED_PREFS_ENCRYPTED_SELF_DESTRUCT_PASSPHRASE = "EncryptedSelfDestructPassphrase"
-    private const val SHARED_PREFS_INITIALIZATION_VECTOR_SELF_DESTRUCT_PASSPHRASE = "InitializationVectorSelfDestructPassphrase"
     private const val SHARED_PREFS_ENCRYPTION_STARTED_AT = "EncryptionStartedAt"
     private const val SHARED_PREFS_CONFIRM_DB_UPGRADES = "ConfirmDBUpgrades"
-    private const val SHARED_PREFS_SELF_DESTRUCT = "LocalAuthenticationSelfDestruct"
-    private const val SHARED_PREFS_SELF_DESTRUCT_DISPLAY_NAME = "LocalAuthenticationSelfDestructDisplayName"
     private const val SHARED_PREFS_CURRENT_THEME = "CurrentTheme"
     private const val SHARED_PREFS_SYSTEM_DARK_THEME = "SystemDarkTheme"
     private const val SHARED_PREFS_THEMES = "Themes"
     private const val SHARED_PREFS_WHATS_NEW_VERSION = "WhatsNewVersion"
     private const val SHARED_PREFS_LAST_MIGRATED_VERSION_CODE = "LastMigratedVersionCode"
-    private const val SHARED_PREFS_CUSTOM_DISAPPEARING_MESSAGE_TIME = "CustomDisappearingMessageTime"
   }
 }
 
@@ -338,6 +326,7 @@ open class ChatController(var ctrl: ChatCtrl?, val ntfManager: NtfManager, val a
         chatModel.userCreated.value = true
         apiSetIncognito(chatModel.incognito.value)
         getUserChatData()
+        chatModel.onboardingStage.value = OnboardingStage.OnboardingComplete
         chatModel.controller.appPrefs.chatLastStart.set(Clock.System.now())
         chatModel.chatRunning.value = true
         startReceiver()
@@ -444,8 +433,8 @@ open class ChatController(var ctrl: ChatCtrl?, val ntfManager: NtfManager, val a
     return null
   }
 
-  suspend fun apiCreateActiveUser(p: Profile?, sameServers: Boolean = false, pastTimestamp: Boolean = false): User? {
-    val r = sendCmd(CC.CreateActiveUser(p, sameServers = sameServers, pastTimestamp = pastTimestamp))
+  suspend fun apiCreateActiveUser(p: Profile): User? {
+    val r = sendCmd(CC.CreateActiveUser(p))
     if (r is CR.ActiveUser) return r.user
     else if (
       r is CR.ChatCmdError && r.chatError is ChatError.ChatErrorStore && r.chatError.storeError is StoreError.DuplicateName ||
@@ -581,8 +570,8 @@ open class ChatController(var ctrl: ChatCtrl?, val ntfManager: NtfManager, val a
     return null
   }
 
-  suspend fun apiSendMessage(type: ChatType, id: Long, file: String? = null, quotedItemId: Long? = null, mc: MsgContent, live: Boolean = false, ttl: Int? = null): AChatItem? {
-    val cmd = CC.ApiSendMessage(type, id, file, quotedItemId, mc, live, ttl)
+  suspend fun apiSendMessage(type: ChatType, id: Long, file: String? = null, quotedItemId: Long? = null, mc: MsgContent, live: Boolean = false): AChatItem? {
+    val cmd = CC.ApiSendMessage(type, id, file, quotedItemId, mc, live)
     val r = sendCmd(cmd)
     return when (r) {
       is CR.NewChatItem -> r.chatItem
@@ -595,16 +584,6 @@ open class ChatController(var ctrl: ChatCtrl?, val ntfManager: NtfManager, val a
     }
   }
 
-  suspend fun apiGetChatItemInfo(type: ChatType, id: Long, itemId: Long): ChatItemInfo? {
-    return when (val r = sendCmd(CC.ApiGetChatItemInfo(type, id, itemId))) {
-      is CR.ApiChatItemInfo -> r.chatItemInfo
-      else -> {
-        apiErrorAlert("apiGetChatItemInfo", generalGetString(R.string.error_loading_details), r)
-        null
-      }
-    }
-  }
-
   suspend fun apiUpdateChatItem(type: ChatType, id: Long, itemId: Long, mc: MsgContent, live: Boolean = false): AChatItem? {
     val r = sendCmd(CC.ApiUpdateChatItem(type, id, itemId, mc, live))
     if (r is CR.ChatItemUpdated) return r.chatItem
@@ -612,13 +591,6 @@ open class ChatController(var ctrl: ChatCtrl?, val ntfManager: NtfManager, val a
     return null
   }
 
-  suspend fun apiChatItemReaction(type: ChatType, id: Long, itemId: Long, add: Boolean, reaction: MsgReaction): ChatItem? {
-    val r = sendCmd(CC.ApiChatItemReaction(type, id, itemId, add, reaction))
-    if (r is CR.ChatItemReaction) return r.reaction.chatReaction.chatItem
-    Log.e(TAG, "apiUpdateChatItem bad response: ${r.responseType} ${r.details}")
-    return null
-  }
-
   suspend fun apiDeleteChatItem(type: ChatType, id: Long, itemId: Long, mode: CIDeleteMode): CR.ChatItemDeleted? {
     val r = sendCmd(CC.ApiDeleteChatItem(type, id, itemId, mode))
     if (r is CR.ChatItemDeleted) return r
@@ -883,15 +855,6 @@ open class ChatController(var ctrl: ChatCtrl?, val ntfManager: NtfManager, val a
     return null
   }
 
-  suspend fun apiSetProfileAddress(on: Boolean): User? {
-    val userId = try { currentUserId("apiSetProfileAddress") } catch (e: Exception) { return null }
-    return when (val r = sendCmd(CC.ApiSetProfileAddress(userId, on))) {
-      is CR.UserProfileNoChange -> null
-      is CR.UserProfileUpdated -> r.user
-      else -> throw Exception("failed to set profile address: ${r.responseType} ${r.details}")
-    }
-  }
-
   suspend fun apiSetContactPrefs(contactId: Long, prefs: ChatPreferences): Contact? {
     val r = sendCmd(CC.ApiSetContactPrefs(contactId, prefs))
     if (r is CR.ContactPrefsUpdated) return r.toContact
@@ -927,12 +890,12 @@ open class ChatController(var ctrl: ChatCtrl?, val ntfManager: NtfManager, val a
     }
   }
 
-  suspend fun apiDeleteUserAddress(): User? {
-    val userId = try { currentUserId("apiDeleteUserAddress") } catch (e: Exception) { return null }
+  suspend fun apiDeleteUserAddress(): Boolean {
+    val userId = kotlin.runCatching { currentUserId("apiDeleteUserAddress") }.getOrElse { return false }
     val r = sendCmd(CC.ApiDeleteMyAddress(userId))
-    if (r is CR.UserContactLinkDeleted) return r.user
+    if (r is CR.UserContactLinkDeleted) return true
     Log.e(TAG, "apiDeleteUserAddress bad response: ${r.responseType} ${r.details}")
-    return null
+    return false
   }
 
   private suspend fun apiGetUserAddress(): UserContactLinkRec? {
@@ -1374,12 +1337,12 @@ open class ChatController(var ctrl: ChatCtrl?, val ntfManager: NtfManager, val a
         }
         val file = cItem.file
         val mc = cItem.content.msgContent
-        if (file != null &&
-            appPrefs.privacyAcceptImages.get() &&
-            ((mc is MsgContent.MCImage && file.fileSize <= MAX_IMAGE_SIZE_AUTO_RCV)
-                || (mc is MsgContent.MCVideo && file.fileSize <= MAX_VIDEO_SIZE_AUTO_RCV)
-                || (mc is MsgContent.MCVoice && file.fileSize <= MAX_VOICE_SIZE_AUTO_RCV && file.fileStatus !is CIFileStatus.RcvAccepted))) {
-          withApi { receiveFile(r.user, file.fileId) }
+        if (file != null && file.fileSize <= MAX_IMAGE_SIZE_AUTO_RCV) {
+          val acceptImages = appPrefs.privacyAcceptImages.get()
+          if ((mc is MsgContent.MCImage && acceptImages)
+            || (mc is MsgContent.MCVoice && ((file.fileSize > MAX_VOICE_SIZE_FOR_SENDING && acceptImages) || cInfo is ChatInfo.Group))) {
+            withApi { receiveFile(r.user, file.fileId) } // TODO check inlineFileMode != IFMSent
+          }
         }
         if (cItem.showNotification && (!SimplexApp.context.isAppOnForeground || chatModel.chatId.value != cInfo.id)) {
           ntfManager.notifyMessageReceived(r.user, cInfo, cItem)
@@ -1397,11 +1360,6 @@ open class ChatController(var ctrl: ChatCtrl?, val ntfManager: NtfManager, val a
       }
       is CR.ChatItemUpdated ->
         chatItemSimpleUpdate(r.user, r.chatItem)
-      is CR.ChatItemReaction -> {
-        if (active(r.user)) {
-          chatModel.updateChatItem(r.reaction.chatInfo, r.reaction.chatReaction.chatItem)
-        }
-      }
       is CR.ChatItemDeleted -> {
         if (!active(r.user)) {
           if (r.toChatItem == null && r.deletedChatItem.chatItem.isRcvNew && r.deletedChatItem.chatInfo.ntfsEnabled) {
@@ -1845,9 +1803,6 @@ open class ChatController(var ctrl: ChatCtrl?, val ntfManager: NtfManager, val a
     )
   }
 
-  /**
-   * [AppPreferences.networkProxyHostPort] is not changed here, use appPrefs to set it
-   * */
   fun setNetCfg(cfg: NetCfg) {
     appPrefs.networkUseSocksProxy.set(cfg.useSocksProxy)
     appPrefs.networkHostMode.set(cfg.hostMode.name)
@@ -1885,7 +1840,7 @@ class SharedPreference<T>(val get: () -> T, set: (T) -> Unit) {
 sealed class CC {
   class Console(val cmd: String): CC()
   class ShowActiveUser: CC()
-  class CreateActiveUser(val profile: Profile?, val sameServers: Boolean, val pastTimestamp: Boolean): CC()
+  class CreateActiveUser(val profile: Profile): CC()
   class ListUsers: CC()
   class ApiSetActiveUser(val userId: Long, val viewPwd: String?): CC()
   class ApiHideUser(val userId: Long, val viewPwd: String): CC()
@@ -1905,12 +1860,10 @@ sealed class CC {
   class ApiStorageEncryption(val config: DBEncryptionConfig): CC()
   class ApiGetChats(val userId: Long): CC()
   class ApiGetChat(val type: ChatType, val id: Long, val pagination: ChatPagination, val search: String = ""): CC()
-  class ApiGetChatItemInfo(val type: ChatType, val id: Long, val itemId: Long): CC()
-  class ApiSendMessage(val type: ChatType, val id: Long, val file: String?, val quotedItemId: Long?, val mc: MsgContent, val live: Boolean, val ttl: Int?): CC()
+  class ApiSendMessage(val type: ChatType, val id: Long, val file: String?, val quotedItemId: Long?, val mc: MsgContent, val live: Boolean): CC()
   class ApiUpdateChatItem(val type: ChatType, val id: Long, val itemId: Long, val mc: MsgContent, val live: Boolean): CC()
   class ApiDeleteChatItem(val type: ChatType, val id: Long, val itemId: Long, val mode: CIDeleteMode): CC()
   class ApiDeleteMemberChatItem(val groupId: Long, val groupMemberId: Long, val itemId: Long): CC()
-  class ApiChatItemReaction(val type: ChatType, val id: Long, val itemId: Long, val add: Boolean, val reaction: MsgReaction): CC()
   class ApiNewGroup(val userId: Long, val groupProfile: GroupProfile): CC()
   class ApiAddMember(val groupId: Long, val contactId: Long, val memberRole: GroupMemberRole): CC()
   class ApiJoinGroup(val groupId: Long): CC()
@@ -1952,7 +1905,6 @@ sealed class CC {
   class ApiCreateMyAddress(val userId: Long): CC()
   class ApiDeleteMyAddress(val userId: Long): CC()
   class ApiShowMyAddress(val userId: Long): CC()
-  class ApiSetProfileAddress(val userId: Long, val on: Boolean): CC()
   class ApiAddressAutoAccept(val userId: Long, val autoAccept: AutoAccept?): CC()
   class ApiSendCallInvitation(val contact: Contact, val callType: CallType): CC()
   class ApiRejectCall(val contact: Contact): CC()
@@ -1972,10 +1924,7 @@ sealed class CC {
   val cmdString: String get() = when (this) {
     is Console -> cmd
     is ShowActiveUser -> "/u"
-    is CreateActiveUser -> {
-      val user = NewUser(profile, sameServers = sameServers, pastTimestamp = pastTimestamp)
-      "/_create user ${json.encodeToString(user)}"
-    }
+    is CreateActiveUser -> "/create user ${profile.displayName} ${profile.fullName}"
     is ListUsers -> "/users"
     is ApiSetActiveUser -> "/_user $userId${maybePwd(viewPwd)}"
     is ApiHideUser -> "/_hide user $userId ${json.encodeToString(viewPwd)}"
@@ -1995,15 +1944,10 @@ sealed class CC {
     is ApiStorageEncryption -> "/_db encryption ${json.encodeToString(config)}"
     is ApiGetChats -> "/_get chats $userId pcc=on"
     is ApiGetChat -> "/_get chat ${chatRef(type, id)} ${pagination.cmdString}" + (if (search == "") "" else " search=$search")
-    is ApiGetChatItemInfo -> "/_get item info ${chatRef(type, id)} $itemId"
-    is ApiSendMessage -> {
-      val ttlStr = if (ttl != null) "$ttl" else "default"
-      "/_send ${chatRef(type, id)} live=${onOff(live)} ttl=${ttlStr} json ${json.encodeToString(ComposedMessage(file, quotedItemId, mc))}"
-    }
+    is ApiSendMessage -> "/_send ${chatRef(type, id)} live=${onOff(live)} json ${json.encodeToString(ComposedMessage(file, quotedItemId, mc))}"
     is ApiUpdateChatItem -> "/_update item ${chatRef(type, id)} $itemId live=${onOff(live)} ${mc.cmdString}"
     is ApiDeleteChatItem -> "/_delete item ${chatRef(type, id)} $itemId ${mode.deleteMode}"
     is ApiDeleteMemberChatItem -> "/_delete member item #$groupId $groupMemberId $itemId"
-    is ApiChatItemReaction -> "/_reaction ${chatRef(type, id)} $itemId ${onOff(add)} ${json.encodeToString(reaction)}"
     is ApiNewGroup -> "/_group $userId ${json.encodeToString(groupProfile)}"
     is ApiAddMember -> "/_add #$groupId $contactId ${memberRole.memberRole}"
     is ApiJoinGroup -> "/_join #$groupId"
@@ -2045,7 +1989,6 @@ sealed class CC {
     is ApiCreateMyAddress -> "/_address $userId"
     is ApiDeleteMyAddress -> "/_delete_address $userId"
     is ApiShowMyAddress -> "/_show_address $userId"
-    is ApiSetProfileAddress -> "/_profile_address $userId ${onOff(on)}"
     is ApiAddressAutoAccept -> "/_auto_accept $userId ${AutoAccept.cmdString(autoAccept)}"
     is ApiAcceptContact -> "/_accept $contactReqId"
     is ApiRejectContact -> "/_reject $contactReqId"
@@ -2086,12 +2029,10 @@ sealed class CC {
     is ApiStorageEncryption -> "apiStorageEncryption"
     is ApiGetChats -> "apiGetChats"
     is ApiGetChat -> "apiGetChat"
-    is ApiGetChatItemInfo -> "apiGetChatItemInfo"
     is ApiSendMessage -> "apiSendMessage"
     is ApiUpdateChatItem -> "apiUpdateChatItem"
     is ApiDeleteChatItem -> "apiDeleteChatItem"
     is ApiDeleteMemberChatItem -> "apiDeleteMemberChatItem"
-    is ApiChatItemReaction -> "apiChatItemReaction"
     is ApiNewGroup -> "apiNewGroup"
     is ApiAddMember -> "apiAddMember"
     is ApiJoinGroup -> "apiJoinGroup"
@@ -2133,7 +2074,6 @@ sealed class CC {
     is ApiCreateMyAddress -> "apiCreateMyAddress"
     is ApiDeleteMyAddress -> "apiDeleteMyAddress"
     is ApiShowMyAddress -> "apiShowMyAddress"
-    is ApiSetProfileAddress -> "apiSetProfileAddress"
     is ApiAddressAutoAccept -> "apiAddressAutoAccept"
     is ApiAcceptContact -> "apiAcceptContact"
     is ApiRejectContact -> "apiRejectContact"
@@ -2188,13 +2128,6 @@ sealed class CC {
   }
 }
 
-@Serializable
-data class NewUser(
-  val profile: Profile?,
-  val sameServers: Boolean,
-  val pastTimestamp: Boolean
-)
-
 sealed class ChatPagination {
   class Last(val count: Int): ChatPagination()
   class After(val chatItemId: Long, val count: Int): ChatPagination()
@@ -2410,15 +2343,6 @@ data class NetCfg(
   val useSocksProxy: Boolean get() = socksProxy != null
   val enableKeepAlive: Boolean get() = tcpKeepAlive != null
 
-  fun withHostPort(hostPort: String?, default: String? = ":9050"): NetCfg {
-    val socksProxy = if (hostPort?.startsWith("localhost:") == true) {
-      hostPort.removePrefix("localhost")
-    } else {
-      hostPort ?: default
-    }
-    return copy(socksProxy = socksProxy)
-  }
-
   companion object {
     val defaults: NetCfg =
       NetCfg(
@@ -2506,23 +2430,15 @@ data class ChatSettings(
 data class FullChatPreferences(
   val timedMessages: TimedMessagesPreference,
   val fullDelete: SimpleChatPreference,
-  val reactions: SimpleChatPreference,
   val voice: SimpleChatPreference,
   val calls: SimpleChatPreference,
 ) {
-  fun toPreferences(): ChatPreferences = ChatPreferences(
-    timedMessages = timedMessages,
-    fullDelete = fullDelete,
-    reactions = reactions,
-    voice = voice,
-    calls = calls
-  )
+  fun toPreferences(): ChatPreferences = ChatPreferences(timedMessages = timedMessages, fullDelete = fullDelete, voice = voice, calls = calls)
 
   companion object {
     val sampleData = FullChatPreferences(
       timedMessages = TimedMessagesPreference(allow = FeatureAllowed.NO),
       fullDelete = SimpleChatPreference(allow = FeatureAllowed.NO),
-      reactions = SimpleChatPreference(allow = FeatureAllowed.YES),
       voice = SimpleChatPreference(allow = FeatureAllowed.YES),
       calls = SimpleChatPreference(allow = FeatureAllowed.YES),
     )
@@ -2533,7 +2449,6 @@ data class FullChatPreferences(
 data class ChatPreferences(
   val timedMessages: TimedMessagesPreference?,
   val fullDelete: SimpleChatPreference?,
-  val reactions: SimpleChatPreference?,
   val voice: SimpleChatPreference?,
   val calls: SimpleChatPreference?,
 ) {
@@ -2541,7 +2456,6 @@ data class ChatPreferences(
     when (feature) {
       ChatFeature.TimedMessages -> this.copy(timedMessages = TimedMessagesPreference(allow = allowed, ttl = param ?: this.timedMessages?.ttl))
       ChatFeature.FullDelete -> this.copy(fullDelete = SimpleChatPreference(allow = allowed))
-      ChatFeature.Reactions -> this.copy(reactions = SimpleChatPreference(allow = allowed))
       ChatFeature.Voice -> this.copy(voice = SimpleChatPreference(allow = allowed))
       ChatFeature.Calls -> this.copy(calls = SimpleChatPreference(allow = allowed))
     }
@@ -2550,7 +2464,6 @@ data class ChatPreferences(
     val sampleData = ChatPreferences(
       timedMessages = TimedMessagesPreference(allow = FeatureAllowed.NO),
       fullDelete = SimpleChatPreference(allow = FeatureAllowed.NO),
-      reactions = SimpleChatPreference(allow = FeatureAllowed.YES),
       voice = SimpleChatPreference(allow = FeatureAllowed.YES),
       calls = SimpleChatPreference(allow = FeatureAllowed.YES),
     )
@@ -2573,115 +2486,62 @@ data class TimedMessagesPreference(
 ): ChatPreference {
   companion object {
     val ttlValues: List<Int?>
-      get() = listOf(3600, 8 * 3600, 86400, 7 * 86400, 30 * 86400, null)
-  }
-}
+      get() = listOf(30, 300, 3600, 8 * 3600, 86400, 7 * 86400, 30 * 86400, null)
 
-sealed class CustomTimeUnit {
-  object Second: CustomTimeUnit()
-  object Minute: CustomTimeUnit()
-  object Hour: CustomTimeUnit()
-  object Day: CustomTimeUnit()
-  object Week: CustomTimeUnit()
-  object Month: CustomTimeUnit()
-
-  val toSeconds: Int
-    get() =
-      when (this) {
-        Second -> 1
-        Minute -> 60
-        Hour -> 3600
-        Day -> 86400
-        Week -> 7 * 86400
-        Month -> 30 * 86400
-      }
-
-  val text: String
-    get() =
-      when (this) {
-        Second -> generalGetString(R.string.custom_time_unit_seconds)
-        Minute -> generalGetString(R.string.custom_time_unit_minutes)
-        Hour -> generalGetString(R.string.custom_time_unit_hours)
-        Day -> generalGetString(R.string.custom_time_unit_days)
-        Week -> generalGetString(R.string.custom_time_unit_weeks)
-        Month -> generalGetString(R.string.custom_time_unit_months)
-      }
-
-  companion object {
-    fun toTimeUnit(seconds: Int): Pair<CustomTimeUnit, Int> {
-      val tryUnits = listOf(Month, Week, Day, Hour, Minute)
-      var selectedUnit: Pair<CustomTimeUnit, Int>? = null
-      for (unit in tryUnits) {
-        val (v, r) = divMod(seconds, unit.toSeconds)
-        if (r == 0) {
-          selectedUnit = Pair(unit, v)
-          break
-        }
-      }
-      return selectedUnit ?: Pair(Second, seconds)
+    fun ttlText(ttl: Int?): String {
+      ttl ?: return generalGetString(R.string.feature_off)
+      if (ttl == 0) return  String.format(generalGetString(R.string.ttl_sec), 0)
+      val (m_, s) = divMod(ttl, 60)
+      val (h_, m) = divMod(m_, 60)
+      val (d_, h) = divMod(h_, 24)
+      val (mm, d) = divMod(d_, 30)
+      return maybe(mm, if (mm == 1) String.format(generalGetString(R.string.ttl_month), 1) else String.format(generalGetString(R.string.ttl_months), mm)) +
+          maybe(d, if (d == 1) String.format(generalGetString(R.string.ttl_day), 1) else if (d == 7) String.format(generalGetString(R.string.ttl_week), 1) else if (d == 14) String.format(generalGetString(R.string.ttl_weeks), 2) else String.format(generalGetString(R.string.ttl_days), d)) +
+          maybe(h, if (h == 1) String.format(generalGetString(R.string.ttl_hour), 1) else String.format(generalGetString(R.string.ttl_hours), h)) +
+          maybe(m, String.format(generalGetString(R.string.ttl_min), m)) +
+          maybe(s, String.format(generalGetString(R.string.ttl_sec), s))
     }
 
-    private fun divMod(n: Int, d: Int): Pair<Int, Int> =
+    fun shortTtlText(ttl: Int?): String {
+      ttl ?: return generalGetString(R.string.feature_off)
+      val m = ttl / 60
+      if (m == 0) {
+        return String.format(generalGetString(R.string.ttl_s), ttl)
+      }
+      val h = m / 60
+      if (h == 0) {
+        return String.format(generalGetString(R.string.ttl_m), m)
+      }
+      val d = h / 24
+      if (d == 0) {
+        return String.format(generalGetString(R.string.ttl_h), h)
+      }
+      val mm = d / 30
+      if (mm > 0) {
+        return String.format(generalGetString(R.string.ttl_mth), mm)
+      }
+      val w = d / 7
+      return if (w == 0 || d % 7 != 0) String.format(generalGetString(R.string.ttl_d), d) else String.format(generalGetString(R.string.ttl_w), w)
+    }
+
+    fun divMod(n: Int, d: Int): Pair<Int, Int> =
       n / d to n % d
 
-    fun toText(seconds: Int): String {
-      val (unit, value) = toTimeUnit(seconds)
-      return when (unit) {
-        Second -> String.format(generalGetString(R.string.ttl_sec), value)
-        Minute -> String.format(generalGetString(R.string.ttl_min), value)
-        Hour -> if (value == 1) String.format(generalGetString(R.string.ttl_hour), 1) else String.format(generalGetString(R.string.ttl_hours), value)
-        Day -> if (value == 1) String.format(generalGetString(R.string.ttl_day), 1) else String.format(generalGetString(R.string.ttl_days), value)
-        Week -> if (value == 1) String.format(generalGetString(R.string.ttl_week), 1) else String.format(generalGetString(R.string.ttl_weeks), value)
-        Month -> if (value == 1) String.format(generalGetString(R.string.ttl_month), 1) else String.format(generalGetString(R.string.ttl_months), value)
-      }
-    }
-
-    fun toShortText(seconds: Int): String {
-      val (unit, value) = toTimeUnit(seconds)
-      return when (unit) {
-        Second -> String.format(generalGetString(R.string.ttl_s), value)
-        Minute -> String.format(generalGetString(R.string.ttl_m), value)
-        Hour -> String.format(generalGetString(R.string.ttl_h), value)
-        Day -> String.format(generalGetString(R.string.ttl_d), value)
-        Week -> String.format(generalGetString(R.string.ttl_w), value)
-        Month -> String.format(generalGetString(R.string.ttl_mth), value)
-      }
-    }
+    fun maybe(n: Int, s: String): String =
+      if (n == 0) "" else s
   }
 }
 
-fun timeText(seconds: Int?): String {
-  if (seconds == null) {
-    return generalGetString(R.string.feature_off)
-  }
-  if (seconds == 0) {
-    String.format(generalGetString(R.string.ttl_sec), 0)
-  }
-  return CustomTimeUnit.toText(seconds)
-}
-
-fun shortTimeText(seconds: Int?): String {
-  if (seconds == null) {
-    return generalGetString(R.string.feature_off)
-  }
-  if (seconds == 0) {
-    String.format(generalGetString(R.string.ttl_s), 0)
-  }
-  return CustomTimeUnit.toShortText(seconds)
-}
-
 @Serializable
 data class ContactUserPreferences(
   val timedMessages: ContactUserPreferenceTimed,
   val fullDelete: ContactUserPreference,
-  val reactions: ContactUserPreference,
   val voice: ContactUserPreference,
   val calls: ContactUserPreference,
 ) {
   fun toPreferences(): ChatPreferences = ChatPreferences(
     timedMessages = timedMessages.userPreference.pref,
     fullDelete = fullDelete.userPreference.pref,
-    reactions = reactions.userPreference.pref,
     voice = voice.userPreference.pref,
     calls = calls.userPreference.pref
   )
@@ -2698,11 +2558,6 @@ data class ContactUserPreferences(
         userPreference = ContactUserPref.User(preference = SimpleChatPreference(allow = FeatureAllowed.NO)),
         contactPreference = SimpleChatPreference(allow = FeatureAllowed.NO)
       ),
-      reactions = ContactUserPreference(
-        enabled = FeatureEnabled(forUser = true, forContact = true),
-        userPreference = ContactUserPref.User(preference = SimpleChatPreference(allow = FeatureAllowed.YES)),
-        contactPreference = SimpleChatPreference(allow = FeatureAllowed.YES)
-      ),
       voice = ContactUserPreference(
         enabled = FeatureEnabled(forUser = true, forContact = true),
         userPreference = ContactUserPref.User(preference = SimpleChatPreference(allow = FeatureAllowed.YES)),
@@ -2799,7 +2654,6 @@ interface Feature {
 enum class ChatFeature: Feature {
   @SerialName("timedMessages") TimedMessages,
   @SerialName("fullDelete") FullDelete,
-  @SerialName("reactions") Reactions,
   @SerialName("voice") Voice,
   @SerialName("calls") Calls;
 
@@ -2817,7 +2671,6 @@ enum class ChatFeature: Feature {
     get() = when(this) {
       TimedMessages -> generalGetString(R.string.timed_messages)
       FullDelete -> generalGetString(R.string.full_deletion)
-      Reactions -> generalGetString(R.string.message_reactions)
       Voice -> generalGetString(R.string.voice_messages)
       Calls -> generalGetString(R.string.audio_video_calls)
     }
@@ -2826,7 +2679,6 @@ enum class ChatFeature: Feature {
     @Composable get() = when(this) {
       TimedMessages -> painterResource(R.drawable.ic_timer)
       FullDelete -> painterResource(R.drawable.ic_delete_forever)
-      Reactions -> painterResource(R.drawable.ic_add_reaction)
       Voice -> painterResource(R.drawable.ic_keyboard_voice)
       Calls -> painterResource(R.drawable.ic_call)
     }
@@ -2835,7 +2687,6 @@ enum class ChatFeature: Feature {
   override fun iconFilled(): Painter = when(this) {
       TimedMessages -> painterResource(R.drawable.ic_timer_filled)
       FullDelete -> painterResource(R.drawable.ic_delete_forever_filled)
-      Reactions -> painterResource(R.drawable.ic_add_reaction_filled)
       Voice -> painterResource(R.drawable.ic_keyboard_voice_filled)
       Calls -> painterResource(R.drawable.ic_call_filled)
   }
@@ -2852,12 +2703,7 @@ enum class ChatFeature: Feature {
         FeatureAllowed.YES -> generalGetString(R.string.allow_irreversible_message_deletion_only_if)
         FeatureAllowed.NO -> generalGetString(R.string.contacts_can_mark_messages_for_deletion)
       }
-      Reactions -> when (allowed) {
-        FeatureAllowed.ALWAYS -> generalGetString(R.string.allow_your_contacts_adding_message_reactions)
-        FeatureAllowed.YES -> generalGetString(R.string.allow_message_reactions_only_if)
-        FeatureAllowed.NO -> generalGetString(R.string.prohibit_message_reactions)
-      }
-        Voice -> when (allowed) {
+      Voice -> when (allowed) {
         FeatureAllowed.ALWAYS -> generalGetString(R.string.allow_your_contacts_to_send_voice_messages)
         FeatureAllowed.YES -> generalGetString(R.string.allow_voice_messages_only_if)
         FeatureAllowed.NO -> generalGetString(R.string.prohibit_sending_voice_messages)
@@ -2883,12 +2729,6 @@ enum class ChatFeature: Feature {
         enabled.forContact -> generalGetString(R.string.only_your_contact_can_delete)
         else -> generalGetString(R.string.message_deletion_prohibited)
       }
-      Reactions -> when {
-        enabled.forUser && enabled.forContact -> generalGetString(R.string.both_you_and_your_contact_can_add_message_reactions)
-        enabled.forUser -> generalGetString(R.string.only_you_can_add_message_reactions)
-        enabled.forContact -> generalGetString(R.string.only_your_contact_can_add_message_reactions)
-        else -> generalGetString(R.string.message_reactions_prohibited_in_this_chat)
-      }
       Voice -> when {
         enabled.forUser && enabled.forContact -> generalGetString(R.string.both_you_and_your_contact_can_send_voice)
         enabled.forUser -> generalGetString(R.string.only_you_can_send_voice)
@@ -2909,7 +2749,6 @@ enum class GroupFeature: Feature {
   @SerialName("timedMessages") TimedMessages,
   @SerialName("directMessages") DirectMessages,
   @SerialName("fullDelete") FullDelete,
-  @SerialName("reactions") Reactions,
   @SerialName("voice") Voice;
 
   override val hasParam: Boolean get() = when(this) {
@@ -2922,7 +2761,6 @@ enum class GroupFeature: Feature {
       TimedMessages -> generalGetString(R.string.timed_messages)
       DirectMessages -> generalGetString(R.string.direct_messages)
       FullDelete -> generalGetString(R.string.full_deletion)
-      Reactions -> generalGetString(R.string.message_reactions)
       Voice -> generalGetString(R.string.voice_messages)
     }
 
@@ -2931,7 +2769,6 @@ enum class GroupFeature: Feature {
       TimedMessages -> painterResource(R.drawable.ic_timer)
       DirectMessages -> painterResource(R.drawable.ic_swap_horizontal_circle)
       FullDelete -> painterResource(R.drawable.ic_delete_forever)
-      Reactions -> painterResource(R.drawable.ic_add_reaction)
       Voice -> painterResource(R.drawable.ic_keyboard_voice)
     }
 
@@ -2940,7 +2777,6 @@ enum class GroupFeature: Feature {
     TimedMessages -> painterResource(R.drawable.ic_timer_filled)
     DirectMessages -> painterResource(R.drawable.ic_swap_horizontal_circle_filled)
     FullDelete -> painterResource(R.drawable.ic_delete_forever_filled)
-    Reactions -> painterResource(R.drawable.ic_add_reaction_filled)
     Voice -> painterResource(R.drawable.ic_keyboard_voice_filled)
   }
 
@@ -2959,10 +2795,6 @@ enum class GroupFeature: Feature {
           GroupFeatureEnabled.ON -> generalGetString(R.string.allow_to_delete_messages)
           GroupFeatureEnabled.OFF -> generalGetString(R.string.prohibit_message_deletion)
         }
-        Reactions -> when(enabled) {
-          GroupFeatureEnabled.ON -> generalGetString(R.string.allow_message_reactions)
-          GroupFeatureEnabled.OFF -> generalGetString(R.string.prohibit_message_reactions_group)
-        }
         Voice -> when(enabled) {
           GroupFeatureEnabled.ON -> generalGetString(R.string.allow_to_send_voice)
           GroupFeatureEnabled.OFF -> generalGetString(R.string.prohibit_sending_voice)
@@ -2982,10 +2814,6 @@ enum class GroupFeature: Feature {
           GroupFeatureEnabled.ON -> generalGetString(R.string.group_members_can_delete)
           GroupFeatureEnabled.OFF -> generalGetString(R.string.message_deletion_prohibited_in_chat)
         }
-        Reactions -> when(enabled) {
-          GroupFeatureEnabled.ON -> generalGetString(R.string.group_members_can_add_message_reactions)
-          GroupFeatureEnabled.OFF -> generalGetString(R.string.message_reactions_are_prohibited)
-        }
         Voice -> when(enabled) {
           GroupFeatureEnabled.ON -> generalGetString(R.string.group_members_can_send_voice)
           GroupFeatureEnabled.OFF -> generalGetString(R.string.voice_messages_are_prohibited)
@@ -3026,7 +2854,6 @@ data class ContactFeaturesAllowed(
   val timedMessagesAllowed: Boolean,
   val timedMessagesTTL: Int?,
   val fullDelete: ContactFeatureAllowed,
-  val reactions: ContactFeatureAllowed,
   val voice: ContactFeatureAllowed,
   val calls: ContactFeatureAllowed,
 ) {
@@ -3035,7 +2862,6 @@ data class ContactFeaturesAllowed(
       timedMessagesAllowed = false,
       timedMessagesTTL = null,
       fullDelete = ContactFeatureAllowed.UserDefault(FeatureAllowed.NO),
-      reactions = ContactFeatureAllowed.UserDefault(FeatureAllowed.YES),
       voice = ContactFeatureAllowed.UserDefault(FeatureAllowed.YES),
       calls = ContactFeatureAllowed.UserDefault(FeatureAllowed.YES),
     )
@@ -3049,7 +2875,6 @@ fun contactUserPrefsToFeaturesAllowed(contactUserPreferences: ContactUserPrefere
     timedMessagesAllowed = allow == FeatureAllowed.YES || allow == FeatureAllowed.ALWAYS,
     timedMessagesTTL = pref.pref.ttl,
     fullDelete = contactUserPrefToFeatureAllowed(contactUserPreferences.fullDelete),
-    reactions = contactUserPrefToFeatureAllowed(contactUserPreferences.reactions),
     voice = contactUserPrefToFeatureAllowed(contactUserPreferences.voice),
     calls = contactUserPrefToFeatureAllowed(contactUserPreferences.calls),
   )
@@ -3069,7 +2894,6 @@ fun contactFeaturesAllowedToPrefs(contactFeaturesAllowed: ContactFeaturesAllowed
   ChatPreferences(
     timedMessages = TimedMessagesPreference(if (contactFeaturesAllowed.timedMessagesAllowed) FeatureAllowed.YES else FeatureAllowed.NO, contactFeaturesAllowed.timedMessagesTTL),
     fullDelete = contactFeatureAllowedToPref(contactFeaturesAllowed.fullDelete),
-    reactions = contactFeatureAllowedToPref(contactFeaturesAllowed.reactions),
     voice = contactFeatureAllowedToPref(contactFeaturesAllowed.voice),
     calls = contactFeatureAllowedToPref(contactFeaturesAllowed.calls),
   )
@@ -3101,24 +2925,16 @@ data class FullGroupPreferences(
   val timedMessages: TimedMessagesGroupPreference,
   val directMessages: GroupPreference,
   val fullDelete: GroupPreference,
-  val reactions: GroupPreference,
   val voice: GroupPreference
 ) {
   fun toGroupPreferences(): GroupPreferences =
-    GroupPreferences(
-      timedMessages = timedMessages,
-      directMessages = directMessages,
-      fullDelete = fullDelete,
-      reactions = reactions,
-      voice = voice
-    )
+    GroupPreferences(timedMessages = timedMessages, directMessages = directMessages, fullDelete = fullDelete, voice = voice)
 
   companion object {
     val sampleData = FullGroupPreferences(
       timedMessages = TimedMessagesGroupPreference(GroupFeatureEnabled.OFF),
       directMessages = GroupPreference(GroupFeatureEnabled.OFF),
       fullDelete = GroupPreference(GroupFeatureEnabled.OFF),
-      reactions = GroupPreference(GroupFeatureEnabled.ON),
       voice = GroupPreference(GroupFeatureEnabled.ON)
     )
   }
@@ -3129,7 +2945,6 @@ data class GroupPreferences(
   val timedMessages: TimedMessagesGroupPreference?,
   val directMessages: GroupPreference?,
   val fullDelete: GroupPreference?,
-  val reactions: GroupPreference?,
   val voice: GroupPreference?
 ) {
   companion object {
@@ -3137,7 +2952,6 @@ data class GroupPreferences(
       timedMessages = TimedMessagesGroupPreference(GroupFeatureEnabled.OFF),
       directMessages = GroupPreference(GroupFeatureEnabled.OFF),
       fullDelete = GroupPreference(GroupFeatureEnabled.OFF),
-      reactions = GroupPreference(GroupFeatureEnabled.ON),
       voice = GroupPreference(GroupFeatureEnabled.ON)
     )
   }
@@ -3267,7 +3081,6 @@ sealed class CR {
   @Serializable @SerialName("chatStopped") class ChatStopped: CR()
   @Serializable @SerialName("apiChats") class ApiChats(val user: User, val chats: List<Chat>): CR()
   @Serializable @SerialName("apiChat") class ApiChat(val user: User, val chat: Chat): CR()
-  @Serializable @SerialName("chatItemInfo") class ApiChatItemInfo(val user: User, val chatItem: AChatItem, val chatItemInfo: ChatItemInfo): CR()
   @Serializable @SerialName("userProtoServers") class UserProtoServers(val user: User, val servers: UserProtocolServers): CR()
   @Serializable @SerialName("serverTestResult") class ServerTestResult(val user: User, val testServer: String, val testFailure: ProtocolTestFailure? = null): CR()
   @Serializable @SerialName("chatItemTTL") class ChatItemTTL(val user: User, val chatItemTTL: Long? = null): CR()
@@ -3310,7 +3123,6 @@ sealed class CR {
   @Serializable @SerialName("newChatItem") class NewChatItem(val user: User, val chatItem: AChatItem): CR()
   @Serializable @SerialName("chatItemStatusUpdated") class ChatItemStatusUpdated(val user: User, val chatItem: AChatItem): CR()
   @Serializable @SerialName("chatItemUpdated") class ChatItemUpdated(val user: User, val chatItem: AChatItem): CR()
-  @Serializable @SerialName("chatItemReaction") class ChatItemReaction(val user: User, val added: Boolean, val reaction: ACIReaction): CR()
   @Serializable @SerialName("chatItemDeleted") class ChatItemDeleted(val user: User, val deletedChatItem: AChatItem, val toChatItem: AChatItem? = null, val byUser: Boolean): CR()
   @Serializable @SerialName("contactsList") class ContactsList(val user: User, val contacts: List<Contact>): CR()
   // group events
@@ -3380,7 +3192,6 @@ sealed class CR {
     is ChatStopped -> "chatStopped"
     is ApiChats -> "apiChats"
     is ApiChat -> "apiChat"
-    is ApiChatItemInfo -> "chatItemInfo"
     is UserProtoServers -> "userProtoServers"
     is ServerTestResult -> "serverTestResult"
     is ChatItemTTL -> "chatItemTTL"
@@ -3423,7 +3234,6 @@ sealed class CR {
     is NewChatItem -> "newChatItem"
     is ChatItemStatusUpdated -> "chatItemStatusUpdated"
     is ChatItemUpdated -> "chatItemUpdated"
-    is ChatItemReaction -> "chatItemReaction"
     is ChatItemDeleted -> "chatItemDeleted"
     is ContactsList -> "contactsList"
     is GroupCreated -> "groupCreated"
@@ -3490,7 +3300,6 @@ sealed class CR {
     is ChatStopped -> noDetails()
     is ApiChats -> withUser(user, json.encodeToString(chats))
     is ApiChat -> withUser(user, json.encodeToString(chat))
-    is ApiChatItemInfo -> withUser(user, "chatItem: ${json.encodeToString(AChatItem)}\n${json.encodeToString(chatItemInfo)}")
     is UserProtoServers -> withUser(user, "servers: ${json.encodeToString(servers)}")
     is ServerTestResult -> withUser(user, "server: $testServer\nresult: ${json.encodeToString(testFailure)}")
     is ChatItemTTL -> withUser(user, json.encodeToString(chatItemTTL))
@@ -3534,7 +3343,6 @@ sealed class CR {
     is NewChatItem -> withUser(user, json.encodeToString(chatItem))
     is ChatItemStatusUpdated -> withUser(user, json.encodeToString(chatItem))
     is ChatItemUpdated -> withUser(user, json.encodeToString(chatItem))
-    is ChatItemReaction -> withUser(user, "added: $added\n${json.encodeToString(reaction)}")
     is ChatItemDeleted -> withUser(user, "deletedChatItem:\n${json.encodeToString(deletedChatItem)}\ntoChatItem:\n${json.encodeToString(toChatItem)}\nbyUser: $byUser")
     is ContactsList -> withUser(user, json.encodeToString(contacts))
     is GroupCreated -> withUser(user, json.encodeToString(groupInfo))

apps/android/app/src/main/java/chat/simplex/app/ui/theme/Color.kt

@@ -21,6 +21,7 @@ val ToolbarDark = Color(80, 80, 80, 12)
 val SettingsSecondaryLight = Color(200, 196, 195, 90)
 val GroupDark = Color(80, 80, 80, 60)
 val IncomingCallLight = Color(239, 237, 236, 255)
+val IncomingCallDark = Color(34, 30, 29, 255)
 val WarningOrange = Color(255, 127, 0, 255)
 val WarningYellow = Color(255, 192, 0, 255)
 val FileLight = Color(183, 190, 199, 255)

apps/android/app/src/main/java/chat/simplex/app/ui/theme/Theme.kt

@@ -16,7 +16,6 @@ import chat.simplex.app.views.helpers.*
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
-import okhttp3.internal.toHexString
 
 enum class DefaultTheme {
   SYSTEM, LIGHT, DARK, SIMPLEX;
@@ -129,29 +128,11 @@ data class ThemeColors(
       receivedMessage = receivedMessage?.colorFromReadableHex() ?: baseColors.receivedMessage,
     )
   }
-
-  fun withFilledColors(base: DefaultTheme): ThemeColors {
-    val c = toColors(base)
-    val ac = toAppColors(base)
-    return ThemeColors(
-      primary = c.primary.toReadableHex(),
-      primaryVariant = c.primaryVariant.toReadableHex(),
-      secondary = c.secondary.toReadableHex(),
-      secondaryVariant = c.secondaryVariant.toReadableHex(),
-      background = c.background.toReadableHex(),
-      surface = c.surface.toReadableHex(),
-      title = ac.title.toReadableHex(),
-      sentMessage = ac.sentMessage.toReadableHex(),
-      receivedMessage = ac.receivedMessage.toReadableHex()
-    )
-  }
 }
 
 private fun String.colorFromReadableHex(): Color =
   Color(this.replace("#", "").toLongOrNull(16) ?: Color.White.toArgb().toLong())
 
-private fun Color.toReadableHex(): String = "#" + toArgb().toHexString()
-
 @Serializable
 data class ThemeOverrides (
   val base: DefaultTheme,
@@ -172,6 +153,9 @@ data class ThemeOverrides (
   }
 }
 
+@Serializable
+data class ThemeData (val colors: ThemeColors)
+
 fun Modifier.themedBackground(baseTheme: DefaultTheme = CurrentColors.value.base, shape: Shape = RectangleShape): Modifier {
   return if (baseTheme == DefaultTheme.SIMPLEX) {
     this.background(brush = Brush.linearGradient(

apps/android/app/src/main/java/chat/simplex/app/ui/theme/ThemeManager.kt

@@ -44,16 +44,19 @@ object ThemeManager {
     return ActiveTheme(themeName, baseTheme.first, theme.colors.toColors(theme.base), theme.colors.toAppColors(theme.base))
   }
 
-  fun currentThemeOverridesForExport(darkForSystemTheme: Boolean): ThemeOverrides {
-    val themeName = appPrefs.currentTheme.get()!!
-    val nonSystemThemeName = if (themeName != DefaultTheme.SYSTEM.name) {
-      themeName
-    } else {
-      if (darkForSystemTheme) appPrefs.systemDarkTheme.get()!! else DefaultTheme.LIGHT.name
-    }
-    val overrides = appPrefs.themeOverrides.get().toMutableMap()
-    val nonFilledTheme = overrides[nonSystemThemeName] ?: ThemeOverrides(base = CurrentColors.value.base, colors = ThemeColors())
-    return nonFilledTheme.copy(colors = nonFilledTheme.colors.withFilledColors(CurrentColors.value.base))
+  fun currentThemeData(darkForSystemTheme: Boolean): ThemeData {
+    val t = currentColors(darkForSystemTheme)
+    return ThemeData(colors = ThemeColors(
+      primary = t.colors.primary.toReadableHex(),
+      primaryVariant = t.colors.primaryVariant.toReadableHex(),
+      secondary = t.colors.secondary.toReadableHex(),
+      secondaryVariant = t.colors.secondaryVariant.toReadableHex(),
+      background = t.colors.background.toReadableHex(),
+      surface = t.colors.surface.toReadableHex(),
+      title = t.appColors.title.toReadableHex(),
+      sentMessage = t.appColors.sentMessage.toReadableHex(),
+      receivedMessage = t.appColors.receivedMessage.toReadableHex()
+    ))
   }
 
   // colors, default theme enum, localized name of theme
@@ -125,12 +128,11 @@ object ThemeManager {
     CurrentColors.value = currentColors(!CurrentColors.value.colors.isLight)
   }
 
-  fun saveAndApplyThemeOverrides(theme: ThemeOverrides, darkForSystemTheme: Boolean) {
+  fun saveAndApplyThemeData(name: String, theme: ThemeData, darkForSystemTheme: Boolean) {
     val overrides = appPrefs.themeOverrides.get().toMutableMap()
-    val prevValue = overrides[theme.base.name] ?: ThemeOverrides(base = CurrentColors.value.base, colors = ThemeColors())
-    overrides[theme.base.name] = prevValue.copy(colors = theme.colors)
+    val prevValue = overrides[name] ?: ThemeOverrides(base = CurrentColors.value.base, colors = ThemeColors())
+    overrides[name] = prevValue.copy(colors = theme.colors)
     appPrefs.themeOverrides.set(overrides)
-    appPrefs.currentTheme.set(theme.base.name)
     CurrentColors.value = currentColors(!CurrentColors.value.colors.isLight)
   }
 

apps/android/app/src/main/java/chat/simplex/app/ui/theme/Type.kt

@@ -33,11 +33,6 @@ val Typography = Typography(
     fontWeight = FontWeight.Normal,
     fontSize = 18.5.sp
   ),
-  h4 = TextStyle(
-    fontFamily = Inter,
-    fontWeight = FontWeight.Normal,
-    fontSize = 17.5.sp
-  ),
   body1 = TextStyle(
     fontFamily = Inter,
     fontWeight = FontWeight.Normal,

apps/android/app/src/main/java/chat/simplex/app/views/TerminalView.kt

@@ -86,7 +86,7 @@ fun TerminalLayout(
             userIsObserver = false,
             userCanSend = true,
             allowVoiceToContact = {},
-            sendMessage = { sendCommand() },
+            sendMessage = sendCommand,
             sendLiveMessage = null,
             updateLiveMessage = null,
             onMessageChange = ::onMessageChange,
@@ -99,8 +99,8 @@ fun TerminalLayout(
       Surface(
         modifier = Modifier
           .padding(contentPadding)
-          .fillMaxWidth(),
-        color = MaterialTheme.colors.background
+          .fillMaxWidth()
+          .themedBackground()
       ) {
         TerminalLog(terminalItems)
       }

apps/android/app/src/main/java/chat/simplex/app/views/WelcomeView.kt

@@ -44,75 +44,77 @@ fun CreateProfilePanel(chatModel: ChatModel, close: () -> Unit) {
   val fullName = rememberSaveable { mutableStateOf("") }
   val focusRequester = remember { FocusRequester() }
 
-  Column(
-    modifier = Modifier.fillMaxSize().verticalScroll(rememberScrollState())
-  ) {
-    /*CloseSheetBar(close = {
-      if (chatModel.users.isEmpty()) {
-        chatModel.onboardingStage.value = OnboardingStage.Step1_SimpleXInfo
-      } else {
-        close()
-      }
-    })*/
-    Column(Modifier.padding(horizontal = DEFAULT_PADDING)) {
-      AppBarTitle(stringResource(R.string.create_profile), bottomPadding = DEFAULT_PADDING)
-      ReadableText(R.string.your_profile_is_stored_on_your_device, TextAlign.Center, padding = PaddingValues(), style = MaterialTheme.typography.body1)
-      ReadableText(R.string.profile_is_only_shared_with_your_contacts, TextAlign.Center, style = MaterialTheme.typography.body1)
-      Spacer(Modifier.height(DEFAULT_PADDING))
-      Row(Modifier.padding(bottom = DEFAULT_PADDING_HALF).fillMaxWidth(), horizontalArrangement = Arrangement.SpaceBetween) {
-        Text(
-          stringResource(R.string.display_name),
-          fontSize = 16.sp
-        )
-        if (!isValidDisplayName(displayName.value)) {
+  Surface(Modifier.background(MaterialTheme.colors.onBackground)) {
+    Column(
+      modifier = Modifier.fillMaxSize().verticalScroll(rememberScrollState())
+    ) {
+      /*CloseSheetBar(close = {
+        if (chatModel.users.isEmpty()) {
+          chatModel.onboardingStage.value = OnboardingStage.Step1_SimpleXInfo
+        } else {
+          close()
+        }
+      })*/
+      Column(Modifier.padding(horizontal = DEFAULT_PADDING * 1f)) {
+        AppBarTitle(stringResource(R.string.create_profile))
+        ReadableText(R.string.your_profile_is_stored_on_your_device, TextAlign.Center, padding = PaddingValues())
+        ReadableText(R.string.profile_is_only_shared_with_your_contacts, TextAlign.Center)
+        Spacer(Modifier.height(DEFAULT_PADDING * 1.5f))
+        Row(Modifier.padding(bottom = DEFAULT_PADDING_HALF).fillMaxWidth(), horizontalArrangement = Arrangement.SpaceBetween) {
           Text(
-            stringResource(R.string.no_spaces),
-            fontSize = 16.sp,
-            color = Color.Red
+            stringResource(R.string.display_name),
+            fontSize = 16.sp
           )
+          if (!isValidDisplayName(displayName.value)) {
+            Text(
+              stringResource(R.string.no_spaces),
+              fontSize = 16.sp,
+              color = Color.Red
+            )
+          }
+        }
+        ProfileNameField(displayName, "", ::isValidDisplayName, focusRequester)
+        Spacer(Modifier.height(DEFAULT_PADDING))
+        Text(
+          stringResource(R.string.full_name_optional__prompt),
+          fontSize = 16.sp,
+          modifier = Modifier.padding(bottom = DEFAULT_PADDING_HALF)
+        )
+        ProfileNameField(fullName, "", ::isValidDisplayName)
+      }
+      Spacer(Modifier.fillMaxHeight().weight(1f))
+      Row {
+        if (chatModel.users.isEmpty()) {
+          SimpleButtonDecorated(
+            text = stringResource(R.string.about_simplex),
+            icon = painterResource(R.drawable.ic_arrow_back_ios_new),
+            textDecoration = TextDecoration.None,
+            fontWeight = FontWeight.Medium
+          ) { chatModel.onboardingStage.value = OnboardingStage.Step1_SimpleXInfo }
+        }
+        Spacer(Modifier.fillMaxWidth().weight(1f))
+        val enabled = displayName.value.isNotEmpty() && isValidDisplayName(displayName.value)
+        val createModifier: Modifier
+        val createColor: Color
+        if (enabled) {
+          createModifier = Modifier.clickable { createProfile(chatModel, displayName.value, fullName.value, close) }.padding(8.dp)
+          createColor = MaterialTheme.colors.primary
+        } else {
+          createModifier = Modifier.padding(8.dp)
+          createColor = MaterialTheme.colors.secondary
+        }
+        Surface(shape = RoundedCornerShape(20.dp)) {
+          Row(verticalAlignment = Alignment.CenterVertically, modifier = createModifier) {
+            Text(stringResource(R.string.create_profile_button), style = MaterialTheme.typography.caption, color = createColor, fontWeight = FontWeight.Medium)
+            Icon(painterResource(R.drawable.ic_arrow_forward_ios), stringResource(R.string.create_profile_button), tint = createColor)
+          }
         }
       }
-      ProfileNameField(displayName, "", ::isValidDisplayName, focusRequester)
-      Spacer(Modifier.height(DEFAULT_PADDING))
-      Text(
-        stringResource(R.string.full_name_optional__prompt),
-        fontSize = 16.sp,
-        modifier = Modifier.padding(bottom = DEFAULT_PADDING_HALF)
-      )
-      ProfileNameField(fullName, "", ::isValidDisplayName)
-    }
-    Spacer(Modifier.fillMaxHeight().weight(1f))
-    Row {
-      if (chatModel.users.isEmpty()) {
-        SimpleButtonDecorated(
-          text = stringResource(R.string.about_simplex),
-          icon = painterResource(R.drawable.ic_arrow_back_ios_new),
-          textDecoration = TextDecoration.None,
-          fontWeight = FontWeight.Medium
-        ) { chatModel.onboardingStage.value = OnboardingStage.Step1_SimpleXInfo }
-      }
-      Spacer(Modifier.fillMaxWidth().weight(1f))
-      val enabled = displayName.value.isNotEmpty() && isValidDisplayName(displayName.value)
-      val createModifier: Modifier
-      val createColor: Color
-      if (enabled) {
-        createModifier = Modifier.clickable { createProfile(chatModel, displayName.value, fullName.value, close) }.padding(8.dp)
-        createColor = MaterialTheme.colors.primary
-      } else {
-        createModifier = Modifier.padding(8.dp)
-        createColor = MaterialTheme.colors.secondary
-      }
-      Surface(shape = RoundedCornerShape(20.dp), color = Color.Transparent) {
-        Row(verticalAlignment = Alignment.CenterVertically, modifier = createModifier) {
-          Text(stringResource(R.string.create_profile_button), style = MaterialTheme.typography.caption, color = createColor, fontWeight = FontWeight.Medium)
-          Icon(painterResource(R.drawable.ic_arrow_forward_ios), stringResource(R.string.create_profile_button), tint = createColor)
-        }
-      }
-    }
 
-    LaunchedEffect(Unit) {
-      delay(300)
-      focusRequester.requestFocus()
+      LaunchedEffect(Unit) {
+        delay(300)
+        focusRequester.requestFocus()
+      }
     }
   }
 }
@@ -125,17 +127,13 @@ fun createProfile(chatModel: ChatModel, displayName: String, fullName: String, c
     chatModel.currentUser.value = user
     if (chatModel.users.isEmpty()) {
       chatModel.controller.startChat(user)
-      chatModel.controller.appPrefs.onboardingStage.set(OnboardingStage.Step3_CreateSimpleXAddress)
-      chatModel.onboardingStage.value = OnboardingStage.Step3_CreateSimpleXAddress
+      chatModel.onboardingStage.value = OnboardingStage.Step3_SetNotificationsMode
+      SimplexApp.context.chatModel.controller.ntfManager.createNtfChannelsMaybeShowAlert()
     } else {
       val users = chatModel.controller.listUsers()
       chatModel.users.clear()
       chatModel.users.addAll(users)
       chatModel.controller.getUserChatData()
-      // the next two lines are only needed for failure case when because of the database error the app gets stuck on on-boarding screen,
-      // this will get it unstuck.
-      chatModel.controller.appPrefs.onboardingStage.set(OnboardingStage.OnboardingComplete)
-      chatModel.onboardingStage.value = OnboardingStage.OnboardingComplete
       close()
     }
   }

apps/android/app/src/main/java/chat/simplex/app/views/call/CallManager.kt

@@ -26,6 +26,7 @@ class CallManager(val chatModel: ChatModel) {
   }
 
   fun acceptIncomingCall(invitation: RcvCallInvitation) {
+    ModalManager.shared.closeModals()
     val call = chatModel.activeCall.value
     if (call == null) {
       justAcceptIncomingCall(invitation = invitation)

apps/android/app/src/main/java/chat/simplex/app/views/call/CallView.kt

@@ -185,12 +185,10 @@ fun ActiveCallView(chatModel: ChatModel) {
     activity.volumeControlStream = AudioManager.STREAM_VOICE_CALL
     // Lock orientation to portrait in order to have good experience with calls
     activity.requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_PORTRAIT
-    chatModel.activeCallViewIsVisible.value = true
     onDispose {
       activity.volumeControlStream = prevVolumeControlStream
       // Unlock orientation
       activity.requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED
-      chatModel.activeCallViewIsVisible.value = false
     }
   }
 }

apps/android/app/src/main/java/chat/simplex/app/views/call/IncomingCallActivity.kt

@@ -97,9 +97,8 @@ fun IncomingCallActivityView(m: ChatModel) {
   SimpleXTheme {
     Surface(
       Modifier
-        .fillMaxSize(),
-      color = MaterialTheme.colors.background
-    ) {
+        .themedBackground()
+        .fillMaxSize()) {
       if (showCallView) {
         Box {
           ActiveCallView(m)
@@ -227,9 +226,8 @@ fun PreviewIncomingCallLockScreenAlert() {
   SimpleXTheme(true) {
     Surface(
       Modifier
-        .fillMaxSize(),
-      color = MaterialTheme.colors.background
-    ) {
+        .themedBackground()
+        .fillMaxSize()) {
       IncomingCallLockScreenAlertLayout(
         invitation = RcvCallInvitation(
           user = User.sampleData,

apps/android/app/src/main/java/chat/simplex/app/views/call/IncomingCallAlertView.kt

@@ -50,13 +50,13 @@ fun IncomingCallAlertLayout(
   ignoreCall: () -> Unit,
   acceptCall: () -> Unit
 ) {
-  val color = if (isInDarkTheme()) MaterialTheme.colors.surface else IncomingCallLight
+  val color = if (isInDarkTheme()) IncomingCallDark else IncomingCallLight
   Column(Modifier.fillMaxWidth().background(color).padding(top = DEFAULT_PADDING, bottom = DEFAULT_PADDING, start = DEFAULT_PADDING, end = 8.dp)) {
     IncomingCallInfo(invitation, chatModel)
     Spacer(Modifier.height(8.dp))
     Row(Modifier.fillMaxWidth(), verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.SpaceBetween) {
       Row(Modifier.fillMaxWidth().weight(1f), verticalAlignment = Alignment.CenterVertically) {
-        ProfilePreview(profileOf = invitation.contact, size = 64.dp)
+        ProfilePreview(profileOf = invitation.contact, size = 64.dp, color = Color.White)
       }
       Row(verticalAlignment = Alignment.CenterVertically) {
         CallButton(stringResource(R.string.reject), painterResource(R.drawable.ic_call_end_filled), Color.Red, rejectCall)
@@ -78,7 +78,7 @@ fun IncomingCallInfo(invitation: RcvCallInvitation, chatModel: ChatModel) {
     if (invitation.callType.media == CallMediaType.Video) CallIcon(painterResource(R.drawable.ic_videocam_filled), stringResource(R.string.icon_descr_video_call))
     else CallIcon(painterResource(R.drawable.ic_call_filled), stringResource(R.string.icon_descr_audio_call))
     Spacer(Modifier.width(4.dp))
-    Text(invitation.callTypeText, color = MaterialTheme.colors.onBackground)
+    Text(invitation.callTypeText)
   }
 }
 

apps/android/app/src/main/java/chat/simplex/app/views/chat/ChatInfoView.kt

@@ -5,11 +5,8 @@ import InfoRowEllipsis
 import SectionBottomSpacer
 import SectionDividerSpaced
 import SectionItemView
-import SectionItemViewWithIcon
 import SectionSpacer
-import SectionTextFooter
 import SectionView
-import TextIconSpaced
 import android.widget.Toast
 import androidx.activity.compose.BackHandler
 import androidx.compose.foundation.*
@@ -21,7 +18,8 @@ import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.platform.*
+import androidx.compose.ui.platform.ClipboardManager
+import androidx.compose.ui.platform.LocalClipboardManager
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.AnnotatedString
@@ -36,7 +34,6 @@ import chat.simplex.app.SimplexApp
 import chat.simplex.app.model.*
 import chat.simplex.app.ui.theme.*
 import chat.simplex.app.views.helpers.*
-import chat.simplex.app.views.newchat.QRCode
 import chat.simplex.app.views.usersettings.*
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.*
@@ -198,15 +195,6 @@ fun ChatInfoLayout(
     }
 
     SectionDividerSpaced()
-    if (contact.contactLink != null) {
-      val context = LocalContext.current
-      SectionView(stringResource(R.string.address_section_title).uppercase()) {
-        QRCode(contact.contactLink, Modifier.padding(horizontal = DEFAULT_PADDING, vertical = DEFAULT_PADDING_HALF).aspectRatio(1f))
-        ShareAddressButton { shareText(context, contact.contactLink) }
-        SectionTextFooter(stringResource(R.string.you_can_share_this_address_with_your_contacts).format(contact.displayName))
-      }
-      SectionDividerSpaced()
-    }
 
     SectionView(title = stringResource(R.string.conn_stats_section_title_servers)) {
       SwitchAddressButton(switchContactAddress)
@@ -428,17 +416,6 @@ private fun DeleteContactButton(onClick: () -> Unit) {
   )
 }
 
-@Composable
-fun ShareAddressButton(onClick: () -> Unit) {
-  SettingsActionItem(
-    painterResource(R.drawable.ic_share_filled),
-    stringResource(R.string.share_address),
-    onClick,
-    iconColor = MaterialTheme.colors.primary,
-    textColor = MaterialTheme.colors.primary,
-  )
-}
-
 private fun setContactAlias(contactApiId: Long, localAlias: String, chatModel: ChatModel) = withApi {
   chatModel.controller.apiSetContactAlias(contactApiId, localAlias)?.let {
     chatModel.updateContact(it)

apps/android/app/src/main/java/chat/simplex/app/views/chat/ChatItemInfoView.kt

@@ -1,186 +0,0 @@
-package chat.simplex.app.views.chat
-
-import InfoRow
-import SectionBottomSpacer
-import SectionDividerSpaced
-import SectionView
-import androidx.compose.foundation.*
-import androidx.compose.foundation.layout.*
-import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.material.MaterialTheme
-import androidx.compose.material.Text
-import androidx.compose.runtime.*
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.draw.clip
-import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.platform.LocalUriHandler
-import androidx.compose.ui.res.painterResource
-import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.text.font.FontStyle
-import androidx.compose.ui.unit.dp
-import androidx.compose.ui.unit.sp
-import chat.simplex.app.R
-import chat.simplex.app.model.*
-import chat.simplex.app.ui.theme.CurrentColors
-import chat.simplex.app.ui.theme.DEFAULT_PADDING
-import chat.simplex.app.views.chat.item.ItemAction
-import chat.simplex.app.views.chat.item.MarkdownText
-import chat.simplex.app.views.helpers.*
-
-@Composable
-fun ChatItemInfoView(ci: ChatItem, ciInfo: ChatItemInfo, devTools: Boolean) {
-  val sent = ci.chatDir.sent
-  val appColors = CurrentColors.collectAsState().value.appColors
-  val itemColor = if (sent) appColors.sentMessage else appColors.receivedMessage
-  val context = LocalContext.current
-  val uriHandler = LocalUriHandler.current
-
-  @Composable
-  fun ItemVersionView(ciVersion: ChatItemVersion, current: Boolean) {
-    val showMenu = remember { mutableStateOf(false) }
-    val text = ciVersion.msgContent.text
-
-    @Composable
-    fun VersionText() {
-      if (text != "") {
-        MarkdownText(
-          text, if (text.isEmpty()) emptyList() else ciVersion.formattedText,
-          linkMode = SimplexLinkMode.DESCRIPTION, uriHandler = uriHandler,
-          onLinkLongClick = { showMenu.value = true }
-        )
-      } else {
-        Text(
-          generalGetString(R.string.item_info_no_text),
-          style = MaterialTheme.typography.body1.copy(color = MaterialTheme.colors.secondary, lineHeight = 22.sp, fontStyle = FontStyle.Italic)
-        )
-      }
-    }
-
-    Column {
-      Box(
-        Modifier.clip(RoundedCornerShape(18.dp)).background(itemColor).padding(bottom = 3.dp)
-          .combinedClickable(onLongClick = { showMenu.value = true }, onClick = {})
-      ) {
-        Box(Modifier.padding(vertical = 6.dp, horizontal = 12.dp)) {
-          VersionText()
-        }
-      }
-      Row(Modifier.padding(start = 12.dp, top = 3.dp, bottom = 16.dp)) {
-        Text(
-          localTimestamp(ciVersion.itemVersionTs),
-          fontSize = 12.sp,
-          color = MaterialTheme.colors.secondary,
-          modifier = Modifier.padding(end = 6.dp)
-        )
-        if (current && ci.meta.itemDeleted == null) {
-          Text(
-            stringResource(R.string.item_info_current),
-            fontSize = 12.sp,
-            color = MaterialTheme.colors.secondary
-          )
-        }
-      }
-      if (text != "") {
-        DefaultDropdownMenu(showMenu) {
-          ItemAction(stringResource(R.string.share_verb), painterResource(R.drawable.ic_share), onClick = {
-            shareText(context, text)
-            showMenu.value = false
-          })
-          ItemAction(stringResource(R.string.copy_verb), painterResource(R.drawable.ic_content_copy), onClick = {
-            copyText(context, text)
-            showMenu.value = false
-          })
-        }
-      }
-    }
-  }
-
-  Column(Modifier.fillMaxWidth().verticalScroll(rememberScrollState())) {
-    AppBarTitle(stringResource(if (sent) R.string.sent_message else R.string.received_message))
-    SectionView {
-      InfoRow(stringResource(R.string.info_row_sent_at), localTimestamp(ci.meta.itemTs))
-      if (!sent) {
-        InfoRow(stringResource(R.string.info_row_received_at), localTimestamp(ci.meta.createdAt))
-      }
-      when (val itemDeleted = ci.meta.itemDeleted) {
-        is CIDeleted.Deleted ->
-          if (itemDeleted.deletedTs != null) {
-            InfoRow(stringResource(R.string.info_row_deleted_at), localTimestamp(itemDeleted.deletedTs))
-          }
-        is CIDeleted.Moderated ->
-          if (itemDeleted.deletedTs != null) {
-            InfoRow(stringResource(R.string.info_row_moderated_at), localTimestamp(itemDeleted.deletedTs))
-          }
-        else -> {}
-      }
-      val deleteAt = ci.meta.itemTimed?.deleteAt
-      if (deleteAt != null) {
-        InfoRow(stringResource(R.string.info_row_disappears_at), localTimestamp(deleteAt))
-      }
-      if (devTools) {
-        InfoRow(stringResource(R.string.info_row_database_id), ci.meta.itemId.toString())
-        InfoRow(stringResource(R.string.info_row_updated_at), localTimestamp(ci.meta.updatedAt))
-      }
-    }
-    val versions = ciInfo.itemVersions
-    if (versions.isNotEmpty()) {
-      SectionDividerSpaced(maxTopPadding = false, maxBottomPadding = false)
-      SectionView(padding = PaddingValues(horizontal = DEFAULT_PADDING)) {
-        Text(stringResource(R.string.edit_history), style = MaterialTheme.typography.h2, modifier = Modifier.padding(bottom = DEFAULT_PADDING))
-        versions.forEachIndexed { i, ciVersion ->
-          ItemVersionView(ciVersion, current = i == 0)
-        }
-      }
-    }
-    SectionBottomSpacer()
-  }
-}
-
-fun itemInfoShareText(ci: ChatItem, chatItemInfo: ChatItemInfo, devTools: Boolean): String {
-  val meta = ci.meta
-  val sent = ci.chatDir.sent
-  val shareText = mutableListOf<String>(generalGetString(if (sent) R.string.sent_message else R.string.received_message), "")
-
-  shareText.add(String.format(generalGetString(R.string.share_text_sent_at), localTimestamp(meta.itemTs)))
-  if (!ci.chatDir.sent) {
-    shareText.add(String.format(generalGetString(R.string.share_text_received_at), localTimestamp(meta.createdAt)))
-  }
-  when (val itemDeleted = ci.meta.itemDeleted) {
-    is CIDeleted.Deleted ->
-      if (itemDeleted.deletedTs != null) {
-        shareText.add(String.format(generalGetString(R.string.share_text_deleted_at), localTimestamp(itemDeleted.deletedTs)))
-      }
-    is CIDeleted.Moderated ->
-      if (itemDeleted.deletedTs != null) {
-        shareText.add(String.format(generalGetString(R.string.share_text_moderated_at), localTimestamp(itemDeleted.deletedTs)))
-      }
-    else -> {}
-  }
-  val deleteAt = ci.meta.itemTimed?.deleteAt
-  if (deleteAt != null) {
-    shareText.add(String.format(generalGetString(R.string.share_text_disappears_at), localTimestamp(deleteAt)))
-  }
-  if (devTools) {
-    shareText.add(String.format(generalGetString(R.string.share_text_database_id), meta.itemId))
-    shareText.add(String.format(generalGetString(R.string.share_text_updated_at), meta.updatedAt))
-  }
-  val versions = chatItemInfo.itemVersions
-  if (versions.isNotEmpty()) {
-    shareText.add("")
-    shareText.add(generalGetString(R.string.edit_history))
-    versions.forEachIndexed { index, itemVersion ->
-      val ts = localTimestamp(itemVersion.itemVersionTs)
-      shareText.add("")
-      shareText.add(
-        if (index == 0 && ci.meta.itemDeleted == null) {
-          String.format(generalGetString(R.string.current_version_timestamp), ts)
-        } else {
-          localTimestamp(itemVersion.itemVersionTs)
-        }
-      )
-      val t = itemVersion.msgContent.text
-      shareText.add(if (t != "") t else generalGetString(R.string.item_info_no_text))
-    }
-  }
-  return shareText.joinToString(separator = "\n")
-}

apps/android/app/src/main/java/chat/simplex/app/views/chat/ChatView.kt

@@ -101,7 +101,6 @@ fun ChatView(chatId: String, chatModel: ChatModel, onComposed: () -> Unit) {
     }
   }
   val view = LocalView.current
-  val context = LocalContext.current
   if (activeChat.value == null || user == null) {
     chatModel.chatId.value = null
   } else {
@@ -259,32 +258,6 @@ fun ChatView(chatId: String, chatModel: ChatModel, onComposed: () -> Unit) {
           chatModel.controller.allowFeatureToContact(contact, feature, param)
         }
       },
-      setReaction = { cInfo, cItem, add, reaction ->
-        withApi {
-          val updatedCI = chatModel.controller.apiChatItemReaction(
-            type = cInfo.chatType,
-            id = cInfo.apiId,
-            itemId = cItem.id,
-            add = add,
-            reaction = reaction
-          )
-          if (updatedCI != null) {
-            chatModel.updateChatItem(cInfo, updatedCI)
-          }
-        }
-      },
-      showItemDetails = { cInfo, cItem ->
-        withApi {
-          val ciInfo = chatModel.controller.apiGetChatItemInfo(cInfo.chatType, cInfo.apiId, cItem.id)
-          if (ciInfo != null) {
-            ModalManager.shared.showModal(endButtons = { ShareButton {
-              shareText(context, itemInfoShareText(cItem, ciInfo, chatModel.controller.appPrefs.developerTools.get()))
-            } }) {
-              ChatItemInfoView(cItem, ciInfo, devTools = chatModel.controller.appPrefs.developerTools.get())
-            }
-          }
-        }
-      },
       addMembers = { groupInfo ->
         hideKeyboard(view)
         withApi {
@@ -343,8 +316,6 @@ fun ChatLayout(
   startCall: (CallMediaType) -> Unit,
   acceptCall: (Contact) -> Unit,
   acceptFeature: (Contact, ChatFeature, Int?) -> Unit,
-  setReaction: (ChatInfo, ChatItem, Boolean, MsgReaction) -> Unit,
-  showItemDetails: (ChatInfo, ChatItem) -> Unit,
   addMembers: (GroupInfo) -> Unit,
   markRead: (CC.ItemRange, unreadCountAfter: Int?) -> Unit,
   changeNtfsState: (Boolean, currentValue: MutableState<Boolean>) -> Unit,
@@ -355,6 +326,7 @@ fun ChatLayout(
   Box(
     Modifier
       .fillMaxWidth()
+      .themedBackground()
   ) {
     ProvideWindowInsets(windowInsetsAnimationsEnabled = true) {
       ModalBottomSheetLayout(
@@ -380,14 +352,11 @@ fun ChatLayout(
           modifier = Modifier.navigationBarsWithImePadding(),
           floatingActionButton = { floatingButton.value() },
         ) { contentPadding ->
-          BoxWithConstraints(Modifier
-            .fillMaxHeight()
-            .padding(contentPadding)
-          ) {
+          BoxWithConstraints(Modifier.fillMaxHeight().padding(contentPadding)) {
             ChatItemsList(
               chat, unreadCount, composeState, chatItems, searchValue,
               useLinkPreviews, linkMode, chatModelIncognito, showMemberInfo, loadPrevMessages, deleteMessage,
-              receiveFile, cancelFile, joinGroup, acceptCall, acceptFeature, setReaction, showItemDetails, markRead, setFloatingButton, onComposed,
+              receiveFile, cancelFile, joinGroup, acceptCall, acceptFeature, markRead, setFloatingButton, onComposed,
             )
           }
         }
@@ -560,8 +529,6 @@ fun BoxWithConstraintsScope.ChatItemsList(
   joinGroup: (Long) -> Unit,
   acceptCall: (Contact) -> Unit,
   acceptFeature: (Contact, ChatFeature, Int?) -> Unit,
-  setReaction: (ChatInfo, ChatItem, Boolean, MsgReaction) -> Unit,
-  showItemDetails: (ChatInfo, ChatItem) -> Unit,
   markRead: (CC.ItemRange, unreadCountAfter: Int?) -> Unit,
   setFloatingButton: (@Composable () -> Unit) -> Unit,
   onComposed: () -> Unit,
@@ -649,13 +616,12 @@ fun BoxWithConstraintsScope.ChatItemsList(
             }
           }
         }
-        val voiceWithTransparentBack = cItem.content.msgContent is MsgContent.MCVoice && cItem.content.text.isEmpty() && cItem.quotedItem == null
         if (chat.chatInfo is ChatInfo.Group) {
           if (cItem.chatDir is CIDirection.GroupRcv) {
             val prevItem = if (i < reversedChatItems.lastIndex) reversedChatItems[i + 1] else null
             val member = cItem.chatDir.groupMember
             val showMember = showMemberImage(member, prevItem)
-            Row(Modifier.padding(start = 8.dp, end = if (voiceWithTransparentBack) 12.dp else 66.dp).then(swipeableModifier)) {
+            Row(Modifier.padding(start = 8.dp, end = 66.dp).then(swipeableModifier)) {
               if (showMember) {
                 val contactId = member.memberContactId
                 if (contactId == null) {
@@ -675,22 +641,22 @@ fun BoxWithConstraintsScope.ChatItemsList(
               } else {
                 Spacer(Modifier.size(42.dp))
               }
-              ChatItemView(chat.chatInfo, cItem, composeState, provider, showMember = showMember, useLinkPreviews = useLinkPreviews, linkMode = linkMode, deleteMessage = deleteMessage, receiveFile = receiveFile, cancelFile = cancelFile, joinGroup = {}, acceptCall = acceptCall, acceptFeature = acceptFeature, scrollToItem = scrollToItem, setReaction = setReaction, showItemDetails = showItemDetails)
+              ChatItemView(chat.chatInfo, cItem, composeState, provider, showMember = showMember, useLinkPreviews = useLinkPreviews, linkMode = linkMode, deleteMessage = deleteMessage, receiveFile = receiveFile, cancelFile = cancelFile, joinGroup = {}, acceptCall = acceptCall, acceptFeature = acceptFeature, scrollToItem = scrollToItem)
             }
           } else {
-            Box(Modifier.padding(start = if (voiceWithTransparentBack) 12.dp else 104.dp, end = 12.dp).then(swipeableModifier)) {
-              ChatItemView(chat.chatInfo, cItem, composeState, provider, useLinkPreviews = useLinkPreviews, linkMode = linkMode, deleteMessage = deleteMessage, receiveFile = receiveFile, cancelFile = cancelFile, joinGroup = {}, acceptCall = acceptCall, acceptFeature = acceptFeature, scrollToItem = scrollToItem, setReaction = setReaction, showItemDetails = showItemDetails)
+            Box(Modifier.padding(start = 104.dp, end = 12.dp).then(swipeableModifier)) {
+              ChatItemView(chat.chatInfo, cItem, composeState, provider, useLinkPreviews = useLinkPreviews, linkMode = linkMode, deleteMessage = deleteMessage, receiveFile = receiveFile, cancelFile = cancelFile, joinGroup = {}, acceptCall = acceptCall, acceptFeature = acceptFeature, scrollToItem = scrollToItem)
             }
           }
         } else { // direct message
           val sent = cItem.chatDir.sent
           Box(
             Modifier.padding(
-              start = if (sent && !voiceWithTransparentBack) 76.dp else 12.dp,
-              end = if (sent || voiceWithTransparentBack) 12.dp else 76.dp,
+              start = if (sent) 76.dp else 12.dp,
+              end = if (sent) 12.dp else 76.dp,
             ).then(swipeableModifier)
           ) {
-            ChatItemView(chat.chatInfo, cItem, composeState, provider, useLinkPreviews = useLinkPreviews, linkMode = linkMode, deleteMessage = deleteMessage, receiveFile = receiveFile, cancelFile = cancelFile, joinGroup = joinGroup, acceptCall = acceptCall, acceptFeature = acceptFeature, scrollToItem = scrollToItem, setReaction = setReaction, showItemDetails = showItemDetails)
+            ChatItemView(chat.chatInfo, cItem, composeState, provider, useLinkPreviews = useLinkPreviews, linkMode = linkMode, deleteMessage = deleteMessage, receiveFile = receiveFile, cancelFile = cancelFile, joinGroup = joinGroup, acceptCall = acceptCall, acceptFeature = acceptFeature, scrollToItem = scrollToItem)
           }
         }
 
@@ -889,7 +855,6 @@ private fun TopEndFloatingButton(
     FloatingActionButton(
       {}, // no action here
       modifier.size(48.dp),
-      backgroundColor = MaterialTheme.colors.secondaryVariant,
       elevation = FloatingActionButtonDefaults.elevation(0.dp, 0.dp),
       interactionSource = interactionSource,
     ) {
@@ -916,8 +881,7 @@ private fun bottomEndFloatingButton(
       FloatingActionButton(
         onClick = onClickCounter,
         elevation = FloatingActionButtonDefaults.elevation(0.dp, 0.dp, 0.dp, 0.dp),
-        modifier = Modifier.size(48.dp),
-        backgroundColor = MaterialTheme.colors.secondaryVariant,
+        modifier = Modifier.size(48.dp)
       ) {
         Text(
           unreadCountStr(unreadCount),
@@ -932,8 +896,7 @@ private fun bottomEndFloatingButton(
       FloatingActionButton(
         onClick = onClickArrowDown,
         elevation = FloatingActionButtonDefaults.elevation(0.dp, 0.dp, 0.dp, 0.dp),
-        modifier = Modifier.size(48.dp),
-        backgroundColor = MaterialTheme.colors.secondaryVariant,
+        modifier = Modifier.size(48.dp)
       ) {
         Icon(
           painter = painterResource(R.drawable.ic_keyboard_arrow_down),
@@ -1113,8 +1076,6 @@ fun PreviewChatLayout() {
       startCall = {},
       acceptCall = { _ -> },
       acceptFeature = { _, _, _ -> },
-      setReaction = { _, _, _, _ -> },
-      showItemDetails = { _, _ -> },
       addMembers = { _ -> },
       markRead = { _, _ -> },
       changeNtfsState = { _, _ -> },
@@ -1175,8 +1136,6 @@ fun PreviewGroupChatLayout() {
       startCall = {},
       acceptCall = { _ -> },
       acceptFeature = { _, _, _ -> },
-      setReaction = { _, _, _, _ -> },
-      showItemDetails = { _, _ -> },
       addMembers = { _ -> },
       markRead = { _, _ -> },
       changeNtfsState = { _, _ -> },

apps/android/app/src/main/java/chat/simplex/app/views/chat/ComposeView.kt

@@ -118,7 +118,7 @@ data class ComposeState(
 
   val attachmentDisabled: Boolean
     get() {
-      if (editing || liveMessage != null || inProgress) return true
+      if (editing || liveMessage != null) return true
       return when (preview) {
         ComposePreview.NoPreview -> false
         is ComposePreview.CLinkPreview -> false
@@ -366,15 +366,14 @@ fun ComposeView(
     chatModel.filesToDelete.clear()
   }
 
-  suspend fun send(cInfo: ChatInfo, mc: MsgContent, quoted: Long?, file: String? = null, live: Boolean = false, ttl: Int?): ChatItem? {
+  suspend fun send(cInfo: ChatInfo, mc: MsgContent, quoted: Long?, file: String? = null, live: Boolean = false): ChatItem? {
     val aChatItem = chatModel.controller.apiSendMessage(
       type = cInfo.chatType,
       id = cInfo.apiId,
       file = file,
       quotedItemId = quoted,
       mc = mc,
-      live = live,
-      ttl = ttl
+      live = live
     )
     if (aChatItem != null) chatModel.addChatItem(cInfo, aChatItem.chatItem)
     return aChatItem?.chatItem
@@ -382,7 +381,7 @@ fun ComposeView(
 
 
 
-  suspend fun sendMessageAsync(text: String?, live: Boolean, ttl: Int?): ChatItem? {
+  suspend fun sendMessageAsync(text: String?, live: Boolean): ChatItem? {
     val cInfo = chat.chatInfo
     val cs = composeState.value
     var sent: ChatItem?
@@ -496,8 +495,7 @@ fun ComposeView(
       msgs.forEachIndexed { index, content ->
         if (index > 0) delay(100)
         sent = send(cInfo, content, if (index == 0) quotedItemId else null, files.getOrNull(index),
-          live = if (content !is MsgContent.MCVoice && index == msgs.lastIndex) live else false,
-          ttl = ttl
+          if (content !is MsgContent.MCVoice && index == msgs.lastIndex) live else false
         )
       }
       if (sent == null &&
@@ -505,16 +503,16 @@ fun ComposeView(
             cs.preview is ComposePreview.FilePreview ||
             cs.preview is ComposePreview.VoicePreview)
         ) {
-        sent = send(cInfo, MsgContent.MCText(msgText), quotedItemId, null, live, ttl)
+        sent = send(cInfo, MsgContent.MCText(msgText), quotedItemId, null, live)
       }
     }
     clearState(live)
     return sent
   }
 
-  fun sendMessage(ttl: Int?) {
+  fun sendMessage() {
     withBGApi {
-      sendMessageAsync(null, false, ttl)
+      sendMessageAsync(null, false)
     }
   }
 
@@ -590,7 +588,7 @@ fun ComposeView(
     val cs = composeState.value
     val typedMsg = cs.message
     if ((cs.sendEnabled() || cs.contextItem is ComposeContextItem.QuotedItem) && (cs.liveMessage == null || !cs.liveMessage?.sent)) {
-      val ci = sendMessageAsync(typedMsg, live = true, ttl = null)
+      val ci = sendMessageAsync(typedMsg, live = true)
       if (ci != null) {
         composeState.value = composeState.value.copy(liveMessage = LiveMessage(ci, typedMsg = typedMsg, sentMsg = typedMsg, sent = true))
       }
@@ -611,7 +609,7 @@ fun ComposeView(
     if (liveMessage != null) {
       val sentMsg = liveMessageToSend(liveMessage, typedMsg)
       if (sentMsg != null) {
-        val ci = sendMessageAsync(sentMsg, live = true, ttl = null)
+        val ci = sendMessageAsync(sentMsg, live = true)
         if (ci != null) {
           composeState.value = composeState.value.copy(liveMessage = LiveMessage(ci, typedMsg = typedMsg, sentMsg = sentMsg, sent = true))
         }
@@ -625,27 +623,23 @@ fun ComposeView(
   fun previewView() {
     when (val preview = composeState.value.preview) {
       ComposePreview.NoPreview -> {}
-      is ComposePreview.CLinkPreview -> ComposeLinkView(
-        preview.linkPreview,
-        ::cancelLinkPreview,
-        cancelEnabled = !composeState.value.inProgress
-      )
+      is ComposePreview.CLinkPreview -> ComposeLinkView(preview.linkPreview, ::cancelLinkPreview)
       is ComposePreview.MediaPreview -> ComposeImageView(
         preview,
         ::cancelImages,
-        cancelEnabled = !composeState.value.editing && !composeState.value.inProgress
+        cancelEnabled = !composeState.value.editing
       )
       is ComposePreview.VoicePreview -> ComposeVoiceView(
         preview.voice,
         preview.durationMs,
         preview.finished,
-        cancelEnabled = !composeState.value.editing && !composeState.value.inProgress,
+        cancelEnabled = !composeState.value.editing,
         ::cancelVoice
       )
       is ComposePreview.FilePreview -> ComposeFileView(
         preview.fileName,
         ::cancelFile,
-        cancelEnabled = !composeState.value.editing && !composeState.value.inProgress
+        cancelEnabled = !composeState.value.editing
       )
     }
   }
@@ -663,14 +657,6 @@ fun ComposeView(
     }
   }
 
-  // In case a user sent something, state is in progress, the user rotates a screen to different orientation.
-  // Without clearing the state the user will be unable to send anything until re-enters ChatView
-  LaunchedEffect(Unit) {
-    if (composeState.value.inProgress) {
-      clearState()
-    }
-  }
-
   LaunchedEffect(chatModel.sharedContent.value) {
     // Important. If it's null, don't do anything, chat is not closed yet but will be after a moment
     if (chatModel.chatId.value == null) return@LaunchedEffect
@@ -688,22 +674,11 @@ fun ComposeView(
   val userIsObserver = rememberUpdatedState(chat.userIsObserver)
 
   Column {
-    if (composeState.value.preview !is ComposePreview.VoicePreview || composeState.value.editing) {
-      contextItemView()
-      when {
-        composeState.value.editing && composeState.value.preview is ComposePreview.VoicePreview -> {}
-        composeState.value.editing && composeState.value.preview is ComposePreview.FilePreview -> {}
-        else -> previewView()
-      }
-    } else {
-      Box {
-        Box(Modifier.align(Alignment.TopStart).padding(bottom = 69.dp)) {
-          contextItemView()
-        }
-        Box(Modifier.align(Alignment.BottomStart)) {
-          previewView()
-        }
-      }
+    contextItemView()
+    when {
+      composeState.value.editing && composeState.value.preview is ComposePreview.VoicePreview -> {}
+      composeState.value.editing && composeState.value.preview is ComposePreview.FilePreview -> {}
+      else -> previewView()
     }
     Row(
       modifier = Modifier.padding(end = 8.dp),
@@ -765,12 +740,10 @@ fun ComposeView(
           if (orientation == activity.resources.configuration.orientation) {
             val cs = composeState.value
             if (cs.liveMessage != null && (cs.message.isNotEmpty() || cs.liveMessage.sent)) {
-              sendMessage(null)
+              sendMessage()
               resetLinkPreview()
               clearCurrentDraft()
               deleteUnusedFiles()
-            } else if (composeState.value.inProgress) {
-              clearCurrentDraft()
             } else if (!composeState.value.empty) {
               if (cs.preview is ComposePreview.VoicePreview && !cs.preview.finished) {
                 composeState.value = cs.copy(preview = cs.preview.copy(finished = true))
@@ -786,9 +759,6 @@ fun ComposeView(
         }
       }
 
-      // TODO in 5.2 - allow if ttl is not configured
-      // val timedMessageAllowed = remember(chat.chatInfo) { chat.chatInfo.featureEnabled(ChatFeature.TimedMessages) }
-      val timedMessageAllowed = remember(chat.chatInfo) { chat.chatInfo.featureEnabled(ChatFeature.TimedMessages) && chat.chatInfo.timedMessagesTTL != null }
       SendMsgView(
         composeState,
         showVoiceRecordIcon = true,
@@ -800,10 +770,8 @@ fun ComposeView(
         allowVoiceToContact = ::allowVoiceToContact,
         userIsObserver = userIsObserver.value,
         userCanSend = userCanSend.value,
-        timedMessageAllowed = timedMessageAllowed,
-        customDisappearingMessageTimePref = chatModel.controller.appPrefs.customDisappearingMessageTime,
-        sendMessage = { ttl ->
-          sendMessage(ttl)
+        sendMessage = {
+          sendMessage()
           resetLinkPreview()
         },
         sendLiveMessage = ::sendLiveMessage,

apps/android/app/src/main/java/chat/simplex/app/views/chat/ComposeVoiceView.kt

@@ -6,10 +6,6 @@ import androidx.compose.runtime.*
 import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.draw.drawBehind
-import androidx.compose.ui.geometry.Offset
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.platform.LocalDensity
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
@@ -29,135 +25,99 @@ fun ComposeVoiceView(
   cancelEnabled: Boolean,
   cancelVoice: () -> Unit
 ) {
-  val progress = rememberSaveable { mutableStateOf(0) }
-  val duration = rememberSaveable(recordedDurationMs) { mutableStateOf(recordedDurationMs) }
-  val sentColor = CurrentColors.collectAsState().value.appColors.sentMessage
-  Box {
-    Box(
+  BoxWithConstraints(Modifier
+    .fillMaxWidth()
+  ) {
+    val audioPlaying = rememberSaveable { mutableStateOf(false) }
+    val progress = rememberSaveable { mutableStateOf(0) }
+    val duration = rememberSaveable(recordedDurationMs) { mutableStateOf(recordedDurationMs) }
+    val progressBarWidth = remember { Animatable(0f) }
+    LaunchedEffect(recordedDurationMs, finishedRecording) {
+      snapshotFlow { progress.value }
+        .distinctUntilChanged()
+        .collect {
+          val startTime = when {
+            finishedRecording -> progress.value
+            else -> recordedDurationMs
+          }
+          val endTime = when {
+            finishedRecording -> duration.value
+            audioPlaying.value -> recordedDurationMs
+            else -> MAX_VOICE_MILLIS_FOR_SENDING
+          }
+          val to = ((startTime.toDouble() / endTime) * maxWidth.value).dp
+          progressBarWidth.animateTo(to.value, audioProgressBarAnimationSpec())
+        }
+    }
+    Spacer(
       Modifier
-        .fillMaxWidth().padding(top = 22.dp)
+        .requiredWidth(progressBarWidth.value.dp)
+        .padding(top = 58.dp)
+        .height(3.dp)
+        .background(MaterialTheme.colors.primary)
+    )
+    val sentColor = CurrentColors.collectAsState().value.appColors.sentMessage
+    Row(
+      Modifier
+        .height(60.dp)
+        .fillMaxWidth()
+        .padding(top = 8.dp)
+        .background(sentColor),
+      verticalAlignment = Alignment.CenterVertically
     ) {
-      val audioPlaying = rememberSaveable { mutableStateOf(false) }
-      Row(
-        Modifier
-          .height(57.dp)
-          .fillMaxWidth()
-          .background(sentColor)
-          .padding(top = 3.dp),
-        verticalAlignment = Alignment.CenterVertically
-      ) {
+      IconButton(
+        onClick = {
+          if (!audioPlaying.value) {
+            AudioPlayer.play(filePath, audioPlaying, progress, duration, false)
+          } else {
+            AudioPlayer.pause(audioPlaying, progress)
+          }
+        },
+        enabled = finishedRecording) {
+        Icon(
+          if (audioPlaying.value) painterResource(R.drawable.ic_pause_filled) else painterResource(R.drawable.ic_play_arrow_filled),
+          stringResource(R.string.icon_descr_file),
+          Modifier
+            .padding(start = 4.dp, end = 2.dp)
+            .size(36.dp),
+          tint = if (finishedRecording) MaterialTheme.colors.primary else MaterialTheme.colors.secondary
+        )
+      }
+      val numberInText = remember(recordedDurationMs, progress.value) {
+        derivedStateOf {
+          when {
+            finishedRecording && progress.value == 0 && !audioPlaying.value -> duration.value / 1000
+            finishedRecording -> progress.value / 1000
+            else -> recordedDurationMs / 1000
+          }
+        }
+      }
+      Text(
+        durationText(numberInText.value),
+        fontSize = 18.sp,
+        color = MaterialTheme.colors.secondary,
+      )
+      Spacer(Modifier.weight(1f))
+      if (cancelEnabled) {
         IconButton(
           onClick = {
-            if (!audioPlaying.value) {
-              AudioPlayer.play(filePath, audioPlaying, progress, duration, false)
-            } else {
-              AudioPlayer.pause(audioPlaying, progress)
-            }
+            AudioPlayer.stop(filePath)
+            cancelVoice()
           },
-          enabled = finishedRecording
+          modifier = Modifier.padding(0.dp)
         ) {
           Icon(
-            if (audioPlaying.value) painterResource(R.drawable.ic_pause_filled) else painterResource(R.drawable.ic_play_arrow_filled),
-            stringResource(R.string.icon_descr_file),
-            Modifier
-              .padding(start = 4.dp, end = 2.dp)
-              .size(36.dp),
-            tint = if (finishedRecording) MaterialTheme.colors.primary else MaterialTheme.colors.secondary
+            painterResource(R.drawable.ic_close),
+            contentDescription = stringResource(R.string.icon_descr_cancel_file_preview),
+            tint = MaterialTheme.colors.primary,
+            modifier = Modifier.padding(10.dp)
           )
         }
-        val numberInText = remember(recordedDurationMs, progress.value) {
-          derivedStateOf {
-            when {
-              finishedRecording && progress.value == 0 && !audioPlaying.value -> duration.value / 1000
-              finishedRecording -> progress.value / 1000
-              else -> recordedDurationMs / 1000
-            }
-          }
-        }
-        Text(
-          durationText(numberInText.value),
-          fontSize = 18.sp,
-          color = MaterialTheme.colors.secondary,
-        )
-        Spacer(Modifier.weight(1f))
-        if (cancelEnabled) {
-          IconButton(
-            onClick = {
-              AudioPlayer.stop(filePath)
-              cancelVoice()
-            },
-            modifier = Modifier.padding(0.dp)
-          ) {
-            Icon(
-              painterResource(R.drawable.ic_close),
-              contentDescription = stringResource(R.string.icon_descr_cancel_file_preview),
-              tint = MaterialTheme.colors.primary,
-              modifier = Modifier.padding(10.dp)
-            )
-          }
-        }
       }
     }
-
-    if (finishedRecording) {
-      FinishedRecordingSlider(sentColor, progress, duration, filePath)
-    } else {
-      RecordingInProgressSlider(recordedDurationMs)
-    }
   }
 }
 
-@Composable
-fun FinishedRecordingSlider(backgroundColor: Color, progress: MutableState<Int>, duration: MutableState<Int>, filePath: String) {
-  val dp4 = with(LocalDensity.current) { 4.dp.toPx() }
-  val dp10 = with(LocalDensity.current) { 10.dp.toPx() }
-  val primary = MaterialTheme.colors.primary
-  val inactiveTrackColor = MaterialTheme.colors.primary.mixWith(
-    backgroundColor.copy(1f).mixWith(MaterialTheme.colors.background, backgroundColor.alpha),
-    0.24f)
-  Slider(
-    progress.value.toFloat(),
-    onValueChange = { AudioPlayer.seekTo(it.toInt(), progress, filePath) },
-    Modifier
-      .fillMaxWidth()
-      .drawBehind {
-        drawRect(primary, Offset(0f, (size.height - dp4) / 2), size = androidx.compose.ui.geometry.Size(dp10, dp4))
-        drawRect(inactiveTrackColor, Offset(size.width - dp10, (size.height - dp4) / 2), size = androidx.compose.ui.geometry.Size(dp10, dp4))
-      },
-    colors = SliderDefaults.colors(inactiveTrackColor = inactiveTrackColor),
-    valueRange = 0f..duration.value.toFloat()
-  )
-}
-
-@Composable
-fun RecordingInProgressSlider(recordedDurationMs: Int) {
-  val thumbPosition = remember { Animatable(0f) }
-  val recDuration = rememberUpdatedState(recordedDurationMs)
-  LaunchedEffect(Unit) {
-    snapshotFlow { recDuration.value }
-      .distinctUntilChanged()
-      .collect {
-        thumbPosition.animateTo(it.toFloat(), audioProgressBarAnimationSpec())
-      }
-  }
-  val dp4 = with(LocalDensity.current) { 4.dp.toPx() }
-  val dp10 = with(LocalDensity.current) { 10.dp.toPx() }
-  val primary = MaterialTheme.colors.primary
-  val inactiveTrackColor = Color.Transparent
-  Slider(
-    thumbPosition.value,
-    onValueChange = {},
-    Modifier
-      .fillMaxWidth()
-      .drawBehind {
-        drawRect(primary, Offset(0f, (size.height - dp4) / 2), size = androidx.compose.ui.geometry.Size(dp10, dp4))
-      },
-    colors = SliderDefaults.colors(disabledInactiveTrackColor = inactiveTrackColor, disabledActiveTrackColor = primary, thumbColor = Color.Transparent, disabledThumbColor = Color.Transparent),
-    enabled = false,
-    valueRange = 0f..MAX_VOICE_MILLIS_FOR_SENDING.toFloat()
-  )
-}
-
 @Preview
 @Composable
 fun PreviewComposeAudioView() {

apps/android/app/src/main/java/chat/simplex/app/views/chat/ContactPreferences.kt

@@ -95,11 +95,6 @@ private fun ContactPreferencesLayout(
       applyPrefs(featuresAllowed.copy(fullDelete = it))
     }
     SectionDividerSpaced(true, maxBottomPadding = false)
-//    val allowReactions: MutableState<ContactFeatureAllowed> = remember(featuresAllowed) { mutableStateOf(featuresAllowed.reactions) }
-//    FeatureSection(ChatFeature.Reactions, user.fullPreferences.reactions.allow, contact.mergedPreferences.reactions, allowReactions) {
-//      applyPrefs(featuresAllowed.copy(reactions = it))
-//    }
-//    SectionDividerSpaced(true, maxBottomPadding = false)
     val allowVoice: MutableState<ContactFeatureAllowed> = remember(featuresAllowed) { mutableStateOf(featuresAllowed.voice) }
     FeatureSection(ChatFeature.Voice, user.fullPreferences.voice.allow, contact.mergedPreferences.voice, allowVoice) {
       applyPrefs(featuresAllowed.copy(voice = it))
@@ -144,6 +139,7 @@ private fun FeatureSection(
       ContactFeatureAllowed.values(userDefault).map { it to it.text },
       allowFeature,
       icon = null,
+      enabled = remember { mutableStateOf(feature != ChatFeature.Calls) },
       onSelected = onSelected
     )
     InfoRow(
@@ -151,7 +147,7 @@ private fun FeatureSection(
       pref.contactPreference.allow.text
     )
   }
-  SectionTextFooter(feature.enabledDescription(enabled))
+  SectionTextFooter(feature.enabledDescription(enabled) + (if (feature == ChatFeature.Calls) generalGetString(R.string.available_in_v51) else ""))
 }
 
 @Composable
@@ -186,17 +182,9 @@ private fun TimedMessagesFeatureSection(
     )
     if (featuresAllowed.timedMessagesAllowed) {
       val ttl = rememberSaveable(featuresAllowed.timedMessagesTTL) { mutableStateOf(featuresAllowed.timedMessagesTTL) }
-      DropdownCustomTimePickerSettingRow(
-        selection = ttl,
-        propagateExternalSelectionUpdate = true, // for Reset
-        label = generalGetString(R.string.delete_after),
-        dropdownValues = TimedMessagesPreference.ttlValues,
-        customPickerTitle = generalGetString(R.string.delete_after),
-        customPickerConfirmButtonText = generalGetString(R.string.custom_time_picker_select),
-        onSelected = onTTLUpdated
-      )
+      TimedMessagesTTLPicker(ttl, onTTLUpdated)
     } else if (pref.contactPreference.allow == FeatureAllowed.YES || pref.contactPreference.allow == FeatureAllowed.ALWAYS) {
-      InfoRow(generalGetString(R.string.delete_after), timeText(pref.contactPreference.ttl))
+      InfoRow(generalGetString(R.string.delete_after), TimedMessagesPreference.ttlText(pref.contactPreference.ttl))
     }
   }
   SectionTextFooter(ChatFeature.TimedMessages.enabledDescription(enabled))
@@ -214,6 +202,18 @@ private fun ResetSaveButtons(reset: () -> Unit, save: () -> Unit, disabled: Bool
   }
 }
 
+@Composable
+fun TimedMessagesTTLPicker(selection: MutableState<Int?>, onSelected: (Int?) -> Unit) {
+  val ttlValues = TimedMessagesPreference.ttlValues
+  val values = ttlValues + if (ttlValues.contains(selection.value)) listOf() else listOf(selection.value)
+  ExposedDropDownSettingRow(
+    generalGetString(R.string.delete_after),
+    values.map { it to TimedMessagesPreference.ttlText(it) },
+    selection,
+    onSelected = onSelected
+  )
+}
+
 private fun showUnsavedChangesAlert(save: () -> Unit, revert: () -> Unit) {
   AlertManager.shared.showAlertDialogStacked(
     title = generalGetString(R.string.save_preferences_question),

apps/android/app/src/main/java/chat/simplex/app/views/chat/SendMsgView.kt

@@ -18,7 +18,7 @@ import androidx.compose.animation.core.*
 import androidx.compose.foundation.*
 import androidx.compose.foundation.interaction.MutableInteractionSource
 import androidx.compose.foundation.layout.*
-import androidx.compose.foundation.shape.*
+import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.material.*
 import androidx.compose.material.ripple.rememberRipple
 import androidx.compose.runtime.*
@@ -29,14 +29,14 @@ import androidx.compose.ui.draw.clip
 import androidx.compose.ui.graphics.*
 import androidx.compose.ui.graphics.painter.Painter
 import androidx.compose.ui.platform.*
-import androidx.compose.ui.res.*
+import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.semantics.Role
 import androidx.compose.ui.text.TextStyle
-import androidx.compose.ui.text.font.*
+import androidx.compose.ui.text.font.FontStyle
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.*
 import androidx.compose.ui.viewinterop.AndroidView
-import androidx.compose.ui.window.Dialog
 import androidx.core.graphics.drawable.DrawableCompat
 import androidx.core.view.inputmethod.EditorInfoCompat
 import androidx.core.view.inputmethod.InputConnectionCompat
@@ -44,7 +44,8 @@ import androidx.core.widget.*
 import chat.simplex.app.R
 import chat.simplex.app.SimplexApp
 import chat.simplex.app.model.*
-import chat.simplex.app.ui.theme.*
+import chat.simplex.app.ui.theme.CurrentColors
+import chat.simplex.app.ui.theme.SimpleXTheme
 import chat.simplex.app.views.chat.item.ItemAction
 import chat.simplex.app.views.helpers.*
 import com.google.accompanist.permissions.rememberMultiplePermissionsState
@@ -63,25 +64,13 @@ fun SendMsgView(
   userIsObserver: Boolean,
   userCanSend: Boolean,
   allowVoiceToContact: () -> Unit,
-  timedMessageAllowed: Boolean = false,
-  customDisappearingMessageTimePref: SharedPreference<Int>? = null,
-  sendMessage: (Int?) -> Unit,
+  sendMessage: () -> Unit,
   sendLiveMessage: (suspend () -> Unit)? = null,
   updateLiveMessage: (suspend () -> Unit)? = null,
   cancelLiveMessage: (() -> Unit)? = null,
   onMessageChange: (String) -> Unit,
   textStyle: MutableState<TextStyle>
 ) {
-  val showCustomDisappearingMessageDialog = remember { mutableStateOf(false) }
-
-  if (showCustomDisappearingMessageDialog.value) {
-    CustomDisappearingMessageDialog(
-      sendMessage = sendMessage,
-      setShowDialog = { showCustomDisappearingMessageDialog.value = it },
-      customDisappearingMessageTimePref = customDisappearingMessageTimePref
-    )
-  }
-
   Box(Modifier.padding(vertical = 8.dp)) {
     val cs = composeState.value
     val showProgress = cs.inProgress && (cs.preview is ComposePreview.MediaPreview || cs.preview is ComposePreview.FilePreview)
@@ -90,16 +79,15 @@ fun SendMsgView(
     val showDeleteTextButton = rememberSaveable { mutableStateOf(false) }
     NativeKeyboard(composeState, textStyle, showDeleteTextButton, userIsObserver, onMessageChange)
     // Disable clicks on text field
-    if (cs.preview is ComposePreview.VoicePreview || !userCanSend || cs.inProgress) {
-      Box(
-        Modifier
-          .matchParentSize()
-          .clickable(enabled = !userCanSend, indication = null, interactionSource = remember { MutableInteractionSource() }, onClick = {
-            AlertManager.shared.showAlertMsg(
-              title = generalGetString(R.string.observer_cant_send_message_title),
-              text = generalGetString(R.string.observer_cant_send_message_desc)
-            )
-          })
+    if (cs.preview is ComposePreview.VoicePreview || !userCanSend) {
+      Box(Modifier
+        .matchParentSize()
+        .clickable(enabled = !userCanSend, indication = null, interactionSource = remember { MutableInteractionSource() }, onClick = {
+          AlertManager.shared.showAlertMsg(
+            title = generalGetString(R.string.observer_cant_send_message_title),
+            text = generalGetString(R.string.observer_cant_send_message_desc)
+          )
+        })
       )
     }
     if (showDeleteTextButton.value) {
@@ -136,11 +124,10 @@ fun SendMsgView(
               else ->
                 RecordVoiceView(recState, stopRecOnNextClick)
             }
-            if (sendLiveMessage != null
-              && updateLiveMessage != null
-              && (cs.preview !is ComposePreview.VoicePreview || !stopRecOnNextClick.value)
-              && cs.contextItem is ComposeContextItem.NoContextItem
-            ) {
+            if (sendLiveMessage != null 
+                && updateLiveMessage != null
+                && (cs.preview !is ComposePreview.VoicePreview || !stopRecOnNextClick.value)
+                && cs.contextItem is ComposeContextItem.NoContextItem) {
               Spacer(Modifier.width(10.dp))
               StartLiveMessageButton(userCanSend) {
                 if (composeState.value.preview is ComposePreview.NoPreview) {
@@ -159,53 +146,27 @@ fun SendMsgView(
           val cs = composeState.value
           val icon = if (cs.editing || cs.liveMessage != null) painterResource(R.drawable.ic_check_filled) else painterResource(R.drawable.ic_arrow_upward)
           val disabled = !cs.sendEnabled() ||
-              (!allowedVoiceByPrefs && cs.preview is ComposePreview.VoicePreview) ||
-              cs.endLiveDisabled
-          val showDropdown = rememberSaveable { mutableStateOf(false) }
-
-          @Composable
-          fun MenuItems(): List<@Composable () -> Unit> {
-            val menuItems = mutableListOf<@Composable () -> Unit>()
-
-            if (cs.liveMessage == null && !cs.editing) {
-              if (
-                cs.preview !is ComposePreview.VoicePreview &&
-                cs.contextItem is ComposeContextItem.NoContextItem &&
-                sendLiveMessage != null && updateLiveMessage != null
-              ) {
-                menuItems.add {
-                  ItemAction(
-                    generalGetString(R.string.send_live_message),
-                    BoltFilled,
-                    onClick = {
-                      startLiveMessage(scope, sendLiveMessage, updateLiveMessage, sendButtonSize, sendButtonAlpha, composeState, liveMessageAlertShown)
-                      showDropdown.value = false
-                    }
-                  )
-                }
-              }
-              if (timedMessageAllowed) {
-                menuItems.add {
-                  ItemAction(
-                    generalGetString(R.string.disappearing_message),
-                    painterResource(R.drawable.ic_timer),
-                    onClick = {
-                      showCustomDisappearingMessageDialog.value = true
-                      showDropdown.value = false
-                    }
-                  )
-                }
-              }
-            }
-
-            return menuItems
-          }
-
-          val menuItems = MenuItems()
-          if (menuItems.isNotEmpty()) {
+                        (!allowedVoiceByPrefs && cs.preview is ComposePreview.VoicePreview) ||
+                        cs.endLiveDisabled
+          if (cs.liveMessage == null &&
+            cs.preview !is ComposePreview.VoicePreview && !cs.editing &&
+            cs.contextItem is ComposeContextItem.NoContextItem &&
+            sendLiveMessage != null && updateLiveMessage != null
+          ) {
+            val showDropdown = rememberSaveable { mutableStateOf(false) }
             SendMsgButton(icon, sendButtonSize, sendButtonAlpha, !disabled, sendMessage) { showDropdown.value = true }
-            DefaultDropdownMenu(showDropdown) {
-              menuItems.forEach { composable -> composable() }
+
+            DefaultDropdownMenu(
+              showDropdown,
+            ) {
+              ItemAction(
+                generalGetString(R.string.send_live_message),
+                BoltFilled,
+                onClick = {
+                  startLiveMessage(scope, sendLiveMessage, updateLiveMessage, sendButtonSize, sendButtonAlpha, composeState, liveMessageAlertShown)
+                  showDropdown.value = false
+                }
+              )
             }
           } else {
             SendMsgButton(icon, sendButtonSize, sendButtonAlpha, !disabled, sendMessage)
@@ -216,99 +177,6 @@ fun SendMsgView(
   }
 }
 
-@Composable
-private fun CustomDisappearingMessageDialog(
-  sendMessage: (Int?) -> Unit,
-  setShowDialog: (Boolean) -> Unit,
-  customDisappearingMessageTimePref: SharedPreference<Int>?
-) {
-  val showCustomTimePicker = remember { mutableStateOf(false) }
-
-  if (showCustomTimePicker.value) {
-    val selectedDisappearingMessageTime = remember {
-      mutableStateOf(customDisappearingMessageTimePref?.get?.invoke() ?: 300)
-    }
-    CustomTimePickerDialog(
-      selectedDisappearingMessageTime,
-      title = generalGetString(R.string.delete_after),
-      confirmButtonText = generalGetString(R.string.send_disappearing_message_send),
-      confirmButtonAction = { ttl ->
-        sendMessage(ttl)
-        customDisappearingMessageTimePref?.set?.invoke(ttl)
-        setShowDialog(false)
-      },
-      cancel = { setShowDialog(false) }
-    )
-  } else {
-    @Composable
-    fun ChoiceButton(
-      text: String,
-      onClick: () -> Unit
-    ) {
-      TextButton(onClick) {
-        Text(
-          text,
-          fontSize = 18.sp,
-          color = MaterialTheme.colors.primary
-        )
-      }
-    }
-
-    Dialog(onDismissRequest = { setShowDialog(false) }) {
-      Surface(
-        shape = RoundedCornerShape(corner = CornerSize(25.dp))
-      ) {
-        Box(
-          contentAlignment = Alignment.Center
-        ) {
-          Column(
-            modifier = Modifier.padding(DEFAULT_PADDING),
-            verticalArrangement = Arrangement.spacedBy(6.dp),
-            horizontalAlignment = Alignment.CenterHorizontally
-          ) {
-            Row(
-              modifier = Modifier.fillMaxWidth(),
-              horizontalArrangement = Arrangement.SpaceBetween,
-              verticalAlignment = Alignment.CenterVertically
-            ) {
-              Text(" ") // centers title
-              Text(
-                generalGetString(R.string.send_disappearing_message),
-                fontSize = 16.sp,
-                color = MaterialTheme.colors.secondary
-              )
-              Icon(
-                painterResource(R.drawable.ic_close),
-                generalGetString(R.string.icon_descr_close_button),
-                tint = MaterialTheme.colors.secondary,
-                modifier = Modifier
-                  .size(25.dp)
-                  .clickable { setShowDialog(false) }
-              )
-            }
-
-            ChoiceButton(generalGetString(R.string.send_disappearing_message_30_seconds)) {
-              sendMessage(30)
-              setShowDialog(false)
-            }
-            ChoiceButton(generalGetString(R.string.send_disappearing_message_1_minute)) {
-              sendMessage(60)
-              setShowDialog(false)
-            }
-            ChoiceButton(generalGetString(R.string.send_disappearing_message_5_minutes)) {
-              sendMessage(300)
-              setShowDialog(false)
-            }
-            ChoiceButton(generalGetString(R.string.send_disappearing_message_custom_time)) {
-              showCustomTimePicker.value = true
-            }
-          }
-        }
-      }
-    }
-  }
-}
-
 @Composable
 private fun NativeKeyboard(
   composeState: MutableState<ComposeState>,
@@ -382,20 +250,14 @@ private fun NativeKeyboard(
         Log.e(chat.simplex.app.TAG, e.stackTraceToString())
       }
     }
-    editText.doOnTextChanged { text, _, _, _ ->
-      if (!composeState.value.inProgress) {
-        onMessageChange(text.toString())
-      } else if (text.toString() != composeState.value.message) {
-        editText.setText(composeState.value.message)
-      }
-    }
+    editText.doOnTextChanged { text, _, _, _ -> onMessageChange(text.toString()) }
     editText.doAfterTextChanged { text -> if (composeState.value.preview is ComposePreview.VoicePreview && text.toString() != "") editText.setText("") }
     editText
   }) {
     it.setTextColor(textColor.toArgb())
     it.textSize = textStyle.value.fontSize.value
     DrawableCompat.setTint(it.background, tintColor.toArgb())
-    it.isFocusable = composeState.value.preview !is ComposePreview.VoicePreview && !cs.inProgress
+    it.isFocusable = composeState.value.preview !is ComposePreview.VoicePreview
     it.isFocusableInTouchMode = it.isFocusable
     if (cs.message != it.text.toString()) {
       it.setText(cs.message)
@@ -408,7 +270,7 @@ private fun NativeKeyboard(
       imm.showSoftInput(it, InputMethodManager.SHOW_IMPLICIT)
       showKeyboard = false
     }
-    showDeleteTextButton.value = it.lineCount >= 4 && !cs.inProgress
+    showDeleteTextButton.value = it.lineCount >= 4
   }
   if (composeState.value.preview is ComposePreview.VoicePreview) {
     ComposeOverlay(R.string.voice_message_send_text, textStyle, padding)
@@ -439,7 +301,7 @@ private fun BoxScope.DeleteTextButton(composeState: MutableState<ComposeState>)
 
 @Composable
 private fun RecordVoiceView(recState: MutableState<RecordingState>, stopRecOnNextClick: MutableState<Boolean>) {
-  val rec: Recorder = remember { RecorderNative() }
+  val rec: Recorder = remember { RecorderNative(MAX_VOICE_SIZE_FOR_SENDING) }
   DisposableEffect(Unit) { onDispose { rec.stop() } }
   val stopRecordingAndAddAudio: () -> Unit = {
     recState.value.filePathNullable?.let {
@@ -587,14 +449,14 @@ private fun SendMsgButton(
   sizeDp: Animatable<Float, AnimationVector1D>,
   alpha: Animatable<Float, AnimationVector1D>,
   enabled: Boolean,
-  sendMessage: (Int?) -> Unit,
+  sendMessage: () -> Unit,
   onLongClick: (() -> Unit)? = null
 ) {
   val interactionSource = remember { MutableInteractionSource() }
   Box(
     modifier = Modifier.requiredSize(36.dp)
       .combinedClickable(
-        onClick = { sendMessage(null) },
+        onClick = sendMessage,
         onLongClick = onLongClick,
         enabled = enabled,
         role = Role.Button,
@@ -739,7 +601,6 @@ fun PreviewSendMsgView() {
       userIsObserver = false,
       userCanSend = true,
       allowVoiceToContact = {},
-      timedMessageAllowed = false,
       sendMessage = {},
       onMessageChange = { _ -> },
       textStyle = textStyle
@@ -770,7 +631,6 @@ fun PreviewSendMsgViewEditing() {
       userIsObserver = false,
       userCanSend = true,
       allowVoiceToContact = {},
-      timedMessageAllowed = false,
       sendMessage = {},
       onMessageChange = { _ -> },
       textStyle = textStyle
@@ -801,7 +661,6 @@ fun PreviewSendMsgViewInProgress() {
       userIsObserver = false,
       userCanSend = true,
       allowVoiceToContact = {},
-      timedMessageAllowed = false,
       sendMessage = {},
       onMessageChange = { _ -> },
       textStyle = textStyle

apps/android/app/src/main/java/chat/simplex/app/views/chat/group/GroupChatInfoView.kt

@@ -175,8 +175,6 @@ fun GroupChatInfoLayout(
     SectionView {
       if (groupInfo.canEdit) {
         EditGroupProfileButton(editGroupProfile)
-      }
-      if (groupInfo.groupProfile.description != null || groupInfo.canEdit) {
         AddOrEditWelcomeMessage(groupInfo.groupProfile.description, addOrEditWelcomeMessage)
       }
       GroupPreferencesButton(openPreferences)

apps/android/app/src/main/java/chat/simplex/app/views/chat/group/GroupMemberInfoView.kt

@@ -4,10 +4,7 @@ import InfoRow
 import SectionBottomSpacer
 import SectionDividerSpaced
 import SectionSpacer
-import SectionTextFooter
 import SectionView
-import android.net.Uri
-import android.util.Log
 import androidx.activity.compose.BackHandler
 import androidx.compose.foundation.*
 import androidx.compose.foundation.layout.*
@@ -16,20 +13,17 @@ import androidx.compose.runtime.*
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
-import chat.simplex.app.*
 import chat.simplex.app.R
 import chat.simplex.app.model.*
 import chat.simplex.app.ui.theme.*
 import chat.simplex.app.views.chat.*
 import chat.simplex.app.views.helpers.*
-import chat.simplex.app.views.newchat.*
 import chat.simplex.app.views.usersettings.SettingsActionItem
 import kotlinx.datetime.Clock
 
@@ -70,15 +64,6 @@ fun GroupMemberInfoView(
           }
         }
       },
-      connectViaAddress = { connReqUri ->
-        val uri = Uri.parse(connReqUri)
-        withUriAction(uri) { linkType ->
-          withApi {
-            Log.d(TAG, "connectViaUri: connecting")
-            connectViaUri(chatModel, linkType, uri)
-          }
-        }
-      },
       removeMember = { removeMemberDialog(groupInfo, member, chatModel, close) },
       onRoleSelected = {
         if (it == newRole.value) return@GroupMemberInfoLayout
@@ -158,21 +143,11 @@ fun GroupMemberInfoLayout(
   connectionCode: String?,
   getContactChat: (Long) -> Chat?,
   openDirectChat: (Long) -> Unit,
-  connectViaAddress: (String) -> Unit,
   removeMember: () -> Unit,
   onRoleSelected: (GroupMemberRole) -> Unit,
   switchMemberAddress: () -> Unit,
   verifyClicked: () -> Unit,
 ) {
-  fun knownDirectChat(contactId: Long): Chat? {
-    val chat = getContactChat(contactId)
-    return if (chat != null && chat.chatInfo is ChatInfo.Direct && chat.chatInfo.contact.directOrUsed) {
-      chat
-    } else {
-      null
-    }
-  }
-
   Column(
     Modifier
       .fillMaxWidth()
@@ -186,39 +161,22 @@ fun GroupMemberInfoLayout(
     }
     SectionSpacer()
 
-    val contactId = member.memberContactId
-
     if (member.memberActive) {
+      val contactId = member.memberContactId
       if (contactId != null) {
         SectionView {
-          if (knownDirectChat(contactId) != null || groupInfo.fullGroupPreferences.directMessages.on) {
+          val chat = getContactChat(contactId)
+          if ((chat != null && chat.chatInfo is ChatInfo.Direct && chat.chatInfo.contact.directOrUsed) || groupInfo.fullGroupPreferences.directMessages.on) {
             OpenChatButton(onClick = { openDirectChat(contactId) })
           }
           if (connectionCode != null) {
             VerifyCodeButton(member.verified, verifyClicked)
           }
         }
-        SectionDividerSpaced()
+        SectionSpacer()
       }
     }
 
-    if (member.contactLink != null) {
-      val context = LocalContext.current
-      SectionView(stringResource(R.string.address_section_title).uppercase()) {
-        QRCode(member.contactLink, Modifier.padding(horizontal = DEFAULT_PADDING, vertical = DEFAULT_PADDING_HALF).aspectRatio(1f))
-        ShareAddressButton { shareText(context, member.contactLink) }
-        if (contactId != null) {
-          if (knownDirectChat(contactId) == null && !groupInfo.fullGroupPreferences.directMessages.on) {
-            ConnectViaAddressButton(onClick = { connectViaAddress(member.contactLink) })
-          }
-        } else {
-          ConnectViaAddressButton(onClick = { connectViaAddress(member.contactLink) })
-        }
-        SectionTextFooter(stringResource(R.string.you_can_share_this_address_with_your_contacts).format(member.displayName))
-      }
-      SectionDividerSpaced()
-    }
-
     SectionView(title = stringResource(R.string.member_info_section_title_member)) {
       InfoRow(stringResource(R.string.info_row_group), groupInfo.displayName)
       val roles = remember { member.canChangeRoleTo(groupInfo) }
@@ -323,17 +281,6 @@ fun OpenChatButton(onClick: () -> Unit) {
   )
 }
 
-@Composable
-fun ConnectViaAddressButton(onClick: () -> Unit) {
-  SettingsActionItem(
-    painterResource(R.drawable.ic_link),
-    stringResource(R.string.connect_button),
-    click = onClick,
-    textColor = MaterialTheme.colors.primary,
-    iconColor = MaterialTheme.colors.primary,
-  )
-}
-
 @Composable
 private fun RoleSelectionRow(
   roles: List<GroupMemberRole>,
@@ -393,7 +340,6 @@ fun PreviewGroupMemberInfoLayout() {
       connectionCode = "123",
       getContactChat = { Chat.sampleData },
       openDirectChat = {},
-      connectViaAddress = {},
       removeMember = {},
       onRoleSelected = {},
       switchMemberAddress = {},

apps/android/app/src/main/java/chat/simplex/app/views/chat/group/GroupPreferences.kt

@@ -17,6 +17,7 @@ import androidx.compose.ui.res.stringResource
 import chat.simplex.app.R
 import chat.simplex.app.model.*
 import chat.simplex.app.ui.theme.*
+import chat.simplex.app.views.chat.TimedMessagesTTLPicker
 import chat.simplex.app.views.helpers.*
 import chat.simplex.app.views.usersettings.PreferenceToggleWithIcon
 
@@ -94,11 +95,6 @@ private fun GroupPreferencesLayout(
       applyPrefs(preferences.copy(fullDelete = GroupPreference(enable = it)))
     }
     SectionDividerSpaced(true, maxBottomPadding = false)
-//    val allowReactions = remember(preferences) { mutableStateOf(preferences.reactions.enable) }
-//    FeatureSection(GroupFeature.Reactions, allowReactions, groupInfo, preferences, onTTLUpdated) {
-//      applyPrefs(preferences.copy(reactions = GroupPreference(enable = it)))
-//    }
-//    SectionDividerSpaced(true, maxBottomPadding = false)
     val allowVoice = remember(preferences) { mutableStateOf(preferences.voice.enable) }
     FeatureSection(GroupFeature.Voice, allowVoice, groupInfo, preferences, onTTLUpdated) {
       applyPrefs(preferences.copy(voice = GroupPreference(enable = it)))
@@ -140,15 +136,7 @@ private fun FeatureSection(
       }
       if (timedOn) {
         val ttl = rememberSaveable(preferences.timedMessages) { mutableStateOf(preferences.timedMessages.ttl) }
-        DropdownCustomTimePickerSettingRow(
-          selection = ttl,
-          propagateExternalSelectionUpdate = true, // for Reset
-          label = generalGetString(R.string.delete_after),
-          dropdownValues = TimedMessagesPreference.ttlValues.filterNotNull(), // TODO in 5.2 - allow "off"
-          customPickerTitle = generalGetString(R.string.delete_after),
-          customPickerConfirmButtonText = generalGetString(R.string.custom_time_picker_select),
-          onSelected = onTTLUpdated
-        )
+        TimedMessagesTTLPicker(ttl, onTTLUpdated)
       }
     } else {
       InfoRow(
@@ -158,7 +146,7 @@ private fun FeatureSection(
         iconTint = iconTint,
       )
       if (timedOn) {
-        InfoRow(generalGetString(R.string.delete_after), timeText(preferences.timedMessages.ttl))
+        InfoRow(generalGetString(R.string.delete_after), TimedMessagesPreference.ttlText(preferences.timedMessages.ttl))
       }
     }
   }

apps/android/app/src/main/java/chat/simplex/app/views/chat/group/WelcomeMessageView.kt

@@ -1,35 +1,27 @@
 package chat.simplex.app.views.chat.group
 
 import SectionBottomSpacer
-import SectionDividerSpaced
 import SectionItemView
+import SectionSpacer
 import SectionView
-import TextIconSpaced
 import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.rememberScrollState
-import androidx.compose.foundation.text.selection.SelectionContainer
 import androidx.compose.foundation.verticalScroll
-import androidx.compose.material.*
+import androidx.compose.material.MaterialTheme
+import androidx.compose.material.Text
 import androidx.compose.runtime.*
-import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.focus.FocusRequester
-import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
-import androidx.compose.ui.unit.sp
-import chat.simplex.app.*
 import chat.simplex.app.R
 import chat.simplex.app.model.*
-import chat.simplex.app.ui.theme.DEFAULT_PADDING
-import chat.simplex.app.views.chat.item.MarkdownText
+import chat.simplex.app.ui.theme.*
 import chat.simplex.app.views.helpers.*
-import kotlinx.coroutines.delay
 
 @Composable
 fun GroupWelcomeView(m: ChatModel, groupInfo: GroupInfo, close: () -> Unit) {
-  var gInfo by remember { mutableStateOf(groupInfo) }
-  val welcomeText = remember { mutableStateOf(gInfo.groupProfile.description ?: "") }
+  var groupInfo by remember { mutableStateOf(groupInfo) }
+  val welcomeText = remember { mutableStateOf(groupInfo.groupProfile.description ?: "") }
 
   fun save(afterSave: () -> Unit = {}) {
     withApi {
@@ -37,10 +29,10 @@ fun GroupWelcomeView(m: ChatModel, groupInfo: GroupInfo, close: () -> Unit) {
       if (welcome?.length == 0) {
         welcome = null
       }
-      val groupProfileUpdated = gInfo.groupProfile.copy(description = welcome)
-      val res = m.controller.apiUpdateGroup(gInfo.groupId, groupProfileUpdated)
+      val groupProfileUpdated = groupInfo.groupProfile.copy(description = welcome)
+      val res = m.controller.apiUpdateGroup(groupInfo.groupId, groupProfileUpdated)
       if (res != null) {
-        gInfo = res
+        groupInfo = res
         m.updateGroup(res)
         welcomeText.value = welcome ?: ""
       }
@@ -50,14 +42,13 @@ fun GroupWelcomeView(m: ChatModel, groupInfo: GroupInfo, close: () -> Unit) {
 
   ModalView(
     close = {
-      if (welcomeText.value == gInfo.groupProfile.description || (welcomeText.value == "" && gInfo.groupProfile.description == null)) close()
+      if (welcomeText.value == groupInfo.groupProfile.description || (welcomeText.value == "" && groupInfo.groupProfile.description == null)) close()
       else showUnsavedChangesAlert({ save(close) }, close)
     },
   ) {
     GroupWelcomeLayout(
       welcomeText,
-      gInfo,
-      m.controller.appPrefs.simplexLinkMode.get(),
+      groupInfo,
       save = ::save
     )
   }
@@ -67,70 +58,23 @@ fun GroupWelcomeView(m: ChatModel, groupInfo: GroupInfo, close: () -> Unit) {
 private fun GroupWelcomeLayout(
   welcomeText: MutableState<String>,
   groupInfo: GroupInfo,
-  linkMode: SimplexLinkMode,
   save: () -> Unit,
 ) {
   Column(
     Modifier.fillMaxWidth().verticalScroll(rememberScrollState()),
   ) {
-    val editMode = remember { mutableStateOf(true) }
     AppBarTitle(stringResource(R.string.group_welcome_title))
-    val wt = rememberSaveable { welcomeText }
-    if (groupInfo.canEdit) {
-      if (editMode.value) {
-        val focusRequester = remember { FocusRequester() }
-        TextEditor(
-          wt,
-          Modifier.height(140.dp), stringResource(R.string.enter_welcome_message),
-          focusRequester = focusRequester
-        )
-        LaunchedEffect(Unit) {
-          delay(300)
-          focusRequester.requestFocus()
-        }
-      } else {
-        TextPreview(wt.value, linkMode)
-      }
-      ChangeModeButton(
-        editMode.value,
-        click = {
-          editMode.value = !editMode.value
-        },
-        wt.value.isEmpty()
-      )
-      CopyTextButton { copyText(SimplexApp.context, wt.value) }
-      SectionDividerSpaced(maxBottomPadding = false)
-      SaveButton(
-        save = save,
-        disabled = wt.value == groupInfo.groupProfile.description || (wt.value == "" && groupInfo.groupProfile.description == null)
-      )
-    } else {
-      TextPreview(wt.value, linkMode)
-      CopyTextButton { copyText(SimplexApp.context, wt.value) }
-    }
+    val welcomeText = remember { welcomeText }
+    TextEditor(Modifier.padding(horizontal = DEFAULT_PADDING).height(160.dp), text = welcomeText)
+    SectionSpacer()
+    SaveButton(
+      save = save,
+      disabled = welcomeText.value == groupInfo.groupProfile.description || (welcomeText.value == "" && groupInfo.groupProfile.description == null)
+    )
     SectionBottomSpacer()
   }
 }
 
-@Composable
-private fun TextPreview(text: String, linkMode: SimplexLinkMode, markdown: Boolean = true) {
-  Column(
-    Modifier.height(140.dp)
-  ) {
-    SelectionContainer(
-      Modifier.verticalScroll(rememberScrollState())
-    ) {
-      MarkdownText(
-        text,
-        formattedText = if (markdown) remember(text) { parseToMarkdown(text) } else null,
-        modifier = Modifier.fillMaxHeight().padding(horizontal = DEFAULT_PADDING),
-        linkMode = linkMode,
-        style = MaterialTheme.typography.body1.copy(color = MaterialTheme.colors.onBackground, lineHeight = 22.sp)
-      )
-    }
-  }
-}
-
 @Composable
 private fun SaveButton(save: () -> Unit, disabled: Boolean) {
   SectionView {
@@ -140,35 +84,6 @@ private fun SaveButton(save: () -> Unit, disabled: Boolean) {
   }
 }
 
-@Composable
-private fun ChangeModeButton(editMode: Boolean, click: () -> Unit, disabled: Boolean) {
-  SectionItemView(click, disabled = disabled) {
-    Icon(
-      painterResource(if (editMode) R.drawable.ic_visibility else R.drawable.ic_edit),
-      contentDescription = generalGetString(R.string.edit_verb),
-      tint = if (disabled) MaterialTheme.colors.secondary else MaterialTheme.colors.primary,
-    )
-    TextIconSpaced()
-    Text(
-      stringResource(if (editMode) R.string.group_welcome_preview else R.string.edit_verb),
-      color = if (disabled) MaterialTheme.colors.secondary else MaterialTheme.colors.primary
-    )
-  }
-}
-
-@Composable
-private fun CopyTextButton(click: () -> Unit) {
-  SectionItemView(click) {
-    Icon(
-      painterResource(R.drawable.ic_content_copy),
-      contentDescription = generalGetString(R.string.copy_verb),
-      tint = MaterialTheme.colors.primary,
-    )
-    TextIconSpaced()
-    Text(stringResource(R.string.copy_verb), color = MaterialTheme.colors.primary)
-  }
-}
-
 private fun showUnsavedChangesAlert(save: () -> Unit, revert: () -> Unit) {
   AlertManager.shared.showAlertDialogStacked(
     title = generalGetString(R.string.save_welcome_message_question),

apps/android/app/src/main/java/chat/simplex/app/views/chat/item/CIFileView.kt

@@ -211,7 +211,6 @@ class ChatItemProvider: PreviewParameterProvider<ChatItem> {
     meta = CIMeta.getSample(1, Clock.System.now(), "", CIStatus.SndSent(), itemEdited = true),
     content = CIContent.SndMsgContent(msgContent = MsgContent.MCFile("")),
     quotedItem = null,
-    reactions = listOf(),
     file = CIFile.getSample(fileStatus = CIFileStatus.SndComplete)
   )
   private val fileChatItemWtFile = ChatItem(
@@ -219,7 +218,6 @@ class ChatItemProvider: PreviewParameterProvider<ChatItem> {
     meta = CIMeta.getSample(1, Clock.System.now(), "", CIStatus.RcvRead(), ),
     content = CIContent.RcvMsgContent(msgContent = MsgContent.MCFile("")),
     quotedItem = null,
-    reactions = listOf(),
     file = null
   )
   override val values = listOf(

apps/android/app/src/main/java/chat/simplex/app/views/chat/item/CIMetaView.kt

@@ -24,7 +24,7 @@ fun CIMetaView(chatItem: ChatItem, timedMessagesTTL: Int?, metaColor: Color = Ma
       Text(
         chatItem.timestampText,
         color = metaColor,
-        fontSize = 12.sp,
+        fontSize = 14.sp,
         modifier = Modifier.padding(start = 3.dp)
       )
     } else {
@@ -44,7 +44,7 @@ private fun CIMetaText(meta: CIMeta, chatTTL: Int?, color: Color) {
     StatusIconText(painterResource(R.drawable.ic_timer), color)
     val ttl = meta.itemTimed?.ttl
     if (ttl != chatTTL) {
-      Text(shortTimeText(ttl), color = color, fontSize = 12.sp)
+      Text(TimedMessagesPreference.shortTtlText(ttl), color = color, fontSize = 13.sp)
     }
     Spacer(Modifier.width(4.dp))
   }
@@ -57,7 +57,7 @@ private fun CIMetaText(meta: CIMeta, chatTTL: Int?, color: Color) {
     StatusIconText(painterResource(R.drawable.ic_circle_filled), Color.Transparent)
     Spacer(Modifier.width(4.dp))
   }
-  Text(meta.timestampText, color = color, fontSize = 12.sp, maxLines = 1, overflow = TextOverflow.Ellipsis)
+  Text(meta.timestampText, color = color, fontSize = 13.sp, maxLines = 1, overflow = TextOverflow.Ellipsis)
 }
 
 // the conditions in this function should match CIMetaText
@@ -69,7 +69,7 @@ fun reserveSpaceForMeta(meta: CIMeta, chatTTL: Int?): String {
     res += iconSpace
     val ttl = meta.itemTimed.ttl
     if (ttl != chatTTL) {
-      res += shortTimeText(ttl)
+      res += TimedMessagesPreference.shortTtlText(ttl)
     }
   }
   if (meta.statusIcon(CurrentColors.value.colors.secondary) != null || !meta.disappearing) {

apps/android/app/src/main/java/chat/simplex/app/views/chat/item/CIVoiceView.kt

@@ -1,6 +1,5 @@
 package chat.simplex.app.views.chat.item
 
-import androidx.compose.foundation.background
 import androidx.compose.foundation.combinedClickable
 import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.shape.CornerSize
@@ -10,19 +9,20 @@ import androidx.compose.runtime.*
 import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.draw.*
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.draw.drawWithCache
 import androidx.compose.ui.geometry.Offset
 import androidx.compose.ui.geometry.Size
 import androidx.compose.ui.graphics.*
 import androidx.compose.ui.graphics.drawscope.Stroke
-import androidx.compose.ui.platform.*
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.platform.LocalDensity
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.unit.*
 import chat.simplex.app.R
 import chat.simplex.app.model.*
 import chat.simplex.app.ui.theme.*
 import chat.simplex.app.views.helpers.*
-import kotlinx.coroutines.flow.distinctUntilChanged
 
 // TODO refactor https://github.com/simplex-chat/simplex-chat/pull/1451#discussion_r1033429901
 
@@ -36,10 +36,9 @@ fun CIVoiceView(
   ci: ChatItem,
   timedMessagesTTL: Int?,
   longClick: () -> Unit,
-  receiveFile: (Long) -> Unit,
 ) {
   Row(
-    Modifier.padding(top = if (hasText) 14.dp else 4.dp, bottom = if (hasText) 14.dp else 6.dp, start = if (hasText) 6.dp else 0.dp, end = if (hasText) 6.dp else 0.dp),
+    Modifier.padding(top = if (hasText) 14.dp else 4.dp, bottom = if (hasText) 14.dp else 6.dp, start = 6.dp, end = 6.dp),
     verticalAlignment = Alignment.CenterVertically
   ) {
     if (file != null) {
@@ -65,11 +64,9 @@ fun CIVoiceView(
           durationText(time / 1000)
         }
       }
-      VoiceLayout(file, ci, text, audioPlaying, progress, duration, brokenAudio, sent, hasText, timedMessagesTTL, play, pause, longClick, receiveFile) {
-        AudioPlayer.seekTo(it, progress, filePath)
-      }
+      VoiceLayout(file, ci, text, audioPlaying, progress, duration, brokenAudio, sent, hasText, timedMessagesTTL, play, pause, longClick)
     } else {
-      VoiceMsgIndicator(null, false, sent, hasText, null, null, false, {}, {}, longClick, receiveFile)
+      VoiceMsgIndicator(null, false, sent, hasText, null, null, false, {}, {}, longClick)
       val metaReserve = if (edited)
         "                     "
       else
@@ -93,89 +90,39 @@ private fun VoiceLayout(
   timedMessagesTTL: Int?,
   play: () -> Unit,
   pause: () -> Unit,
-  longClick: () -> Unit,
-  receiveFile: (Long) -> Unit,
-  onProgressChanged: (Int) -> Unit,
+  longClick: () -> Unit
 ) {
-  @Composable
-  fun RowScope.Slider(backgroundColor: Color, padding: PaddingValues = PaddingValues(horizontal = DEFAULT_PADDING_HALF)) {
-    var movedManuallyTo by rememberSaveable(file.fileId) { mutableStateOf(-1) }
-    if (audioPlaying.value || progress.value > 0 || movedManuallyTo == progress.value) {
-      val dp4 = with(LocalDensity.current) { 4.dp.toPx() }
-      val dp10 = with(LocalDensity.current) { 10.dp.toPx() }
-      val primary = MaterialTheme.colors.primary
-      val inactiveTrackColor =
-        MaterialTheme.colors.primary.mixWith(
-          backgroundColor.copy(1f).mixWith(MaterialTheme.colors.background, backgroundColor.alpha),
-          0.24f)
-      val width = with(LocalDensity.current) { LocalView.current.width.toDp() }
-      val colors = SliderDefaults.colors(
-        inactiveTrackColor = inactiveTrackColor
-      )
-      Slider(
-        progress.value.toFloat(),
-        onValueChange = {
-          onProgressChanged(it.toInt())
-          movedManuallyTo = it.toInt()
-        },
-        Modifier
-          .size(width, 48.dp)
-          .weight(1f)
-          .padding(padding)
-          .drawBehind {
-            drawRect(primary, Offset(0f, (size.height - dp4) / 2), size = androidx.compose.ui.geometry.Size(dp10, dp4))
-            drawRect(inactiveTrackColor, Offset(size.width - dp10, (size.height - dp4) / 2), size = androidx.compose.ui.geometry.Size(dp10, dp4))
-          },
-        valueRange = 0f..duration.value.toFloat(),
-        colors = colors
-      )
-      LaunchedEffect(Unit) {
-        snapshotFlow { audioPlaying.value }
-          .distinctUntilChanged()
-          .collect {
-            movedManuallyTo = -1
-          }
-      }
-    }
-  }
   when {
     hasText -> {
-      val sentColor = CurrentColors.collectAsState().value.appColors.sentMessage
-      val receivedColor = CurrentColors.collectAsState().value.appColors.receivedMessage
       Spacer(Modifier.width(6.dp))
-      VoiceMsgIndicator(file, audioPlaying.value, sent, hasText, progress, duration, brokenAudio, play, pause, longClick, receiveFile)
-      Row(verticalAlignment = Alignment.CenterVertically) {
-        DurationText(text, PaddingValues(start = 12.dp))
-        Slider(if (ci.chatDir.sent) sentColor else receivedColor)
-      }
+      VoiceMsgIndicator(file, audioPlaying.value, sent, hasText, progress, duration, brokenAudio, play, pause, longClick)
+      DurationText(text, PaddingValues(start = 12.dp))
     }
     sent -> {
-      Column(horizontalAlignment = Alignment.End) {
-        Row {
-          Row(Modifier.weight(1f, false), verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.End) {
-            Spacer(Modifier.height(56.dp))
-            Slider(MaterialTheme.colors.background, PaddingValues(end = DEFAULT_PADDING_HALF + 3.dp))
-            DurationText(text, PaddingValues(end = 12.dp))
-          }
-          VoiceMsgIndicator(file, audioPlaying.value, sent, hasText, progress, duration, brokenAudio, play, pause, longClick, receiveFile)
+      Row {
+        Row(verticalAlignment = Alignment.CenterVertically) {
+          Spacer(Modifier.height(56.dp))
+          DurationText(text, PaddingValues(end = 12.dp))
         }
-        Box(Modifier.padding(top = 6.dp, end = 6.dp)) {
-          CIMetaView(ci, timedMessagesTTL)
+        Column {
+          VoiceMsgIndicator(file, audioPlaying.value, sent, hasText, progress, duration, brokenAudio, play, pause, longClick)
+          Box(Modifier.align(Alignment.CenterHorizontally).padding(top = 6.dp)) {
+            CIMetaView(ci, timedMessagesTTL)
+          }
         }
       }
     }
     else -> {
-      Column(horizontalAlignment = Alignment.Start) {
-        Row {
-          VoiceMsgIndicator(file, audioPlaying.value, sent, hasText, progress, duration, brokenAudio, play, pause, longClick, receiveFile)
-          Row(Modifier.weight(1f, false), verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.Start) {
-            DurationText(text, PaddingValues(start = 12.dp))
-            Slider(MaterialTheme.colors.background, PaddingValues(start = DEFAULT_PADDING_HALF + 3.dp))
-            Spacer(Modifier.height(56.dp))
+      Row {
+        Column {
+          VoiceMsgIndicator(file, audioPlaying.value, sent, hasText, progress, duration, brokenAudio, play, pause, longClick)
+          Box(Modifier.align(Alignment.CenterHorizontally).padding(top = 6.dp)) {
+            CIMetaView(ci, timedMessagesTTL)
           }
         }
-        Box(Modifier.padding(top = 6.dp)) {
-          CIMetaView(ci, timedMessagesTTL)
+        Row(verticalAlignment = Alignment.CenterVertically) {
+          DurationText(text, PaddingValues(start = 12.dp))
+          Spacer(Modifier.height(56.dp))
         }
       }
     }
@@ -246,8 +193,7 @@ private fun VoiceMsgIndicator(
   error: Boolean,
   play: () -> Unit,
   pause: () -> Unit,
-  longClick: () -> Unit,
-  receiveFile: (Long) -> Unit,
+  longClick: () -> Unit
 ) {
   val strokeWidth = with(LocalDensity.current) { 3.dp.toPx() }
   val strokeColor = MaterialTheme.colors.primary
@@ -266,9 +212,8 @@ private fun VoiceMsgIndicator(
       PlayPauseButton(audioPlaying, sent, angle, strokeWidth, strokeColor, true, error, play, pause, longClick = longClick)
     }
   } else {
-    if (file?.fileStatus is CIFileStatus.RcvInvitation) {
-      PlayPauseButton(audioPlaying, sent, 0f, strokeWidth, strokeColor, true, error, { receiveFile(file.fileId) }, {}, longClick = longClick)
-    } else if (file?.fileStatus is CIFileStatus.RcvTransfer
+    if (file?.fileStatus is CIFileStatus.RcvInvitation
+      || file?.fileStatus is CIFileStatus.RcvTransfer
       || file?.fileStatus is CIFileStatus.RcvAccepted
     ) {
       Box(

apps/android/app/src/main/java/chat/simplex/app/views/chat/item/ChatItemView.kt

@@ -2,8 +2,7 @@ package chat.simplex.app.views.chat.item
 
 import android.Manifest
 import android.os.Build
-import androidx.compose.foundation.*
-import androidx.compose.foundation.gestures.scrollable
+import androidx.compose.foundation.combinedClickable
 import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material.*
@@ -17,17 +16,15 @@ import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.platform.*
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
-import androidx.compose.ui.unit.sp
 import chat.simplex.app.*
 import chat.simplex.app.R
 import chat.simplex.app.model.*
 import chat.simplex.app.ui.theme.*
-import chat.simplex.app.views.chat.*
+import chat.simplex.app.views.chat.ComposeContextItem
+import chat.simplex.app.views.chat.ComposeState
 import chat.simplex.app.views.helpers.*
-import chat.simplex.app.views.usersettings.IncognitoView
 import com.google.accompanist.permissions.rememberPermissionState
 import kotlinx.datetime.Clock
 
@@ -48,9 +45,7 @@ fun ChatItemView(
   joinGroup: (Long) -> Unit,
   acceptCall: (Contact) -> Unit,
   scrollToItem: (Long) -> Unit,
-  acceptFeature: (Contact, ChatFeature, Int?) -> Unit,
-  setReaction: (ChatInfo, ChatItem, Boolean, MsgReaction) -> Unit,
-  showItemDetails: (ChatInfo, ChatItem) -> Unit,
+  acceptFeature: (Contact, ChatFeature, Int?) -> Unit
 ) {
   val context = LocalContext.current
   val uriHandler = LocalUriHandler.current
@@ -80,248 +75,186 @@ fun ChatItemView(
         else -> {}
       }
     }
+    Column(
+      Modifier
+        .clip(RoundedCornerShape(18.dp))
+        .combinedClickable(onLongClick = { showMenu.value = true }, onClick = onClick),
+    ) {
+      @Composable
+      fun framedItemView() {
+        FramedItemView(cInfo, cItem, uriHandler, imageProvider, showMember = showMember, linkMode = linkMode, showMenu, receiveFile, onLinkLongClick, scrollToItem)
+      }
 
-    @Composable
-    fun ChatItemReactions() {
-      Row {
-        cItem.reactions.forEach { r ->
-          var modifier = Modifier.padding(horizontal = 5.dp, vertical = 2.dp).clip(RoundedCornerShape(8.dp))
-          if (cInfo.featureEnabled(ChatFeature.Reactions) && (cItem.allowAddReaction || r.userReacted)) {
-            modifier = modifier.clickable {
-              setReaction(cInfo, cItem, !r.userReacted, r.reaction)
+      fun deleteMessageQuestionText(): String {
+        return if (fullDeleteAllowed) {
+          generalGetString(R.string.delete_message_cannot_be_undone_warning)
+        } else {
+          generalGetString(R.string.delete_message_mark_deleted_warning)
+        }
+      }
+
+      fun moderateMessageQuestionText(): String {
+        return if (fullDeleteAllowed) {
+          generalGetString(R.string.moderate_message_will_be_deleted_warning)
+        } else {
+          generalGetString(R.string.moderate_message_will_be_marked_warning)
+        }
+      }
+
+      @Composable
+      fun MsgContentItemDropdownMenu() {
+        DefaultDropdownMenu(showMenu) {
+          if (cItem.meta.itemDeleted == null && !live) {
+            ItemAction(stringResource(R.string.reply_verb), painterResource(R.drawable.ic_reply), onClick = {
+              if (composeState.value.editing) {
+                composeState.value = ComposeState(contextItem = ComposeContextItem.QuotedItem(cItem), useLinkPreviews = useLinkPreviews)
+              } else {
+                composeState.value = composeState.value.copy(contextItem = ComposeContextItem.QuotedItem(cItem))
+              }
+              showMenu.value = false
+            })
+          }
+          ItemAction(stringResource(R.string.share_verb), painterResource(R.drawable.ic_share), onClick = {
+            val filePath = getLoadedFilePath(SimplexApp.context, cItem.file)
+            when {
+              filePath != null -> shareFile(context, cItem.text, filePath)
+              else -> shareText(context, cItem.content.text)
+            }
+            showMenu.value = false
+          })
+          ItemAction(stringResource(R.string.copy_verb), painterResource(R.drawable.ic_content_copy), onClick = {
+            copyText(context, cItem.content.text)
+            showMenu.value = false
+          })
+          if (cItem.content.msgContent is MsgContent.MCImage || cItem.content.msgContent is MsgContent.MCVideo || cItem.content.msgContent is MsgContent.MCFile || cItem.content.msgContent is MsgContent.MCVoice) {
+            val filePath = getLoadedFilePath(context, cItem.file)
+            if (filePath != null) {
+              val writePermissionState = rememberPermissionState(permission = Manifest.permission.WRITE_EXTERNAL_STORAGE)
+              ItemAction(stringResource(R.string.save_verb), painterResource(R.drawable.ic_download), onClick = {
+                when (cItem.content.msgContent) {
+                  is MsgContent.MCImage -> {
+                    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R || writePermissionState.hasPermission) {
+                      saveImage(context, cItem.file)
+                    } else {
+                      writePermissionState.launchPermissionRequest()
+                    }
+                  }
+                  is MsgContent.MCFile, is MsgContent.MCVoice, is MsgContent.MCVideo -> saveFileLauncher.launch(cItem.file?.fileName)
+                  else -> {}
+                }
+                showMenu.value = false
+              })
             }
           }
-          Row(modifier.padding(2.dp)) {
-            Text(r.reaction.text, fontSize = 12.sp)
-            if (r.totalReacted > 1) {
-              Spacer(Modifier.width(4.dp))
-              Text("${r.totalReacted}",
-                fontSize = 11.5.sp,
-                fontWeight = if (r.userReacted) FontWeight.Bold else FontWeight.Normal,
-                color = if (r.userReacted) MaterialTheme.colors.primary else MaterialTheme.colors.secondary,
-              )
-            }
+          if (cItem.meta.editable && cItem.content.msgContent !is MsgContent.MCVoice && !live) {
+            ItemAction(stringResource(R.string.edit_verb), painterResource(R.drawable.ic_edit_filled), onClick = {
+              composeState.value = ComposeState(editingItem = cItem, useLinkPreviews = useLinkPreviews)
+              showMenu.value = false
+            })
+          }
+          if (cItem.meta.itemDeleted != null && revealed.value) {
+            ItemAction(
+              stringResource(R.string.hide_verb),
+              painterResource(R.drawable.ic_visibility_off),
+              onClick = {
+                revealed.value = false
+                showMenu.value = false
+              }
+            )
+          }
+          if (cItem.meta.itemDeleted == null && cItem.file != null && cItem.file.cancelAction != null) {
+            CancelFileItemAction(cItem.file.fileId, showMenu, cancelFile = cancelFile, cancelAction = cItem.file.cancelAction)
+          }
+          if (!(live && cItem.meta.isLive)) {
+            DeleteItemAction(cItem, showMenu, questionText = deleteMessageQuestionText(), deleteMessage)
+          }
+          val groupInfo = cItem.memberToModerate(cInfo)?.first
+          if (groupInfo != null) {
+            ModerateItemAction(cItem, questionText = moderateMessageQuestionText(), showMenu, deleteMessage)
           }
         }
       }
-    }
 
-    Column(horizontalAlignment = if (cItem.chatDir.sent) Alignment.End else Alignment.Start) {
-      Column(
-        Modifier
-          .clip(RoundedCornerShape(18.dp))
-          .combinedClickable(onLongClick = { showMenu.value = true }, onClick = onClick),
-      ) {
-        @Composable
-        fun framedItemView() {
-          FramedItemView(cInfo, cItem, uriHandler, imageProvider, showMember = showMember, linkMode = linkMode, showMenu, receiveFile, onLinkLongClick, scrollToItem)
-        }
-
-        fun deleteMessageQuestionText(): String {
-          return if (fullDeleteAllowed) {
-            generalGetString(R.string.delete_message_cannot_be_undone_warning)
-          } else {
-            generalGetString(R.string.delete_message_mark_deleted_warning)
-          }
-        }
-
-        fun moderateMessageQuestionText(): String {
-          return if (fullDeleteAllowed) {
-            generalGetString(R.string.moderate_message_will_be_deleted_warning)
-          } else {
-            generalGetString(R.string.moderate_message_will_be_marked_warning)
-          }
-        }
-
-        @Composable
-        fun MsgReactionsMenu() {
-          val rs = MsgReaction.values.mapNotNull { r ->
-            if (null == cItem.reactions.find { it.userReacted && it.reaction.text == r.text }) {
-              r
-            } else {
-              null
-            }
-          }
-          if (rs.isNotEmpty()) {
-            Row(modifier = Modifier.padding(horizontal = DEFAULT_PADDING).horizontalScroll(rememberScrollState())) {
-              rs.forEach() { r ->
-                Box(
-                  Modifier.size(36.dp).clickable {
-                    setReaction(cInfo, cItem, true, r)
-                    showMenu.value = false
-                  },
-                  contentAlignment = Alignment.Center
-                ) {
-                  Text(r.text)
-                }
-              }
-            }
-          }
-        }
-
-        @Composable
-        fun MsgContentItemDropdownMenu() {
-          DefaultDropdownMenu(showMenu) {
-            if (cInfo.featureEnabled(ChatFeature.Reactions) && cItem.allowAddReaction) {
-              MsgReactionsMenu()
-            }
-            if (cItem.meta.itemDeleted == null && !live) {
-              ItemAction(stringResource(R.string.reply_verb), painterResource(R.drawable.ic_reply), onClick = {
-                if (composeState.value.editing) {
-                  composeState.value = ComposeState(contextItem = ComposeContextItem.QuotedItem(cItem), useLinkPreviews = useLinkPreviews)
-                } else {
-                  composeState.value = composeState.value.copy(contextItem = ComposeContextItem.QuotedItem(cItem))
-                }
+      @Composable
+      fun MarkedDeletedItemDropdownMenu() {
+        DefaultDropdownMenu(showMenu) {
+          if (!cItem.isDeletedContent) {
+            ItemAction(
+              stringResource(R.string.reveal_verb),
+              painterResource(R.drawable.ic_visibility),
+              onClick = {
+                revealed.value = true
                 showMenu.value = false
-              })
-            }
-            ItemAction(stringResource(R.string.share_verb), painterResource(R.drawable.ic_share), onClick = {
-              val filePath = getLoadedFilePath(SimplexApp.context, cItem.file)
-              when {
-                filePath != null -> shareFile(context, cItem.text, filePath)
-                else -> shareText(context, cItem.content.text)
               }
-              showMenu.value = false
-            })
-            ItemAction(stringResource(R.string.copy_verb), painterResource(R.drawable.ic_content_copy), onClick = {
-              copyText(context, cItem.content.text)
-              showMenu.value = false
-            })
-            if (cItem.content.msgContent is MsgContent.MCImage || cItem.content.msgContent is MsgContent.MCVideo || cItem.content.msgContent is MsgContent.MCFile || cItem.content.msgContent is MsgContent.MCVoice) {
-              val filePath = getLoadedFilePath(context, cItem.file)
-              if (filePath != null) {
-                val writePermissionState = rememberPermissionState(permission = Manifest.permission.WRITE_EXTERNAL_STORAGE)
-                ItemAction(stringResource(R.string.save_verb), painterResource(R.drawable.ic_download), onClick = {
-                  when (cItem.content.msgContent) {
-                    is MsgContent.MCImage -> {
-                      if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R || writePermissionState.hasPermission) {
-                        saveImage(context, cItem.file)
-                      } else {
-                        writePermissionState.launchPermissionRequest()
-                      }
-                    }
-                    is MsgContent.MCFile, is MsgContent.MCVoice, is MsgContent.MCVideo -> saveFileLauncher.launch(cItem.file?.fileName)
-                    else -> {}
-                  }
-                  showMenu.value = false
-                })
-              }
-            }
-            if (cItem.meta.editable && cItem.content.msgContent !is MsgContent.MCVoice && !live) {
-              ItemAction(stringResource(R.string.edit_verb), painterResource(R.drawable.ic_edit_filled), onClick = {
-                composeState.value = ComposeState(editingItem = cItem, useLinkPreviews = useLinkPreviews)
-                showMenu.value = false
-              })
-            }
-            if (cItem.meta.itemDeleted != null && revealed.value) {
-              ItemAction(
-                stringResource(R.string.hide_verb),
-                painterResource(R.drawable.ic_visibility_off),
-                onClick = {
-                  revealed.value = false
-                  showMenu.value = false
-                }
-              )
-            }
-            if (cItem.meta.itemDeleted == null && cItem.file != null && cItem.file.cancelAction != null) {
-              CancelFileItemAction(cItem.file.fileId, showMenu, cancelFile = cancelFile, cancelAction = cItem.file.cancelAction)
-            }
-            ItemInfoAction(cInfo, cItem, showItemDetails, showMenu)
-            if (!(live && cItem.meta.isLive)) {
-              DeleteItemAction(cItem, showMenu, questionText = deleteMessageQuestionText(), deleteMessage)
-            }
-            val groupInfo = cItem.memberToModerate(cInfo)?.first
-            if (groupInfo != null) {
-              ModerateItemAction(cItem, questionText = moderateMessageQuestionText(), showMenu, deleteMessage)
-            }
+            )
           }
+          DeleteItemAction(cItem, showMenu, questionText = deleteMessageQuestionText(), deleteMessage)
         }
+      }
 
-        @Composable
-        fun MarkedDeletedItemDropdownMenu() {
-          DefaultDropdownMenu(showMenu) {
-            if (!cItem.isDeletedContent) {
-              ItemAction(
-                stringResource(R.string.reveal_verb),
-                painterResource(R.drawable.ic_visibility),
-                onClick = {
-                  revealed.value = true
-                  showMenu.value = false
-                }
-              )
-              ItemInfoAction(cInfo, cItem, showItemDetails, showMenu)
-            }
-            DeleteItemAction(cItem, showMenu, questionText = deleteMessageQuestionText(), deleteMessage)
-          }
-        }
-
-        @Composable
-        fun ContentItem() {
-          val mc = cItem.content.msgContent
-          if (cItem.meta.itemDeleted != null && !revealed.value) {
-            MarkedDeletedItemView(cItem, cInfo.timedMessagesTTL, showMember = showMember)
-            MarkedDeletedItemDropdownMenu()
+      @Composable
+      fun ContentItem() {
+        val mc = cItem.content.msgContent
+        if (cItem.meta.itemDeleted != null && !revealed.value) {
+          MarkedDeletedItemView(cItem, cInfo.timedMessagesTTL, showMember = showMember)
+          MarkedDeletedItemDropdownMenu()
+        } else if (cItem.quotedItem == null && cItem.meta.itemDeleted == null && !cItem.meta.isLive) {
+          if (mc is MsgContent.MCText && isShortEmoji(cItem.content.text)) {
+            EmojiItemView(cItem, cInfo.timedMessagesTTL)
+            MsgContentItemDropdownMenu()
+          } else if (mc is MsgContent.MCVoice && cItem.content.text.isEmpty()) {
+            CIVoiceView(mc.duration, cItem.file, cItem.meta.itemEdited, cItem.chatDir.sent, hasText = false, cItem, cInfo.timedMessagesTTL, longClick = { onLinkLongClick("") })
+            MsgContentItemDropdownMenu()
           } else {
-            if (cItem.quotedItem == null && cItem.meta.itemDeleted == null && !cItem.meta.isLive) {
-              if (mc is MsgContent.MCText && isShortEmoji(cItem.content.text)) {
-                EmojiItemView(cItem, cInfo.timedMessagesTTL)
-              } else if (mc is MsgContent.MCVoice && cItem.content.text.isEmpty()) {
-                CIVoiceView(mc.duration, cItem.file, cItem.meta.itemEdited, cItem.chatDir.sent, hasText = false, cItem, cInfo.timedMessagesTTL, longClick = { onLinkLongClick("") }, receiveFile)
-              } else {
-                framedItemView()
-              }
-            } else {
-              framedItemView()
-            }
+            framedItemView()
             MsgContentItemDropdownMenu()
           }
-        }
-
-        @Composable fun DeletedItem() {
-          DeletedItemView(cItem, cInfo.timedMessagesTTL, showMember = showMember)
-          DefaultDropdownMenu(showMenu) {
-            DeleteItemAction(cItem, showMenu, questionText = deleteMessageQuestionText(), deleteMessage)
-          }
-        }
-
-        @Composable fun CallItem(status: CICallStatus, duration: Int) {
-          CICallItemView(cInfo, cItem, status, duration, acceptCall)
-        }
-
-        when (val c = cItem.content) {
-          is CIContent.SndMsgContent -> ContentItem()
-          is CIContent.RcvMsgContent -> ContentItem()
-          is CIContent.SndDeleted -> DeletedItem()
-          is CIContent.RcvDeleted -> DeletedItem()
-          is CIContent.SndCall -> CallItem(c.status, c.duration)
-          is CIContent.RcvCall -> CallItem(c.status, c.duration)
-          is CIContent.RcvIntegrityError -> IntegrityErrorItemView(c.msgError, cItem, cInfo.timedMessagesTTL, showMember = showMember)
-          is CIContent.RcvDecryptionError -> CIRcvDecryptionError(c.msgDecryptError, c.msgCount, cItem, cInfo.timedMessagesTTL, showMember = showMember)
-          is CIContent.RcvGroupInvitation -> CIGroupInvitationView(cItem, c.groupInvitation, c.memberRole, joinGroup = joinGroup, chatIncognito = cInfo.incognito)
-          is CIContent.SndGroupInvitation -> CIGroupInvitationView(cItem, c.groupInvitation, c.memberRole, joinGroup = joinGroup, chatIncognito = cInfo.incognito)
-          is CIContent.RcvGroupEventContent -> CIEventView(cItem)
-          is CIContent.SndGroupEventContent -> CIEventView(cItem)
-          is CIContent.RcvConnEventContent -> CIEventView(cItem)
-          is CIContent.SndConnEventContent -> CIEventView(cItem)
-          is CIContent.RcvChatFeature -> CIChatFeatureView(cItem, c.feature, c.enabled.iconColor)
-          is CIContent.SndChatFeature -> CIChatFeatureView(cItem, c.feature, c.enabled.iconColor)
-          is CIContent.RcvChatPreference -> {
-            val ct = if (cInfo is ChatInfo.Direct) cInfo.contact else null
-            CIFeaturePreferenceView(cItem, ct, c.feature, c.allowed, acceptFeature)
-          }
-          is CIContent.SndChatPreference -> CIChatFeatureView(cItem, c.feature, MaterialTheme.colors.secondary, icon = c.feature.icon,)
-          is CIContent.RcvGroupFeature -> CIChatFeatureView(cItem, c.groupFeature, c.preference.enable.iconColor)
-          is CIContent.SndGroupFeature -> CIChatFeatureView(cItem, c.groupFeature, c.preference.enable.iconColor)
-          is CIContent.RcvChatFeatureRejected -> CIChatFeatureView(cItem, c.feature, Color.Red)
-          is CIContent.RcvGroupFeatureRejected -> CIChatFeatureView(cItem, c.groupFeature, Color.Red)
-          is CIContent.SndModerated -> MarkedDeletedItemView(cItem, cInfo.timedMessagesTTL, showMember = showMember)
-          is CIContent.RcvModerated -> MarkedDeletedItemView(cItem, cInfo.timedMessagesTTL, showMember = showMember)
-          is CIContent.InvalidJSON -> CIInvalidJSONView(c.json)
+        } else {
+          framedItemView()
+          MsgContentItemDropdownMenu()
         }
       }
 
-      if (cItem.content.msgContent != null && (cItem.meta.itemDeleted == null || revealed.value) && cItem.reactions.isNotEmpty()) {
-        ChatItemReactions()
+      @Composable fun DeletedItem() {
+        DeletedItemView(cItem, cInfo.timedMessagesTTL, showMember = showMember)
+        DefaultDropdownMenu(showMenu) {
+          DeleteItemAction(cItem, showMenu, questionText = deleteMessageQuestionText(), deleteMessage)
+        }
+      }
+
+      @Composable fun CallItem(status: CICallStatus, duration: Int) {
+        CICallItemView(cInfo, cItem, status, duration, acceptCall)
+      }
+
+      when (val c = cItem.content) {
+        is CIContent.SndMsgContent -> ContentItem()
+        is CIContent.RcvMsgContent -> ContentItem()
+        is CIContent.SndDeleted -> DeletedItem()
+        is CIContent.RcvDeleted -> DeletedItem()
+        is CIContent.SndCall -> CallItem(c.status, c.duration)
+        is CIContent.RcvCall -> CallItem(c.status, c.duration)
+        is CIContent.RcvIntegrityError -> IntegrityErrorItemView(c.msgError, cItem, cInfo.timedMessagesTTL, showMember = showMember)
+        is CIContent.RcvDecryptionError -> CIRcvDecryptionError(c.msgDecryptError, c.msgCount, cItem, cInfo.timedMessagesTTL, showMember = showMember)
+        is CIContent.RcvGroupInvitation -> CIGroupInvitationView(cItem, c.groupInvitation, c.memberRole, joinGroup = joinGroup, chatIncognito = cInfo.incognito)
+        is CIContent.SndGroupInvitation -> CIGroupInvitationView(cItem, c.groupInvitation, c.memberRole, joinGroup = joinGroup, chatIncognito = cInfo.incognito)
+        is CIContent.RcvGroupEventContent -> CIEventView(cItem)
+        is CIContent.SndGroupEventContent -> CIEventView(cItem)
+        is CIContent.RcvConnEventContent -> CIEventView(cItem)
+        is CIContent.SndConnEventContent -> CIEventView(cItem)
+        is CIContent.RcvChatFeature -> CIChatFeatureView(cItem, c.feature, c.enabled.iconColor)
+        is CIContent.SndChatFeature -> CIChatFeatureView(cItem, c.feature, c.enabled.iconColor)
+        is CIContent.RcvChatPreference -> {
+          val ct = if (cInfo is ChatInfo.Direct) cInfo.contact else null
+          CIFeaturePreferenceView(cItem, ct, c.feature, c.allowed, acceptFeature)
+        }
+        is CIContent.SndChatPreference -> CIChatFeatureView(cItem, c.feature, MaterialTheme.colors.secondary, icon = c.feature.icon,)
+        is CIContent.RcvGroupFeature -> CIChatFeatureView(cItem, c.groupFeature, c.preference.enable.iconColor)
+        is CIContent.SndGroupFeature -> CIChatFeatureView(cItem, c.groupFeature, c.preference.enable.iconColor)
+        is CIContent.RcvChatFeatureRejected -> CIChatFeatureView(cItem, c.feature, Color.Red)
+        is CIContent.RcvGroupFeatureRejected -> CIChatFeatureView(cItem, c.groupFeature, Color.Red)
+        is CIContent.SndModerated -> MarkedDeletedItemView(cItem, cInfo.timedMessagesTTL, showMember = showMember)
+        is CIContent.RcvModerated -> MarkedDeletedItemView(cItem, cInfo.timedMessagesTTL, showMember = showMember)
+        is CIContent.InvalidJSON -> CIInvalidJSONView(c.json)
       }
     }
   }
@@ -345,24 +278,6 @@ fun CancelFileItemAction(
   )
 }
 
-@Composable
-fun ItemInfoAction(
-  cInfo: ChatInfo,
-  cItem: ChatItem,
-  showItemDetails: (ChatInfo, ChatItem) -> Unit,
-  showMenu: MutableState<Boolean>
-) {
-  ItemAction(
-    stringResource(R.string.info_menu),
-    painterResource(R.drawable.ic_info),
-    onClick = {
-      showItemDetails(cInfo, cItem)
-      showMenu.value = false
-    }
-  )
-}
-
-
 @Composable
 fun DeleteItemAction(
   cItem: ChatItem,
@@ -515,9 +430,7 @@ fun PreviewChatItemView() {
       joinGroup = {},
       acceptCall = { _ -> },
       scrollToItem = {},
-      acceptFeature = { _, _, _ -> },
-      setReaction = { _, _, _, _ -> },
-      showItemDetails = { _, _ -> },
+      acceptFeature = { _, _, _ -> }
     )
   }
 }
@@ -538,9 +451,7 @@ fun PreviewChatItemViewDeletedContent() {
       joinGroup = {},
       acceptCall = { _ -> },
       scrollToItem = {},
-      acceptFeature = { _, _, _ -> },
-      setReaction = { _, _, _, _ -> },
-      showItemDetails = { _, _ -> },
+      acceptFeature = { _, _, _ -> }
     )
   }
 }

apps/android/app/src/main/java/chat/simplex/app/views/chat/item/FramedItemView.kt

@@ -221,7 +221,7 @@ fun FramedItemView(
                 }
               }
               is MsgContent.MCVoice -> {
-                CIVoiceView(mc.duration, ci.file, ci.meta.itemEdited, ci.chatDir.sent, hasText = true, ci, timedMessagesTTL = chatTTL, longClick = { onLinkLongClick("") }, receiveFile)
+                CIVoiceView(mc.duration, ci.file, ci.meta.itemEdited, ci.chatDir.sent, hasText = true, ci, timedMessagesTTL = chatTTL, longClick = { onLinkLongClick("") })
                 if (mc.text != "") {
                   CIMarkdownText(ci, chatTTL, showMember, linkMode, uriHandler)
                 }

apps/android/app/src/main/java/chat/simplex/app/views/chat/item/MarkedDeletedItemView.kt

@@ -19,7 +19,6 @@ import chat.simplex.app.model.CIDeleted
 import chat.simplex.app.model.ChatItem
 import chat.simplex.app.ui.theme.*
 import chat.simplex.app.views.helpers.generalGetString
-import kotlinx.datetime.Clock
 
 @Composable
 fun MarkedDeletedItemView(ci: ChatItem, timedMessagesTTL: Int?, showMember: Boolean = false) {
@@ -68,7 +67,7 @@ private fun MarkedDeletedText(text: String) {
 fun PreviewMarkedDeletedItemView() {
   SimpleXTheme {
     DeletedItemView(
-      ChatItem.getSampleData(itemDeleted = CIDeleted.Deleted(Clock.System.now())),
+      ChatItem.getSampleData(itemDeleted = CIDeleted.Deleted()),
       null
     )
   }

apps/android/app/src/main/java/chat/simplex/app/views/chatlist/ChatHelpView.kt

@@ -8,6 +8,7 @@ import androidx.compose.ui.res.painterResource
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.LocalUriHandler
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.SpanStyle
 import androidx.compose.ui.text.font.FontWeight
@@ -17,7 +18,7 @@ import androidx.compose.ui.unit.sp
 import chat.simplex.app.R
 import chat.simplex.app.ui.theme.SimpleXTheme
 import chat.simplex.app.views.helpers.annotatedStringResource
-import chat.simplex.app.views.onboarding.ReadableTextWithLink
+import chat.simplex.app.views.helpers.openUriCatching
 import chat.simplex.app.views.usersettings.MarkdownHelpView
 import chat.simplex.app.views.usersettings.simplexTeamUri
 
@@ -28,8 +29,17 @@ fun ChatHelpView(addContact: (() -> Unit)? = null) {
   Column(
     verticalArrangement = Arrangement.spacedBy(10.dp)
   ) {
+    val uriHandler = LocalUriHandler.current
+
     Text(stringResource(R.string.thank_you_for_installing_simplex), lineHeight = 22.sp)
-    ReadableTextWithLink(R.string.you_can_connect_to_simplex_chat_founder, simplexTeamUri)
+    Text(
+      annotatedStringResource(R.string.you_can_connect_to_simplex_chat_founder),
+      modifier = Modifier.clickable(onClick = {
+        uriHandler.openUriCatching(simplexTeamUri)
+      }),
+      lineHeight = 22.sp
+    )
+
     Column(
       Modifier.padding(top = 24.dp),
       verticalArrangement = Arrangement.spacedBy(10.dp)

apps/android/app/src/main/java/chat/simplex/app/views/chatlist/ShareListView.kt

@@ -35,6 +35,7 @@ fun ShareListView(chatModel: ChatModel, stopped: Boolean) {
       Column(
         modifier = Modifier
           .fillMaxSize()
+          .themedBackground()
       ) {
         if (chatModel.chats.isNotEmpty()) {
           ShareList(chatModel, search = searchInList)

apps/android/app/src/main/java/chat/simplex/app/views/database/DatabaseView.kt

@@ -64,6 +64,7 @@ fun DatabaseView(
       importArchiveAlert(m, context, uri, appFilesCountAndSize, progressIndicator)
     }
   }
+  val chatDbDeleted = remember { m.chatDbDeleted }
   LaunchedEffect(m.chatRunning) {
     runChat.value = m.chatRunning.value ?: true
   }
@@ -82,6 +83,7 @@ fun DatabaseView(
       chatArchiveName,
       chatArchiveTime,
       chatLastStart,
+      chatDbDeleted.value,
       m.controller.appPrefs.privacyFullBackup,
       appFilesCountAndSize,
       chatItemTTL,
@@ -132,6 +134,7 @@ fun DatabaseLayout(
   chatArchiveName: MutableState<String?>,
   chatArchiveTime: MutableState<Instant?>,
   chatLastStart: MutableState<Instant?>,
+  chatDbDeleted: Boolean,
   privacyFullBackup: SharedPreference<Boolean>,
   appFilesCountAndSize: MutableState<Pair<Int, Long>>,
   chatItemTTL: MutableState<ChatItemTTL>,
@@ -170,7 +173,7 @@ fun DatabaseLayout(
     SectionDividerSpaced(maxTopPadding = true)
 
     SectionView(stringResource(R.string.run_chat_section)) {
-      RunChatSetting(runChat, stopped, startChat, stopChatAlert)
+      RunChatSetting(runChat, stopped, chatDbDeleted, startChat, stopChatAlert)
     }
     SectionDividerSpaced()
 
@@ -327,6 +330,7 @@ private fun TtlOptions(current: State<ChatItemTTL>, enabled: State<Boolean>, onS
 fun RunChatSetting(
   runChat: Boolean,
   stopped: Boolean,
+  chatDbDeleted: Boolean,
   startChat: () -> Unit,
   stopChatAlert: () -> Unit
 ) {
@@ -337,6 +341,7 @@ fun RunChatSetting(
     iconColor = if (stopped) Color.Red else MaterialTheme.colors.primary,
   ) {
     DefaultSwitch(
+      enabled = !chatDbDeleted,
       checked = runChat,
       onCheckedChange = { runChatSwitch ->
         if (runChatSwitch) {
@@ -366,14 +371,9 @@ private fun startChat(m: ChatModel, runChat: MutableState<Boolean?>, chatLastSta
         ModalManager.shared.closeModals()
         return@withApi
       }
-      if (m.currentUser.value == null) {
-        ModalManager.shared.closeModals()
-        return@withApi
-      } else {
-        m.controller.apiStartChat()
-        runChat.value = true
-        m.chatRunning.value = true
-      }
+      m.controller.apiStartChat()
+      runChat.value = true
+      m.chatRunning.value = true
       val ts = Clock.System.now()
       m.controller.appPrefs.chatLastStart.set(ts)
       chatLastStart.value = ts
@@ -410,7 +410,7 @@ private fun authStopChat(m: ChatModel, runChat: MutableState<Boolean?>, context:
     authenticate(
       generalGetString(R.string.auth_stop_chat),
       generalGetString(R.string.auth_log_in_using_credential),
-      activity = context as FragmentActivity,
+      context as FragmentActivity,
       completed = { laResult ->
         when (laResult) {
           LAResult.Success, is LAResult.Unavailable -> {
@@ -433,28 +433,18 @@ private fun authStopChat(m: ChatModel, runChat: MutableState<Boolean?>, context:
 private fun stopChat(m: ChatModel, runChat: MutableState<Boolean?>, context: Context) {
   withApi {
     try {
+      m.controller.apiStopChat()
       runChat.value = false
-      stopChatAsync(m)
-      SimplexService.safeStopService(SimplexApp.context)
+      m.chatRunning.value = false
+      SimplexService.safeStopService(context)
       MessagesFetcherWorker.cancelAll()
     } catch (e: Error) {
       runChat.value = true
-      AlertManager.shared.showAlertMsg(generalGetString(R.string.error_stopping_chat), e.toString())
+      AlertManager.shared.showAlertMsg(generalGetString(R.string.error_starting_chat), e.toString())
     }
   }
 }
 
-suspend fun stopChatAsync(m: ChatModel) {
-  m.controller.apiStopChat()
-  m.chatRunning.value = false
-}
-
-suspend fun deleteChatAsync(m: ChatModel) {
-  m.controller.apiDeleteStorage()
-  DatabaseUtils.ksDatabasePassword.remove()
-  m.controller.appPrefs.storeDBPassphrase.set(true)
-}
-
 private fun exportArchive(
   context: Context,
   m: ChatModel,
@@ -629,7 +619,10 @@ private fun deleteChat(m: ChatModel, progressIndicator: MutableState<Boolean>) {
   progressIndicator.value = true
   withApi {
     try {
-      deleteChatAsync(m)
+      m.controller.apiDeleteStorage()
+      m.chatDbDeleted.value = true
+      DatabaseUtils.ksDatabasePassword.remove()
+      m.controller.appPrefs.storeDBPassphrase.set(true)
       operationEnded(m, progressIndicator) {
         AlertManager.shared.showAlertMsg(generalGetString(R.string.chat_database_deleted), generalGetString(R.string.restart_the_app_to_create_a_new_chat_profile))
       }
@@ -724,6 +717,7 @@ fun PreviewDatabaseLayout() {
       chatArchiveName = remember { mutableStateOf("dummy_archive") },
       chatArchiveTime = remember { mutableStateOf(Clock.System.now()) },
       chatLastStart = remember { mutableStateOf(Clock.System.now()) },
+      chatDbDeleted = false,
       privacyFullBackup = SharedPreference({ true }, {}),
       appFilesCountAndSize = remember { mutableStateOf(0 to 0L) },
       chatItemTTL = remember { mutableStateOf(ChatItemTTL.None) },

apps/android/app/src/main/java/chat/simplex/app/views/helpers/CloseSheetBar.kt

@@ -12,7 +12,6 @@ import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.tooling.preview.Preview
-import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
 import chat.simplex.app.ui.theme.*
 
@@ -44,7 +43,7 @@ fun CloseSheetBar(close: (() -> Unit)?, endButtons: @Composable RowScope.() -> U
 }
 
 @Composable
-fun AppBarTitle(title: String, withPadding: Boolean = true, bottomPadding: Dp = DEFAULT_PADDING * 1.5f) {
+fun AppBarTitle(title: String, withPadding: Boolean = true) {
   val theme = CurrentColors.collectAsState()
   val titleColor = CurrentColors.collectAsState().value.appColors.title
   val brush = if (theme.value.base == DefaultTheme.SIMPLEX)
@@ -55,7 +54,7 @@ fun AppBarTitle(title: String, withPadding: Boolean = true, bottomPadding: Dp =
     title,
     Modifier
       .fillMaxWidth()
-      .padding(bottom = bottomPadding, start = if (withPadding) DEFAULT_PADDING else 0.dp, end = if (withPadding) DEFAULT_PADDING else 0.dp,),
+      .padding(bottom = DEFAULT_PADDING * 1.5f, start = if (withPadding) DEFAULT_PADDING else 0.dp, end = if (withPadding) DEFAULT_PADDING else 0.dp,),
     overflow = TextOverflow.Ellipsis,
     style = MaterialTheme.typography.h1.copy(brush = brush),
     color = MaterialTheme.colors.primaryVariant,

apps/android/app/src/main/java/chat/simplex/app/views/helpers/CustomTimePicker.kt

@@ -1,290 +0,0 @@
-package chat.simplex.app.views.helpers
-
-import androidx.compose.foundation.clickable
-import androidx.compose.foundation.layout.*
-import androidx.compose.foundation.shape.CornerSize
-import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.material.*
-import androidx.compose.runtime.*
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.res.painterResource
-import androidx.compose.ui.unit.dp
-import androidx.compose.ui.unit.sp
-import androidx.compose.ui.window.Dialog
-import chat.simplex.app.R
-import chat.simplex.app.model.*
-import chat.simplex.app.ui.theme.DEFAULT_PADDING
-import com.sd.lib.compose.wheel_picker.*
-
-@Composable
-fun CustomTimePicker(
-  selection: MutableState<Int>,
-  timeUnitsLimits: List<TimeUnitLimits> = TimeUnitLimits.defaultUnitsLimits
-) {
-  fun getUnitValues(unit: CustomTimeUnit, selectedValue: Int): List<Int> {
-    val unitLimits = timeUnitsLimits.firstOrNull { it.timeUnit == unit } ?: TimeUnitLimits.defaultUnitLimits(unit)
-    val regularUnitValues = (unitLimits.minValue..unitLimits.maxValue).toList()
-    return regularUnitValues + if (regularUnitValues.contains(selectedValue)) emptyList() else listOf(selectedValue)
-  }
-
-  val (unit, duration) = CustomTimeUnit.toTimeUnit(selection.value)
-  val selectedUnit: MutableState<CustomTimeUnit> = remember { mutableStateOf(unit) }
-  val selectedDuration = remember { mutableStateOf(duration) }
-  val selectedUnitValues = remember { mutableStateOf(getUnitValues(selectedUnit.value, selectedDuration.value)) }
-  val isTriggered = remember { mutableStateOf(false) }
-
-  LaunchedEffect(selectedUnit.value) {
-    // on initial composition, if passed selection doesn't fit into picker bounds, so that selectedDuration is bigger than selectedUnit maxValue
-    // (e.g., for selection = 121 seconds: selectedUnit would be Second, selectedDuration would be 121 > selectedUnit maxValue of 120),
-    // selectedDuration would've been replaced by maxValue - isTriggered check prevents this by skipping LaunchedEffect on initial composition
-    if (isTriggered.value) {
-      val maxValue = timeUnitsLimits.firstOrNull { it.timeUnit == selectedUnit.value }?.maxValue
-      if (maxValue != null && selectedDuration.value > maxValue) {
-        selectedDuration.value = maxValue
-        selectedUnitValues.value = getUnitValues(selectedUnit.value, selectedDuration.value)
-      } else {
-        selectedUnitValues.value = getUnitValues(selectedUnit.value, selectedDuration.value)
-        selection.value = selectedUnit.value.toSeconds * selectedDuration.value
-      }
-    } else {
-      isTriggered.value = true
-    }
-  }
-
-  LaunchedEffect(selectedDuration.value) {
-    selection.value = selectedUnit.value.toSeconds * selectedDuration.value
-  }
-
-  Row(
-    Modifier
-      .fillMaxWidth()
-      .padding(horizontal = DEFAULT_PADDING),
-    horizontalArrangement = Arrangement.spacedBy(0.dp)
-  ) {
-    Column(Modifier.weight(1f)) {
-      val durationPickerState = rememberFWheelPickerState(selectedUnitValues.value.indexOf(selectedDuration.value))
-      FVerticalWheelPicker(
-        count = selectedUnitValues.value.count(),
-        state = durationPickerState,
-        unfocusedCount = 2,
-        focus = {
-          FWheelPickerFocusVertical(dividerColor = MaterialTheme.colors.primary)
-        }
-      ) { index ->
-        Text(
-          selectedUnitValues.value[index].toString(),
-          fontSize = 18.sp,
-          color = MaterialTheme.colors.primary
-        )
-      }
-      LaunchedEffect(durationPickerState) {
-        snapshotFlow { durationPickerState.currentIndex }
-          .collect {
-            selectedDuration.value = selectedUnitValues.value[it]
-          }
-      }
-    }
-    Column(Modifier.weight(1f)) {
-      val unitPickerState = rememberFWheelPickerState(timeUnitsLimits.indexOfFirst { it.timeUnit == selectedUnit.value })
-      FVerticalWheelPicker(
-        count = timeUnitsLimits.count(),
-        state = unitPickerState,
-        unfocusedCount = 2,
-        focus = {
-          FWheelPickerFocusVertical(dividerColor = MaterialTheme.colors.primary)
-        }
-      ) { index ->
-        Text(
-          timeUnitsLimits[index].timeUnit.text,
-          fontSize = 18.sp,
-          color = MaterialTheme.colors.primary
-        )
-      }
-      LaunchedEffect(unitPickerState) {
-        snapshotFlow { unitPickerState.currentIndex }
-          .collect {
-            selectedUnit.value = timeUnitsLimits[it].timeUnit
-          }
-      }
-    }
-  }
-}
-
-data class TimeUnitLimits(
-  val timeUnit: CustomTimeUnit,
-  val minValue: Int = 1,
-  val maxValue: Int
-) {
-  companion object {
-    fun defaultUnitLimits(unit: CustomTimeUnit): TimeUnitLimits {
-      return when (unit) {
-        CustomTimeUnit.Second -> TimeUnitLimits(CustomTimeUnit.Second, maxValue = 120)
-        CustomTimeUnit.Minute -> TimeUnitLimits(CustomTimeUnit.Minute, maxValue = 120)
-        CustomTimeUnit.Hour -> TimeUnitLimits(CustomTimeUnit.Hour, maxValue = 72)
-        CustomTimeUnit.Day -> TimeUnitLimits(CustomTimeUnit.Day, maxValue = 60)
-        CustomTimeUnit.Week -> TimeUnitLimits(CustomTimeUnit.Week, maxValue = 12) // TODO in 5.2 - 54
-        CustomTimeUnit.Month -> TimeUnitLimits(CustomTimeUnit.Month, maxValue = 3) // TODO in 5.2 - 12
-      }
-    }
-
-    val defaultUnitsLimits: List<TimeUnitLimits>
-      get() = listOf(
-        defaultUnitLimits(CustomTimeUnit.Second),
-        defaultUnitLimits(CustomTimeUnit.Minute),
-        defaultUnitLimits(CustomTimeUnit.Hour),
-        defaultUnitLimits(CustomTimeUnit.Day),
-        defaultUnitLimits(CustomTimeUnit.Week),
-        defaultUnitLimits(CustomTimeUnit.Month)
-      )
-  }
-}
-
-@Composable
-fun CustomTimePickerDialog(
-  selection: MutableState<Int>,
-  timeUnitsLimits: List<TimeUnitLimits> = TimeUnitLimits.defaultUnitsLimits,
-  title: String,
-  confirmButtonText: String,
-  confirmButtonAction: (Int) -> Unit,
-  cancel: () -> Unit
-) {
-  Dialog(onDismissRequest = cancel) {
-    Surface(
-      shape = RoundedCornerShape(corner = CornerSize(25.dp))
-    ) {
-      Box(
-        contentAlignment = Alignment.Center
-      ) {
-        Column(
-          modifier = Modifier.padding(DEFAULT_PADDING),
-          verticalArrangement = Arrangement.spacedBy(6.dp),
-          horizontalAlignment = Alignment.CenterHorizontally
-        ) {
-          Row(
-            modifier = Modifier.fillMaxWidth(),
-            horizontalArrangement = Arrangement.SpaceBetween,
-            verticalAlignment = Alignment.CenterVertically
-          ) {
-            Text(" ") // centers title
-            Text(
-              title,
-              fontSize = 16.sp,
-              color = MaterialTheme.colors.secondary
-            )
-            Icon(
-              painterResource(R.drawable.ic_close),
-              generalGetString(R.string.icon_descr_close_button),
-              tint = MaterialTheme.colors.secondary,
-              modifier = Modifier
-                .size(25.dp)
-                .clickable { cancel() }
-            )
-          }
-
-          CustomTimePicker(
-            selection,
-            timeUnitsLimits
-          )
-
-          TextButton(onClick = { confirmButtonAction(selection.value) }) {
-            Text(
-              confirmButtonText,
-              fontSize = 18.sp,
-              color = MaterialTheme.colors.primary
-            )
-          }
-        }
-      }
-    }
-  }
-}
-
-@Composable
-fun DropdownCustomTimePickerSettingRow(
-  selection: MutableState<Int?>,
-  propagateExternalSelectionUpdate: Boolean = false,
-  label: String,
-  dropdownValues: List<Int?>,
-  customPickerTitle: String,
-  customPickerConfirmButtonText: String,
-  customPickerTimeUnitsLimits: List<TimeUnitLimits> = TimeUnitLimits.defaultUnitsLimits,
-  onSelected: (Int?) -> Unit
-) {
-  fun getValues(selectedValue: Int?): List<DropdownSelection> =
-    dropdownValues.map { DropdownSelection.DropdownValue(it) } +
-        (if (dropdownValues.contains(selectedValue)) listOf() else listOf(DropdownSelection.DropdownValue(selectedValue))) +
-        listOf(DropdownSelection.Custom)
-
-  val dropdownSelection: MutableState<DropdownSelection> = remember { mutableStateOf(DropdownSelection.DropdownValue(selection.value)) }
-  val values: MutableState<List<DropdownSelection>> = remember { mutableStateOf(getValues(selection.value)) }
-  val showCustomTimePicker = remember { mutableStateOf(false) }
-
-  fun updateValue(selectedValue: Int?) {
-    values.value = getValues(selectedValue)
-    dropdownSelection.value = DropdownSelection.DropdownValue(selectedValue)
-    onSelected(selectedValue)
-  }
-
-  if (propagateExternalSelectionUpdate) {
-    LaunchedEffect(selection.value) {
-      values.value = getValues(selection.value)
-      dropdownSelection.value = DropdownSelection.DropdownValue(selection.value)
-    }
-  }
-
-  ExposedDropDownSettingRow(
-    label,
-    values.value.map { sel: DropdownSelection ->
-      when (sel) {
-        is DropdownSelection.DropdownValue -> sel to timeText(sel.value)
-        DropdownSelection.Custom -> sel to generalGetString(R.string.custom_time_picker_custom)
-      }
-    },
-    dropdownSelection,
-    onSelected = { sel: DropdownSelection ->
-      when (sel) {
-        is DropdownSelection.DropdownValue -> updateValue(sel.value)
-        DropdownSelection.Custom -> showCustomTimePicker.value = true
-      }
-    }
-  )
-
-  if (showCustomTimePicker.value) {
-    val selectedCustomTime = remember { mutableStateOf(selection.value ?: 86400) }
-    CustomTimePickerDialog(
-      selectedCustomTime,
-      timeUnitsLimits = customPickerTimeUnitsLimits,
-      title = customPickerTitle,
-      confirmButtonText = customPickerConfirmButtonText,
-      confirmButtonAction = { time ->
-        updateValue(time)
-        showCustomTimePicker.value = false
-      },
-      cancel = {
-        dropdownSelection.value = DropdownSelection.DropdownValue(selection.value)
-        showCustomTimePicker.value = false
-      }
-    )
-  }
-}
-
-private sealed class DropdownSelection {
-  data class DropdownValue(val value: Int?): DropdownSelection()
-  object Custom: DropdownSelection()
-
-  override fun equals(other: Any?): Boolean =
-    other is DropdownSelection &&
-        when (other) {
-          is DropdownValue -> this is DropdownValue && this.value == other.value
-          is Custom -> this is Custom
-        }
-
-  override fun hashCode(): Int =
-    // DO NOT REMOVE the as? cast as it will turn them into recursive hashCode calls
-    // https://youtrack.jetbrains.com/issue/KT-31239
-    when (this) {
-      is DropdownValue -> (this as? DropdownValue).hashCode()
-      is Custom -> (this as? Custom).hashCode()
-    }
-}

apps/android/app/src/main/java/chat/simplex/app/views/helpers/DatabaseUtils.kt

@@ -18,11 +18,9 @@ object DatabaseUtils {
 
   private const val DATABASE_PASSWORD_ALIAS: String = "databasePassword"
   private const val APP_PASSWORD_ALIAS: String = "appPassword"
-  private const val SELF_DESTRUCT_PASSWORD_ALIAS: String = "selfDestructPassword"
 
   val ksDatabasePassword = KeyStoreItem(DATABASE_PASSWORD_ALIAS, appPreferences.encryptedDBPassphrase, appPreferences.initializationVectorDBPassphrase)
   val ksAppPassword = KeyStoreItem(APP_PASSWORD_ALIAS, appPreferences.encryptedAppPassphrase, appPreferences.initializationVectorAppPassphrase)
-  val ksSelfDestructPassword = KeyStoreItem(SELF_DESTRUCT_PASSWORD_ALIAS, appPreferences.encryptedSelfDestructPassphrase, appPreferences.initializationVectorSelfDestructPassphrase)
 
   class KeyStoreItem(private val alias: String, val passphrase: SharedPreference<String?>, val initVector: SharedPreference<String?>) {
     fun get(): String? {

apps/android/app/src/main/java/chat/simplex/app/views/helpers/LinkPreviews.kt

@@ -77,7 +77,7 @@ suspend fun getLinkPreview(url: String): LinkPreview? {
 }
 
 @Composable
-fun ComposeLinkView(linkPreview: LinkPreview?, cancelPreview: () -> Unit, cancelEnabled: Boolean) {
+fun ComposeLinkView(linkPreview: LinkPreview?, cancelPreview: () -> Unit) {
   val sentColor = CurrentColors.collectAsState().value.appColors.sentMessage
   Row(
     Modifier.fillMaxWidth().padding(top = 8.dp).background(sentColor),
@@ -109,15 +109,13 @@ fun ComposeLinkView(linkPreview: LinkPreview?, cancelPreview: () -> Unit, cancel
         )
       }
     }
-    if (cancelEnabled) {
-      IconButton(onClick = cancelPreview, modifier = Modifier.padding(0.dp)) {
-        Icon(
-          painterResource(R.drawable.ic_close),
-          contentDescription = stringResource(R.string.icon_descr_cancel_link_preview),
-          tint = MaterialTheme.colors.primary,
-          modifier = Modifier.padding(10.dp)
-        )
-      }
+    IconButton(onClick = cancelPreview, modifier = Modifier.padding(0.dp)) {
+      Icon(
+        painterResource(R.drawable.ic_close),
+        contentDescription = stringResource(R.string.icon_descr_cancel_link_preview),
+        tint = MaterialTheme.colors.primary,
+        modifier = Modifier.padding(10.dp)
+      )
     }
   }
 }
@@ -195,7 +193,7 @@ fun PreviewChatItemLinkView() {
 @Composable
 fun PreviewComposeLinkView() {
   SimpleXTheme {
-    ComposeLinkView(LinkPreview.sampleData, cancelPreview = { -> }, true)
+    ComposeLinkView(LinkPreview.sampleData) { -> }
   }
 }
 
@@ -203,6 +201,6 @@ fun PreviewComposeLinkView() {
 @Composable
 fun PreviewComposeLinkViewLoading() {
   SimpleXTheme {
-    ComposeLinkView(null, cancelPreview = { -> }, true)
+    ComposeLinkView(null) { -> }
   }
 }

apps/android/app/src/main/java/chat/simplex/app/views/helpers/LocalAuthentication.kt

@@ -28,18 +28,16 @@ data class LocalAuthRequest (
   val title: String?,
   val reason: String,
   val password: String,
-  val selfDestruct: Boolean,
   val completed: (LAResult) -> Unit
 ) {
   companion object {
-    val sample = LocalAuthRequest(generalGetString(R.string.la_enter_app_passcode), generalGetString(R.string.la_authenticate), "", selfDestruct = false) { }
+    val sample = LocalAuthRequest(generalGetString(R.string.la_enter_app_passcode), generalGetString(R.string.la_authenticate), "") { }
   }
 }
 
 fun authenticate(
   promptTitle: String,
   promptSubtitle: String,
-  selfDestruct: Boolean = false,
   activity: FragmentActivity,
   usingLAMode: LAMode = SimplexApp.context.chatModel.controller.appPrefs.laMode.get(),
   completed: (LAResult) -> Unit
@@ -55,13 +53,13 @@ fun authenticate(
     }
     LAMode.PASSCODE -> {
       val password = ksAppPassword.get() ?: return completed(LAResult.Unavailable(generalGetString(R.string.la_no_app_password)))
-      ModalManager.shared.showPasscodeCustomModal { close ->
+      ModalManager.shared.showCustomModal(animated = false) { close ->
         BackHandler {
           close()
           completed(LAResult.Error(generalGetString(R.string.authentication_cancelled)))
         }
         Surface(Modifier.fillMaxSize(), color = MaterialTheme.colors.background) {
-          LocalAuthView(SimplexApp.context.chatModel, LocalAuthRequest(promptTitle, promptSubtitle, password, selfDestruct && SimplexApp.context.chatModel.controller.appPrefs.selfDestruct.get()) {
+          LocalAuthView(SimplexApp.context.chatModel, LocalAuthRequest(promptTitle, promptSubtitle, password) {
             close()
             completed(it)
           })

apps/android/app/src/main/java/chat/simplex/app/views/helpers/ModalView.kt

@@ -37,7 +37,6 @@ class ModalManager {
   private val modalCount = mutableStateOf(0)
   private val toRemove = mutableSetOf<Int>()
   private var oldViewChanging = AtomicBoolean(false)
-  private var passcodeView: MutableState<(@Composable (close: () -> Unit) -> Unit)?> = mutableStateOf(null)
 
   fun showModal(settings: Boolean = false, endButtons: @Composable RowScope.() -> Unit = {}, content: @Composable () -> Unit) {
     showCustomModal { close ->
@@ -52,7 +51,7 @@ class ModalManager {
   }
 
   fun showCustomModal(animated: Boolean = true, modal: @Composable (close: () -> Unit) -> Unit) {
-    Log.d(TAG, "ModalManager.showCustomModal")
+    Log.d(TAG, "ModalManager.showModal")
     // Means, animation is in progress or not started yet. Do not wait until animation finishes, just remove all from screen.
     // This is useful when invoking close() and ShowCustomModal one after another without delay. Otherwise, screen will hold prev view
     if (toRemove.isNotEmpty()) {
@@ -62,11 +61,6 @@ class ModalManager {
     modalCount.value = modalViews.size - toRemove.size
   }
 
-  fun showPasscodeCustomModal(modal: @Composable (close: () -> Unit) -> Unit) {
-    Log.d(TAG, "ModalManager.showPasscodeCustomModal")
-    passcodeView.value = modal
-  }
-
   fun hasModalsOpen() = modalCount.value > 0
 
   fun closeModal() {
@@ -78,9 +72,7 @@ class ModalManager {
   }
 
   fun closeModals() {
-    modalViews.clear()
-    toRemove.clear()
-    modalCount.value = 0
+    while (modalCount.value > 0) closeModal()
   }
 
   @OptIn(ExperimentalAnimationApi::class)
@@ -108,11 +100,6 @@ class ModalManager {
     }
   }
 
-  @Composable
-  fun showPasscodeInView() {
-    remember { passcodeView }.value?.invoke { passcodeView.value = null }
-  }
-
   /**
   * Allows to modify a list without getting [ConcurrentModificationException]
   * */

apps/android/app/src/main/java/chat/simplex/app/views/helpers/RecAndPlay.kt

@@ -21,7 +21,7 @@ interface Recorder {
   fun stop(): Int
 }
 
-class RecorderNative(): Recorder {
+class RecorderNative(private val recordedBytesLimit: Long): Recorder {
   companion object {
     // Allows to stop the recorder from outside without having the recorder in a variable
     var stopRecording: (() -> Unit)? = null
@@ -48,8 +48,9 @@ class RecorderNative(): Recorder {
     rec.setAudioEncoder(MediaRecorder.AudioEncoder.AAC)
     rec.setAudioChannels(1)
     rec.setAudioSamplingRate(16000)
-    rec.setAudioEncodingBitRate(32000)
+    rec.setAudioEncodingBitRate(16000)
     rec.setMaxDuration(MAX_VOICE_MILLIS_FOR_SENDING)
+    rec.setMaxFileSize(recordedBytesLimit)
     val tmpDir = SimplexApp.context.getDir("temp", Application.MODE_PRIVATE)
     val fileToSave = File.createTempFile(generateNewFileName(SimplexApp.context, "voice", "${extension}_"), ".tmp", tmpDir)
     fileToSave.deleteOnExit()
@@ -273,13 +274,6 @@ object AudioPlayer {
     audioPlaying.value = false
   }
 
-  fun seekTo(ms: Int, pro: MutableState<Int>, filePath: String?) {
-    pro.value = ms
-    if (this.currentlyPlaying.value?.first == filePath) {
-      player.seekTo(ms)
-    }
-  }
-
   fun duration(filePath: String): Int? {
     var res: Int? = null
     kotlin.runCatching {

apps/android/app/src/main/java/chat/simplex/app/views/helpers/Section.kt

@@ -202,9 +202,9 @@ fun SectionDividerSpaced(maxTopPadding: Boolean = false, maxBottomPadding: Boole
   Divider(
     Modifier.padding(
       start = DEFAULT_PADDING_HALF,
-      top = if (maxTopPadding) 37.dp else 27.dp,
+      top = if (maxTopPadding) 40.dp else 30.dp,
       end = DEFAULT_PADDING_HALF,
-      bottom = if (maxBottomPadding) 37.dp else 27.dp)
+      bottom = if (maxBottomPadding) 40.dp else 30.dp)
   )
 }
 

apps/android/app/src/main/java/chat/simplex/app/views/helpers/Share.kt

@@ -4,7 +4,6 @@ import android.Manifest
 import android.content.*
 import android.net.Uri
 import android.provider.MediaStore
-import android.util.Log
 import android.webkit.MimeTypeMap
 import android.widget.Toast
 import androidx.activity.compose.ManagedActivityResultLauncher
@@ -49,17 +48,6 @@ fun copyText(cxt: Context, text: String) {
   clipboard?.setPrimaryClip(ClipData.newPlainText("text", text))
 }
 
-fun sendEmail(context: Context, subject: String, body: CharSequence) {
-  val emailIntent = Intent(Intent.ACTION_SENDTO, Uri.parse("mailto:"))
-  emailIntent.putExtra(Intent.EXTRA_SUBJECT, subject)
-  emailIntent.putExtra(Intent.EXTRA_TEXT, body)
-  try {
-    context.startActivity(emailIntent)
-  } catch (e: ActivityNotFoundException) {
-    Log.e(TAG, "No activity was found for handling email intent")
-  }
-}
-
 @Composable
 fun rememberSaveFileLauncher(cxt: Context, ciFile: CIFile?): ManagedActivityResultLauncher<String, Uri?> =
   rememberLauncherForActivityResult(

apps/android/app/src/main/java/chat/simplex/app/views/helpers/SimpleButton.kt

@@ -79,7 +79,7 @@ fun SimpleButtonIconEnded(
 }
 
 @Composable
-fun SimpleButtonFrame(click: () -> Unit, modifier: Modifier = Modifier, disabled: Boolean = false, content: @Composable RowScope.() -> Unit) {
+fun SimpleButtonFrame(click: () -> Unit, modifier: Modifier = Modifier, disabled: Boolean = false, content: @Composable () -> Unit) {
   Box(Modifier.clip(RoundedCornerShape(20.dp))) {
     val modifier = if (disabled) modifier else modifier.clickable { click() }
     Row(

apps/android/app/src/main/java/chat/simplex/app/views/helpers/TextEditor.kt

@@ -1,117 +1,64 @@
 package chat.simplex.app.views.helpers
 
-import android.util.Log
-import androidx.compose.foundation.interaction.MutableInteractionSource
+import androidx.compose.foundation.BorderStroke
+import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.*
+import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.foundation.text.BasicTextField
 import androidx.compose.foundation.text.KeyboardOptions
-import androidx.compose.foundation.text.selection.SelectionContainer
-import androidx.compose.material.*
-import androidx.compose.runtime.*
-import androidx.compose.runtime.saveable.rememberSaveable
+import androidx.compose.material.MaterialTheme
+import androidx.compose.material.Surface
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.MutableState
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.focus.*
 import androidx.compose.ui.graphics.*
 import androidx.compose.ui.text.TextStyle
+import androidx.compose.ui.text.font.FontFamily
 import androidx.compose.ui.text.input.KeyboardCapitalization
-import androidx.compose.ui.text.input.VisualTransformation
 import androidx.compose.ui.unit.*
-import chat.simplex.app.TAG
-import chat.simplex.app.chatParseMarkdown
-import chat.simplex.app.model.*
-import chat.simplex.app.ui.theme.*
-import chat.simplex.app.views.chat.item.MarkdownText
-import com.google.accompanist.insets.navigationBarsWithImePadding
-import kotlinx.coroutines.flow.distinctUntilChanged
-import kotlinx.serialization.Serializable
-import java.lang.Exception
+import chat.simplex.app.ui.theme.DEFAULT_PADDING
 
 @Composable
 fun TextEditor(
-  value: MutableState<String>,
   modifier: Modifier,
-  placeholder: String? = null,
-  contentPadding: PaddingValues = PaddingValues(horizontal = DEFAULT_PADDING),
-  isValid: (String) -> Boolean = { true },
-  focusRequester: FocusRequester? = null
+  text: MutableState<String>,
+  border: Boolean = true,
+  fontSize: TextUnit = 14.sp,
+  background: Color = MaterialTheme.colors.background,
+  onChange: ((String) -> Unit)? = null
 ) {
-  var valid by rememberSaveable { mutableStateOf(true) }
-  var focused by rememberSaveable { mutableStateOf(false) }
-  val strokeColor by remember {
-    derivedStateOf {
-      if (valid) {
-        if (focused) {
-          CurrentColors.value.colors.secondary.copy(alpha = 0.6f)
-        } else {
-          CurrentColors.value.colors.secondary.copy(alpha = 0.3f)
+  BasicTextField(
+    value = text.value,
+    onValueChange = { text.value = it; onChange?.invoke(it) },
+    textStyle = TextStyle(
+      fontFamily = FontFamily.Monospace, fontSize = fontSize,
+      color = MaterialTheme.colors.onBackground
+    ),
+    keyboardOptions = KeyboardOptions.Default.copy(
+      capitalization = KeyboardCapitalization.None,
+      autoCorrect = false
+    ),
+    modifier = modifier,
+    cursorBrush = SolidColor(MaterialTheme.colors.secondary),
+    decorationBox = { innerTextField ->
+      Surface(
+        shape = if (border) RoundedCornerShape(10.dp) else RectangleShape,
+        border = if (border) BorderStroke(1.dp, MaterialTheme.colors.secondaryVariant) else null
+      ) {
+        Row(
+          Modifier.background(background),
+          verticalAlignment = Alignment.Top
+        ) {
+          Box(
+            Modifier
+              .weight(1f)
+              .padding(vertical = 5.dp, horizontal = if (border) 7.dp else DEFAULT_PADDING)
+          ) {
+            innerTextField()
+          }
         }
-      } else Color.Red
+      }
     }
-  }
-  Box(
-    Modifier
-      .fillMaxWidth()
-      .padding(contentPadding)
-      .heightIn(min = 52.dp),
-//      .border(border = BorderStroke(1.dp, strokeColor), shape = RoundedCornerShape(26.dp)),
-    contentAlignment = Alignment.Center,
-  ) {
-    val modifier = modifier
-      .fillMaxWidth()
-      .navigationBarsWithImePadding()
-      .onFocusChanged { focused = it.isFocused }
-
-    BasicTextField(
-      value = value.value,
-      onValueChange = { value.value = it },
-      modifier = if (focusRequester == null) modifier else modifier.focusRequester(focusRequester),
-      textStyle = MaterialTheme.typography.body1.copy(color = MaterialTheme.colors.onBackground, lineHeight = 22.sp),
-      keyboardOptions = KeyboardOptions(
-        capitalization = KeyboardCapitalization.None,
-        autoCorrect = false
-      ),
-      singleLine = false,
-      maxLines = 5,
-      cursorBrush = SolidColor(MaterialTheme.colors.secondary),
-      decorationBox = @Composable { innerTextField ->
-        TextFieldDefaults.TextFieldDecorationBox(
-          value = value.value,
-          innerTextField = innerTextField,
-          placeholder = if (placeholder != null) {{ Text(placeholder, style = MaterialTheme.typography.body1.copy(color = MaterialTheme.colors.secondary, lineHeight = 22.sp)) }} else null,
-          contentPadding = PaddingValues(),
-          label = null,
-          visualTransformation = VisualTransformation.None,
-          leadingIcon = null,
-          trailingIcon = null,
-          singleLine = false,
-          enabled = true,
-          isError = false,
-          interactionSource = remember { MutableInteractionSource() },
-        )
-      }
-    )
-  }
-  LaunchedEffect(Unit) {
-    snapshotFlow { value.value }
-      .distinctUntilChanged()
-      .collect {
-        valid = isValid(it)
-      }
-  }
-}
-
-@Serializable
-data class ParsedFormattedText(
-  val formattedText: List<FormattedText>? = null
-)
-
-fun parseToMarkdown(text: String): List<FormattedText>? {
-  val formatted = chatParseMarkdown(text)
-  return try {
-    json.decodeFromString(ParsedFormattedText.serializer(), formatted).formattedText
-  } catch (e: Exception) {
-    Log.e(TAG, "Failed to parse into markdown: " + e.stackTraceToString())
-    null
-  }
+  )
 }

apps/android/app/src/main/java/chat/simplex/app/views/helpers/Util.kt

@@ -23,11 +23,9 @@ import android.view.View
 import android.view.ViewTreeObserver
 import android.view.inputmethod.InputMethodManager
 import androidx.annotation.StringRes
-import androidx.compose.material.MaterialTheme
 import androidx.compose.runtime.*
 import androidx.compose.runtime.saveable.Saver
 import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.graphics.toArgb
 import androidx.compose.ui.platform.*
 import androidx.compose.ui.text.*
 import androidx.compose.ui.text.font.*
@@ -35,11 +33,11 @@ import androidx.compose.ui.text.style.BaselineShift
 import androidx.compose.ui.text.style.TextDecoration
 import androidx.compose.ui.unit.*
 import androidx.core.content.FileProvider
-import androidx.core.graphics.ColorUtils
 import androidx.core.text.HtmlCompat
 import chat.simplex.app.*
 import chat.simplex.app.R
 import chat.simplex.app.model.*
+import chat.simplex.app.ui.theme.ThemeData
 import chat.simplex.app.ui.theme.ThemeOverrides
 import com.charleskorn.kaml.decodeFromStream
 import kotlinx.coroutines.*
@@ -236,16 +234,16 @@ private fun spannableStringToAnnotatedString(
 }
 
 // maximum image file size to be auto-accepted
-const val MAX_IMAGE_SIZE: Long = 261_120 // 255KB
+const val MAX_IMAGE_SIZE: Long = 236700
 const val MAX_IMAGE_SIZE_AUTO_RCV: Long = MAX_IMAGE_SIZE * 2
-const val MAX_VOICE_SIZE_AUTO_RCV: Long = MAX_IMAGE_SIZE * 2
-const val MAX_VIDEO_SIZE_AUTO_RCV: Long = 1_047_552 // 1023KB
+const val MAX_VOICE_SIZE_AUTO_RCV: Long = MAX_IMAGE_SIZE
 
-const val MAX_VOICE_MILLIS_FOR_SENDING: Int = 300_000
+const val MAX_VOICE_SIZE_FOR_SENDING: Long = 94680 // 6 chunks * 15780 bytes per chunk
+const val MAX_VOICE_MILLIS_FOR_SENDING: Int = 43_000
 
 const val MAX_FILE_SIZE_SMP: Long = 8000000
 
-const val MAX_FILE_SIZE_XFTP: Long = 1_073_741_824 // 1GB
+const val MAX_FILE_SIZE_XFTP: Long = 1_073_741_824
 
 fun getFilesDirectory(context: Context): String {
   return context.filesDir.toString()
@@ -393,10 +391,10 @@ fun getDrawableFromUri(uri: Uri, withAlertOnException: Boolean = true): Drawable
   }
 }
 
-fun getThemeFromUri(uri: Uri, withAlertOnException: Boolean = true): ThemeOverrides? {
+fun getThemeFromUri(uri: Uri, withAlertOnException: Boolean = true): ThemeData? {
   SimplexApp.context.contentResolver.openInputStream(uri).use {
     runCatching {
-      return yaml.decodeFromStream<ThemeOverrides>(it!!)
+      return yaml.decodeFromStream<ThemeData>(it!!)
     }.onFailure {
       if (withAlertOnException) {
         AlertManager.shared.showAlertMsg(
@@ -590,9 +588,6 @@ fun Color.darker(factor: Float = 0.1f): Color =
 fun Color.lighter(factor: Float = 0.1f): Color =
   Color(min(red * (1 + factor), 1f), min(green * (1 + factor), 1f), min(blue * (1 + factor), 1f), alpha)
 
-fun Color.mixWith(color: Color, alpha: Float): Color =
-  Color(ColorUtils.blendARGB(color.toArgb(), toArgb(), alpha))
-
 fun ByteArray.toBase64String() = Base64.encodeToString(this, Base64.DEFAULT)
 
 fun String.toByteArrayFromBase64() = Base64.decode(this, Base64.DEFAULT)

apps/android/app/src/main/java/chat/simplex/app/views/localauth/LocalAuthView.kt

@@ -1,80 +1,22 @@
 package chat.simplex.app.views.localauth
 
-import android.util.Log
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.ui.res.stringResource
-import chat.simplex.app.*
-import chat.simplex.app.model.*
-import chat.simplex.app.views.database.deleteChatAsync
-import chat.simplex.app.views.database.stopChatAsync
+import chat.simplex.app.R
+import chat.simplex.app.model.ChatModel
 import chat.simplex.app.views.helpers.*
-import chat.simplex.app.views.helpers.DatabaseUtils.ksSelfDestructPassword
-import chat.simplex.app.views.helpers.DatabaseUtils.ksAppPassword
-import chat.simplex.app.views.onboarding.OnboardingStage
-import kotlinx.coroutines.delay
 
 @Composable
 fun LocalAuthView(m: ChatModel, authRequest: LocalAuthRequest) {
   val passcode = rememberSaveable { mutableStateOf("") }
   PasscodeView(passcode, authRequest.title ?: stringResource(R.string.la_enter_app_passcode), authRequest.reason, stringResource(R.string.submit_passcode),
     submit = {
-      val sdPassword = ksSelfDestructPassword.get()
-      if (sdPassword == passcode.value && authRequest.selfDestruct) {
-        deleteStorageAndRestart(m, sdPassword) { r ->
-          authRequest.completed(r)
-        }
-      } else {
-        val r: LAResult = if (passcode.value == authRequest.password) LAResult.Success else LAResult.Error(generalGetString(R.string.incorrect_passcode))
-        authRequest.completed(r)
-      }
+      val r: LAResult = if (passcode.value == authRequest.password) LAResult.Success else LAResult.Error(generalGetString(R.string.incorrect_passcode))
+      authRequest.completed(r)
     },
     cancel = {
       authRequest.completed(LAResult.Error(generalGetString(R.string.authentication_cancelled)))
     })
 }
-
-private fun deleteStorageAndRestart(m: ChatModel, password: String, completed: (LAResult) -> Unit) {
-  withBGApi {
-    try {
-      stopChatAsync(m)
-      deleteChatAsync(m)
-      ksAppPassword.set(password)
-      ksSelfDestructPassword.remove()
-      m.controller.ntfManager.cancelAllNotifications()
-      val selfDestructPref = m.controller.appPrefs.selfDestruct
-      val displayNamePref = m.controller.appPrefs.selfDestructDisplayName
-      val displayName = displayNamePref.get()
-      selfDestructPref.set(false)
-      displayNamePref.set(null)
-      m.chatDbChanged.value = true
-      m.chatDbStatus.value = null
-      try {
-        SimplexApp.context.initChatController(startChat = true)
-      } catch (e: Exception) {
-        Log.d(TAG, "initializeChat ${e.stackTraceToString()}")
-      }
-      m.chatDbChanged.value = false
-      if (m.currentUser.value != null) {
-        return@withBGApi
-      }
-      var profile: Profile? = null
-      if (!displayName.isNullOrEmpty()) {
-        profile = Profile(displayName = displayName, fullName = "")
-      }
-      val createdUser = m.controller.apiCreateActiveUser(profile, pastTimestamp = true)
-      m.currentUser.value = createdUser
-      m.controller.appPrefs.onboardingStage.set(OnboardingStage.OnboardingComplete)
-      m.onboardingStage.value = OnboardingStage.OnboardingComplete
-      if (createdUser != null) {
-        m.controller.startChat(createdUser)
-      }
-      ModalManager.shared.closeModals()
-      AlertManager.shared.hideAlert()
-      completed(LAResult.Success)
-    } catch (e: Exception) {
-      completed(LAResult.Error(generalGetString(R.string.incorrect_passcode)))
-    }
-  }
-}

apps/android/app/src/main/java/chat/simplex/app/views/localauth/SetAppPasscodeView.kt

@@ -4,15 +4,11 @@ import androidx.activity.compose.BackHandler
 import androidx.compose.runtime.*
 import androidx.compose.runtime.saveable.rememberSaveable
 import chat.simplex.app.R
-import chat.simplex.app.views.helpers.DatabaseUtils
 import chat.simplex.app.views.helpers.DatabaseUtils.ksAppPassword
 import chat.simplex.app.views.helpers.generalGetString
 
 @Composable
 fun SetAppPasscodeView(
-  passcodeKeychain: DatabaseUtils.KeyStoreItem = ksAppPassword,
-  title: String = generalGetString(R.string.new_passcode),
-  reason: String? = null,
   submit: () -> Unit,
   cancel: () -> Unit,
   close: () -> Unit
@@ -27,7 +23,7 @@ fun SetAppPasscodeView(
       close()
       cancel()
     }
-    PasscodeView(passcode, title = title, reason = reason, submitLabel = submitLabel, submitEnabled = submitEnabled, submit = submit) {
+    PasscodeView(passcode, title = title, submitLabel = submitLabel, submitEnabled = submitEnabled, submit = submit) {
       close()
       cancel()
     }
@@ -40,7 +36,7 @@ fun SetAppPasscodeView(
       submitEnabled = { pwd -> pwd == enteredPassword }
     ) {
       if (passcode.value == enteredPassword) {
-        passcodeKeychain.set(passcode.value)
+        ksAppPassword.set(passcode.value)
         enteredPassword = ""
         passcode.value = ""
         close()
@@ -48,7 +44,7 @@ fun SetAppPasscodeView(
       }
     }
   } else {
-    SetPasswordView(title, generalGetString(R.string.save_verb)) {
+    SetPasswordView(generalGetString(R.string.new_passcode), generalGetString(R.string.save_verb)) {
       enteredPassword = passcode.value
       passcode.value = ""
       confirming = true

apps/android/app/src/main/java/chat/simplex/app/views/newchat/AddContactLearnMore.kt

@@ -1,23 +0,0 @@
-package chat.simplex.app.views.newchat
-
-import androidx.compose.foundation.*
-import androidx.compose.foundation.layout.Column
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.res.stringResource
-import chat.simplex.app.R
-import chat.simplex.app.views.helpers.AppBarTitle
-import chat.simplex.app.views.onboarding.ReadableText
-import chat.simplex.app.views.onboarding.ReadableTextWithLink
-
-@Composable
-fun AddContactLearnMore() {
-  Column(
-    Modifier.verticalScroll(rememberScrollState()),
-  ) {
-    AppBarTitle(stringResource(R.string.one_time_link))
-    ReadableText(R.string.scan_qr_to_connect_to_contact)
-    ReadableText(R.string.if_you_cant_meet_in_person)
-    ReadableTextWithLink(R.string.read_more_in_user_guide_with_link, "https://simplex.chat/docs/guide/readme.html#connect-to-friends")
-  }
-}

apps/android/app/src/main/java/chat/simplex/app/views/newchat/AddContactView.kt

@@ -1,8 +1,6 @@
 package chat.simplex.app.views.newchat
 
 import SectionBottomSpacer
-import SectionSpacer
-import SectionView
 import android.content.res.Configuration
 import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.rememberScrollState
@@ -17,10 +15,10 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
 import chat.simplex.app.R
 import chat.simplex.app.ui.theme.*
 import chat.simplex.app.views.helpers.*
-import chat.simplex.app.views.usersettings.SettingsActionItem
 
 @Composable
 fun AddContactView(connReqInvitation: String, connIncognito: Boolean) {
@@ -28,92 +26,62 @@ fun AddContactView(connReqInvitation: String, connIncognito: Boolean) {
   AddContactLayout(
     connReq = connReqInvitation,
     connIncognito = connIncognito,
-    share = { shareText(cxt, connReqInvitation) },
-    learnMore = {
-      ModalManager.shared.showModal {
-        Column(
-          Modifier
-            .fillMaxHeight()
-            .padding(horizontal = DEFAULT_PADDING),
-          verticalArrangement = Arrangement.SpaceBetween
-        ) {
-          AddContactLearnMore()
-        }
-      }
-    }
+    share = { shareText(cxt, connReqInvitation) }
   )
 }
 
 @Composable
-fun AddContactLayout(connReq: String, connIncognito: Boolean, share: () -> Unit, learnMore: () -> Unit) {
-  Column(
-    Modifier
-      .verticalScroll(rememberScrollState()),
-    verticalArrangement = Arrangement.SpaceBetween,
-  ) {
-    AppBarTitle(stringResource(R.string.add_contact))
-    OneTimeLinkProfileText(connIncognito)
-
-    SectionSpacer()
-    SectionView(stringResource(R.string.one_time_link_short).uppercase()) {
-      OneTimeLinkSection(connReq, share, learnMore)
-    }
-    SectionBottomSpacer()
-  }
-}
-
-@Composable
-fun OneTimeLinkProfileText(connIncognito: Boolean) {
-  Row(Modifier.padding(horizontal = DEFAULT_PADDING)) {
-    InfoAboutIncognito(
-      connIncognito,
-      true,
-      generalGetString(R.string.incognito_random_profile_description),
-      generalGetString(R.string.your_profile_will_be_sent)
-    )
-  }
-}
-
-@Composable
-fun ColumnScope.OneTimeLinkSection(connReq: String, share: () -> Unit, learnMore: () -> Unit) {
-  if (connReq.isNotEmpty()) {
-    QRCode(
-      connReq, Modifier
-        .padding(horizontal = DEFAULT_PADDING, vertical = DEFAULT_PADDING_HALF)
-        .aspectRatio(1f)
-    )
-  } else {
-    CircularProgressIndicator(
+fun AddContactLayout(connReq: String, connIncognito: Boolean, share: () -> Unit) {
+  BoxWithConstraints {
+    val screenHeight = maxHeight
+    Column(
       Modifier
-        .size(36.dp)
-        .padding(4.dp)
-        .align(Alignment.CenterHorizontally),
-      color = MaterialTheme.colors.secondary,
-      strokeWidth = 3.dp
-    )
+        .verticalScroll(rememberScrollState()),
+      verticalArrangement = Arrangement.SpaceBetween,
+    ) {
+      AppBarTitle(stringResource(R.string.add_contact), false)
+      Text(
+        stringResource(R.string.show_QR_code_for_your_contact_to_scan_from_the_app__multiline),
+      )
+      Row {
+        InfoAboutIncognito(
+          connIncognito,
+          true,
+          generalGetString(R.string.incognito_random_profile_description),
+          generalGetString(R.string.your_profile_will_be_sent)
+        )
+      }
+      if (connReq.isNotEmpty()) {
+        QRCode(
+          connReq, Modifier
+            .aspectRatio(1f)
+            .padding(vertical = 3.dp)
+        )
+      } else {
+          CircularProgressIndicator(
+            Modifier
+              .size(36.dp)
+              .padding(4.dp)
+              .align(Alignment.CenterHorizontally),
+            color = MaterialTheme.colors.secondary,
+            strokeWidth = 3.dp
+          )
+      }
+      Text(
+        annotatedStringResource(R.string.if_you_cannot_meet_in_person_show_QR_in_video_call_or_via_another_channel),
+        lineHeight = 22.sp,
+        modifier = Modifier
+          .padding(top = DEFAULT_PADDING, bottom = if (screenHeight > 600.dp) DEFAULT_PADDING else 0.dp)
+      )
+      Row(
+        Modifier.fillMaxWidth(),
+        horizontalArrangement = Arrangement.Center
+      ) {
+        SimpleButton(stringResource(R.string.share_invitation_link), icon = painterResource(R.drawable.ic_share), click = share)
+      }
+      SectionBottomSpacer()
+    }
   }
-  ShareLinkButton(share)
-  OneTimeLinkLearnMoreButton(learnMore)
-}
-
-@Composable
-fun ShareLinkButton(onClick: () -> Unit) {
-  SettingsActionItem(
-    painterResource(R.drawable.ic_share),
-    stringResource(R.string.share_invitation_link),
-    onClick,
-    iconColor = MaterialTheme.colors.primary,
-    textColor = MaterialTheme.colors.primary,
-  )
-}
-
-@Composable
-fun OneTimeLinkLearnMoreButton(onClick: () -> Unit) {
-  SettingsActionItem(
-    painterResource(R.drawable.ic_info),
-    stringResource(R.string.learn_more),
-    onClick,
-  )
 }
 
 @Composable
@@ -165,8 +133,7 @@ fun PreviewAddContactView() {
     AddContactLayout(
       connReq = "https://simplex.chat/contact#/?v=1&smp=smp%3A%2F%2FPQUV2eL0t7OStZOoAsPEV2QYWt4-xilbakvGUGOItUo%3D%40smp6.simplex.im%2FK1rslx-m5bpXVIdMZg9NLUZ_8JBm8xTt%23MCowBQYDK2VuAyEALDeVe-sG8mRY22LsXlPgiwTNs9dbiLrNuA7f3ZMAJ2w%3D",
       connIncognito = false,
-      share = {},
-      learnMore = {},
+      share = {}
     )
   }
 }

apps/android/app/src/main/java/chat/simplex/app/views/newchat/AddGroupView.kt

@@ -159,7 +159,7 @@ fun CreateGroupButton(color: Color, modifier: Modifier) {
     Modifier.fillMaxWidth(),
     horizontalArrangement = Arrangement.End
   ) {
-    Surface(shape = RoundedCornerShape(20.dp), color = Color.Transparent) {
+    Surface(shape = RoundedCornerShape(20.dp)) {
       Row(modifier, verticalAlignment = Alignment.CenterVertically) {
         Text(stringResource(R.string.create_profile_button), style = MaterialTheme.typography.caption, color = color, fontWeight = FontWeight.Bold)
         Icon(painterResource(R.drawable.ic_arrow_forward_ios), stringResource(R.string.create_profile_button), tint = color)

apps/android/app/src/main/java/chat/simplex/app/views/newchat/ContactConnectionInfoView.kt

@@ -1,7 +1,6 @@
 package chat.simplex.app.views.newchat
 
 import SectionBottomSpacer
-import SectionDividerSpaced
 import SectionView
 import android.content.res.Configuration
 import androidx.compose.foundation.layout.*
@@ -11,7 +10,6 @@ import androidx.compose.material.*
 import androidx.compose.runtime.*
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
@@ -45,16 +43,13 @@ fun ContactConnectionInfoView(
       }
     }
   }
-  val context = LocalContext.current
   ContactConnectionInfoLayout(
     connReq = connReqInvitation,
     contactConnection,
-    connIncognito = contactConnection.incognito,
     focusAlias,
     deleteConnection = { deleteContactConnectionAlert(contactConnection, chatModel, close) },
     onLocalAliasChanged = { setContactAlias(contactConnection, it, chatModel) },
-    share = { if (connReqInvitation != null) shareText(context, connReqInvitation) },
-    learnMore = {
+    showQr = {
       ModalManager.shared.showModal {
         Column(
           Modifier
@@ -62,7 +57,7 @@ fun ContactConnectionInfoView(
             .padding(horizontal = DEFAULT_PADDING),
           verticalArrangement = Arrangement.SpaceBetween
         ) {
-          AddContactLearnMore()
+          AddContactView(connReqInvitation ?: return@showModal, contactConnection.incognito)
         }
       }
     }
@@ -73,12 +68,10 @@ fun ContactConnectionInfoView(
 private fun ContactConnectionInfoLayout(
   connReq: String?,
   contactConnection: PendingContactConnection,
-  connIncognito: Boolean,
   focusAlias: Boolean,
   deleteConnection: () -> Unit,
   onLocalAliasChanged: (String) -> Unit,
-  share: () -> Unit,
-  learnMore: () -> Unit,
+  showQr: () -> Unit,
 ) {
   Column(
     Modifier
@@ -90,6 +83,11 @@ private fun ContactConnectionInfoLayout(
         else R.string.you_accepted_connection
       )
     )
+    if (contactConnection.groupLinkId == null) {
+      Row(Modifier.padding(bottom = DEFAULT_PADDING)) {
+        LocalAliasEditor(contactConnection.localAlias, center = false, leadingIcon = true, focus = focusAlias, updateValue = onLocalAliasChanged)
+      }
+    }
     Text(
       stringResource(
         if (contactConnection.viaContactUri)
@@ -99,28 +97,27 @@ private fun ContactConnectionInfoLayout(
       ),
       Modifier.padding(start = DEFAULT_PADDING, end = DEFAULT_PADDING, bottom = DEFAULT_PADDING)
     )
-    OneTimeLinkProfileText(connIncognito)
-
-    if (contactConnection.groupLinkId == null) {
-      LocalAliasEditor(contactConnection.localAlias, center = false, leadingIcon = true, focus = focusAlias, updateValue = onLocalAliasChanged)
-    }
-
     SectionView {
       if (!connReq.isNullOrEmpty() && contactConnection.initiated) {
-        OneTimeLinkSection(connReq, share, learnMore)
-      } else {
-        OneTimeLinkLearnMoreButton(learnMore)
+        ShowQrButton(contactConnection.incognito, showQr)
       }
+      DeleteButton(deleteConnection)
     }
-
-    SectionDividerSpaced(maxBottomPadding = false)
-
-    DeleteButton(deleteConnection)
-
     SectionBottomSpacer()
   }
 }
 
+@Composable
+fun ShowQrButton(incognito: Boolean, onClick: () -> Unit) {
+  SettingsActionItem(
+    painterResource(R.drawable.ic_qr_code),
+    stringResource(R.string.show_QR_code),
+    click = onClick,
+    textColor = if (incognito) Indigo else MaterialTheme.colors.primary,
+    iconColor = if (incognito) Indigo else MaterialTheme.colors.primary,
+  )
+}
+
 @Composable
 fun DeleteButton(onClick: () -> Unit) {
   SettingsActionItem(
@@ -150,12 +147,10 @@ private fun PreviewContactConnectionInfoView() {
     ContactConnectionInfoLayout(
       connReq = "https://simplex.chat/contact#/?v=1&smp=smp%3A%2F%2FPQUV2eL0t7OStZOoAsPEV2QYWt4-xilbakvGUGOItUo%3D%40smp6.simplex.im%2FK1rslx-m5bpXVIdMZg9NLUZ_8JBm8xTt%23MCowBQYDK2VuAyEALDeVe-sG8mRY22LsXlPgiwTNs9dbiLrNuA7f3ZMAJ2w%3D",
       PendingContactConnection.getSampleData(),
-      connIncognito = false,
       focusAlias = false,
       deleteConnection = {},
       onLocalAliasChanged = {},
-      share = {},
-      learnMore = {}
+      showQr = {},
     )
   }
 }

apps/android/app/src/main/java/chat/simplex/app/views/newchat/CreateLinkView.kt

@@ -45,13 +45,14 @@ fun CreateLinkView(m: ChatModel, initialSelection: CreateLinkTab) {
     when {
       it == CreateLinkTab.ONE_TIME && connReqInvitation.value.isNullOrEmpty() -> stringResource(R.string.create_one_time_link)
       it == CreateLinkTab.ONE_TIME -> stringResource(R.string.one_time_link)
-      it == CreateLinkTab.LONG_TERM -> stringResource(R.string.your_simplex_contact_address)
+      it == CreateLinkTab.LONG_TERM -> stringResource(R.string.your_contact_address)
       else -> ""
     }
   }
   Column(
     Modifier
-      .fillMaxHeight(),
+      .fillMaxHeight()
+      .padding(horizontal = DEFAULT_PADDING),
     verticalArrangement = Arrangement.SpaceBetween
   ) {
     Column(Modifier.weight(1f)) {
@@ -60,7 +61,7 @@ fun CreateLinkView(m: ChatModel, initialSelection: CreateLinkTab) {
           AddContactView(connReqInvitation.value ?: "", m.incognito.value)
         }
         CreateLinkTab.LONG_TERM -> {
-          UserAddressView(m, viaCreateLinkView = true, close = {})
+          UserAddressView(m)
         }
       }
     }

apps/android/app/src/main/java/chat/simplex/app/views/newchat/NewChatSheet.kt

@@ -173,7 +173,7 @@ fun ActionButton(
   disabled: Boolean = false,
   click: () -> Unit = {}
 ) {
-  Surface(shape = RoundedCornerShape(18.dp), color = Color.Transparent) {
+  Surface(shape = RoundedCornerShape(18.dp)) {
     Column(
       Modifier
         .clickable(onClick = click)

apps/android/app/src/main/java/chat/simplex/app/views/newchat/PasteToConnect.kt

@@ -85,7 +85,7 @@ fun PasteToConnectLayout(
     )
 
     Box(Modifier.padding(top = DEFAULT_PADDING, bottom = 6.dp)) {
-      TextEditor(connectionLink, Modifier.height(180.dp), contentPadding = PaddingValues())
+      TextEditor(Modifier.height(180.dp), text = connectionLink)
     }
 
     Row(

apps/android/app/src/main/java/chat/simplex/app/views/onboarding/CreateSimpleXAddress.kt

@@ -1,174 +0,0 @@
-package chat.simplex.app.views.onboarding
-
-import SectionBottomSpacer
-import android.util.Log
-import androidx.compose.foundation.layout.*
-import androidx.compose.foundation.rememberScrollState
-import androidx.compose.foundation.verticalScroll
-import androidx.compose.material.*
-import androidx.compose.runtime.*
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.res.painterResource
-import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.text.style.TextAlign
-import androidx.compose.ui.unit.dp
-import chat.simplex.app.*
-import chat.simplex.app.R
-import chat.simplex.app.model.ChatModel
-import chat.simplex.app.model.UserContactLinkRec
-import chat.simplex.app.ui.theme.*
-import chat.simplex.app.views.helpers.*
-import chat.simplex.app.views.newchat.QRCode
-
-@Composable
-fun CreateSimpleXAddress(m: ChatModel) {
-  val context = LocalContext.current
-  var progressIndicator by remember { mutableStateOf(false) }
-  val userAddress = remember { m.userAddress }
-
-  CreateSimpleXAddressLayout(
-    userAddress.value,
-    share = { address: String -> shareText(context, address) },
-    sendEmail = { address ->
-      sendEmail(
-        context,
-        generalGetString(R.string.email_invite_subject),
-        generalGetString(R.string.email_invite_body).format(address.connReqContact)
-      )
-    },
-    createAddress = {
-      withApi {
-        progressIndicator = true
-        val connReqContact = m.controller.apiCreateUserAddress()
-        if (connReqContact != null) {
-          m.userAddress.value = UserContactLinkRec(connReqContact)
-//          TODO uncomment in v5.2
-//          try {
-//            val u = m.controller.apiSetProfileAddress(true)
-//            if (u != null) {
-//              m.updateUser(u)
-//            }
-//          } catch (e: Exception) {
-//            Log.e(TAG, "CreateSimpleXAddress apiSetProfileAddress: ${e.stackTraceToString()}")
-//          }
-          progressIndicator = false
-        }
-      }
-    },
-    nextStep = {
-      m.controller.appPrefs.onboardingStage.set(OnboardingStage.Step4_SetNotificationsMode)
-      m.onboardingStage.value = OnboardingStage.Step4_SetNotificationsMode
-    },
-  )
-
-  if (progressIndicator) {
-    ProgressIndicator()
-  }
-}
-
-@Composable
-private fun CreateSimpleXAddressLayout(
-  userAddress: UserContactLinkRec?,
-  share: (String) -> Unit,
-  sendEmail: (UserContactLinkRec) -> Unit,
-  createAddress: () -> Unit,
-  nextStep: () -> Unit,
-) {
-  Column(
-    Modifier.fillMaxSize().verticalScroll(rememberScrollState()).padding(top = DEFAULT_PADDING),
-    horizontalAlignment = Alignment.CenterHorizontally,
-  ) {
-    AppBarTitle(stringResource(R.string.simplex_address))
-
-    Spacer(Modifier.weight(1f))
-
-    if (userAddress != null) {
-      QRCode(userAddress.connReqContact, Modifier.padding(horizontal = DEFAULT_PADDING, vertical = DEFAULT_PADDING_HALF).aspectRatio(1f))
-      ShareAddressButton { share(userAddress.connReqContact) }
-      Spacer(Modifier.weight(1f))
-      ShareViaEmailButton { sendEmail(userAddress) }
-      Spacer(Modifier.weight(1f))
-      ContinueButton(nextStep)
-    } else {
-      CreateAddressButton(createAddress)
-//      TODO remove color in v5.2
-      TextBelowButton(stringResource(R.string.your_contacts_will_see_it), color = Color.Transparent)
-      Spacer(Modifier.weight(1f))
-      SkipButton(nextStep)
-    }
-    SectionBottomSpacer()
-  }
-}
-
-@Composable
-private fun CreateAddressButton(onClick: () -> Unit) {
-  TextButton(onClick) {
-    Text(stringResource(R.string.create_simplex_address), style = MaterialTheme.typography.h2, color = MaterialTheme.colors.primary)
-  }
-}
-
-@Composable
-fun ShareAddressButton(onClick: () -> Unit) {
-  SimpleButtonFrame(onClick) {
-    Icon(
-      painterResource(R.drawable.ic_share_filled), generalGetString(R.string.share_verb), tint = MaterialTheme.colors.primary,
-      modifier = Modifier.padding(end = 8.dp).size(18.dp)
-    )
-    Text(stringResource(R.string.share_verb), style = MaterialTheme.typography.caption, color = MaterialTheme.colors.primary)
-  }
-}
-
-@Composable
-fun ShareViaEmailButton(onClick: () -> Unit) {
-  SimpleButtonFrame(onClick) {
-    Icon(
-      painterResource(R.drawable.ic_mail), generalGetString(R.string.share_verb), tint = MaterialTheme.colors.primary,
-      modifier = Modifier.padding(end = 8.dp).size(30.dp)
-    )
-    Text(stringResource(R.string.invite_friends), style = MaterialTheme.typography.h6, color = MaterialTheme.colors.primary)
-  }
-}
-
-@Composable
-private fun ContinueButton(onClick: () -> Unit) {
-  SimpleButtonIconEnded(stringResource(R.string.continue_to_next_step), painterResource(R.drawable.ic_chevron_right), click = onClick)
-}
-
-@Composable
-private fun SkipButton(onClick: () -> Unit) {
-  SimpleButtonIconEnded(stringResource(R.string.dont_create_address), painterResource(R.drawable.ic_chevron_right), click = onClick)
-  TextBelowButton(stringResource(R.string.you_can_create_it_later))
-}
-
-@Composable
-private fun TextBelowButton(text: String, color: Color = Color.Unspecified) {
-  // TODO remove color in v5.2
-  Text(
-    text,
-    Modifier
-      .fillMaxWidth()
-      .padding(horizontal = DEFAULT_PADDING * 3),
-    style = MaterialTheme.typography.subtitle1,
-    textAlign = TextAlign.Center,
-    color = color
-  )
-}
-
-@Composable
-private fun ProgressIndicator() {
-  Box(
-    Modifier.fillMaxSize(),
-    contentAlignment = Alignment.Center
-  ) {
-    CircularProgressIndicator(
-      Modifier
-        .padding(horizontal = 2.dp)
-        .size(30.dp),
-      color = MaterialTheme.colors.secondary,
-      strokeWidth = 3.dp
-    )
-  }
-}

apps/android/app/src/main/java/chat/simplex/app/views/onboarding/HowItWorks.kt

@@ -4,22 +4,21 @@ import android.content.res.Configuration
 import androidx.annotation.StringRes
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.*
-import androidx.compose.material.*
-import androidx.compose.runtime.*
+import androidx.compose.material.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.MutableState
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalUriHandler
 import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.text.*
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import chat.simplex.app.R
-import chat.simplex.app.SimplexApp
 import chat.simplex.app.model.User
-import chat.simplex.app.ui.theme.*
-import chat.simplex.app.views.chat.item.MarkdownText
+import chat.simplex.app.ui.theme.DEFAULT_PADDING
+import chat.simplex.app.ui.theme.SimpleXTheme
 import chat.simplex.app.views.helpers.*
 
 @Composable
@@ -34,7 +33,12 @@ fun HowItWorks(user: User?, onboardingStage: MutableState<OnboardingStage?>? = n
     ReadableText(R.string.you_control_servers_to_receive_your_contacts_to_send)
     ReadableText(R.string.only_client_devices_store_contacts_groups_e2e_encrypted_messages)
     if (onboardingStage == null) {
-      ReadableTextWithLink(R.string.read_more_in_github_with_link, "https://github.com/simplex-chat/simplex-chat#readme")
+      val uriHandler = LocalUriHandler.current
+      Text(
+        annotatedStringResource(R.string.read_more_in_github_with_link),
+        modifier = Modifier.padding(bottom = 12.dp).clickable { uriHandler.openUriCatching("https://github.com/simplex-chat/simplex-chat#readme") },
+        lineHeight = 22.sp
+      )
     } else {
       ReadableText(R.string.read_more_in_github)
     }
@@ -51,28 +55,8 @@ fun HowItWorks(user: User?, onboardingStage: MutableState<OnboardingStage?>? = n
 }
 
 @Composable
-fun ReadableText(@StringRes stringResId: Int, textAlign: TextAlign = TextAlign.Start, padding: PaddingValues = PaddingValues(bottom = 12.dp), style: TextStyle = LocalTextStyle.current) {
-  Text(annotatedStringResource(stringResId), modifier = Modifier.padding(padding), textAlign = textAlign, lineHeight = 22.sp, style = style)
-}
-
-@Composable
-fun ReadableTextWithLink(@StringRes stringResId: Int, link: String, textAlign: TextAlign = TextAlign.Start, padding: PaddingValues = PaddingValues(bottom = 12.dp)) {
-  val annotated = annotatedStringResource(stringResId)
-  val primary = MaterialTheme.colors.primary
-  // This replaces links in text highlighted with specific color, e.g. SimplexBlue
-  val newStyles = remember(stringResId) {
-    val newStyles = ArrayList<AnnotatedString.Range<SpanStyle>>()
-    annotated.spanStyles.forEach {
-      if (it.item.color == SimplexBlue) {
-        newStyles.add(it.copy(item = it.item.copy(primary)))
-      } else {
-        newStyles.add(it)
-      }
-    }
-    newStyles
-  }
-  val uriHandler = LocalUriHandler.current
-  Text(AnnotatedString(annotated.text, newStyles), modifier = Modifier.padding(padding).clickable { uriHandler.openUriCatching(link) }, textAlign = textAlign, lineHeight = 22.sp)
+fun ReadableText(@StringRes stringResId: Int, textAlign: TextAlign = TextAlign.Start, padding: PaddingValues = PaddingValues(bottom = 12.dp)) {
+  Text(annotatedStringResource(stringResId), modifier = Modifier.padding(padding), textAlign = textAlign, lineHeight = 22.sp)
 }
 
 @Composable
@@ -80,17 +64,6 @@ fun ReadableText(text: String, textAlign: TextAlign = TextAlign.Start, padding:
   Text(text, modifier = Modifier.padding(padding), textAlign = textAlign, lineHeight = 22.sp)
 }
 
-@Composable
-fun ReadableMarkdownText(text: String, textAlign: TextAlign = TextAlign.Start, padding: PaddingValues = PaddingValues(bottom = 12.dp)) {
-  MarkdownText(
-    text,
-    formattedText = remember(text) { parseToMarkdown(text) },
-    modifier = Modifier.padding(padding),
-    style = TextStyle(textAlign = textAlign, lineHeight = 22.sp, fontSize = 16.sp),
-    linkMode = SimplexApp.context.chatModel.controller.appPrefs.simplexLinkMode.get(),
-  )
-}
-
 @Preview(showBackground = true)
 @Preview(
   uiMode = Configuration.UI_MODE_NIGHT_YES,

apps/android/app/src/main/java/chat/simplex/app/views/onboarding/OnboardingView.kt

@@ -1,7 +1,9 @@
 package chat.simplex.app.views.onboarding
 
+import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.rememberScrollState
+import androidx.compose.material.MaterialTheme
 import androidx.compose.runtime.*
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
@@ -14,8 +16,7 @@ import kotlinx.coroutines.launch
 enum class OnboardingStage {
   Step1_SimpleXInfo,
   Step2_CreateProfile,
-  Step3_CreateSimpleXAddress,
-  Step4_SetNotificationsMode,
+  Step3_SetNotificationsMode,
   OnboardingComplete
 }
 
@@ -30,7 +31,8 @@ fun CreateProfile(chatModel: ChatModel, close: () -> Unit) {
     Box(
       modifier = Modifier
         .fillMaxSize()
-        .padding(top = 20.dp)
+        .background(color = MaterialTheme.colors.background)
+        .padding(20.dp)
     ) {
       CreateProfilePanel(chatModel, close)
       LaunchedEffect(Unit) {

apps/android/app/src/main/java/chat/simplex/app/views/onboarding/SetNotificationsMode.kt

@@ -40,16 +40,13 @@ fun SetNotificationsMode(m: ChatModel) {
       NotificationButton(currentMode, NotificationsMode.SERVICE, R.string.onboarding_notifications_mode_service, R.string.onboarding_notifications_mode_service_desc)
     }
     Spacer(Modifier.fillMaxHeight().weight(1f))
-    Box(Modifier.fillMaxWidth().padding(bottom = DEFAULT_PADDING_HALF), contentAlignment = Alignment.Center) {
-      OnboardingActionButton(R.string.use_chat, OnboardingStage.OnboardingComplete, m.onboardingStage, false) {
-        changeNotificationsMode(currentMode.value, m)
+    Box(Modifier.fillMaxWidth().padding(bottom = DEFAULT_PADDING), contentAlignment = Alignment.Center) {
+        OnboardingActionButton(R.string.use_chat, OnboardingStage.OnboardingComplete, m.onboardingStage, false) {
+          changeNotificationsMode(currentMode.value, m)
+        }
       }
+      Spacer(Modifier.fillMaxHeight().weight(1f))
     }
-    Spacer(Modifier.fillMaxHeight().weight(1f))
-  }
-  LaunchedEffect(Unit) {
-    m.controller.ntfManager.createNtfChannelsMaybeShowAlert()
-  }
 }
 
 @Composable
@@ -59,10 +56,10 @@ private fun NotificationButton(currentMode: MutableState<NotificationsMode>, mod
     border = BorderStroke(1.dp, color = if (currentMode.value == mode) MaterialTheme.colors.primary else MaterialTheme.colors.secondary.copy(alpha = 0.5f)),
     shape = RoundedCornerShape(35.dp),
   ) {
-    Column(Modifier.padding(horizontal = 10.dp).padding(top = 4.dp, bottom = 8.dp)) {
+    Column(Modifier.padding(horizontal = 14.dp).padding(top = 4.dp, bottom = 8.dp)) {
       Text(
         stringResource(title),
-        style = MaterialTheme.typography.h3,
+        style = MaterialTheme.typography.h2,
         fontWeight = FontWeight.Medium,
         color = if (currentMode.value == mode) MaterialTheme.colors.primary else MaterialTheme.colors.secondary,
         modifier = Modifier.padding(bottom = 8.dp).align(Alignment.CenterHorizontally),
@@ -70,7 +67,6 @@ private fun NotificationButton(currentMode: MutableState<NotificationsMode>, mod
       )
       Text(annotatedStringResource(description),
         Modifier.align(Alignment.CenterHorizontally),
-        fontSize = 15.sp,
         color = MaterialTheme.colors.onBackground,
         lineHeight = 24.sp,
         textAlign = TextAlign.Center

apps/android/app/src/main/java/chat/simplex/app/views/onboarding/SimpleXInfo.kt

@@ -18,7 +18,6 @@ import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.*
 import chat.simplex.app.R
-import chat.simplex.app.SimplexApp
 import chat.simplex.app.model.ChatModel
 import chat.simplex.app.model.User
 import chat.simplex.app.ui.theme.*
@@ -43,13 +42,13 @@ fun SimpleXInfoLayout(
     Modifier
       .fillMaxSize()
       .verticalScroll(rememberScrollState())
-      .padding(start = DEFAULT_PADDING , end = DEFAULT_PADDING, top = DEFAULT_PADDING),
+      .padding(start = DEFAULT_PADDING * 1.5f, end = DEFAULT_PADDING * 1.5f, top = DEFAULT_PADDING * 4,/* bottom = DEFAULT_PADDING * 4*/),
   ) {
     Box(Modifier.fillMaxWidth().padding(top = 8.dp, bottom = 10.dp), contentAlignment = Alignment.Center) {
       SimpleXLogo()
     }
 
-    Text(stringResource(R.string.next_generation_of_private_messaging), style = MaterialTheme.typography.h2, modifier = Modifier.padding(bottom = 48.dp).padding(horizontal = 36.dp), textAlign = TextAlign.Center)
+    Text(stringResource(R.string.next_generation_of_private_messaging), style = MaterialTheme.typography.h2, modifier = Modifier.padding(bottom = 60.dp).padding(horizontal = 48.dp), textAlign = TextAlign.Center)
 
     InfoRow(painterResource(R.drawable.privacy), R.string.privacy_redefined, R.string.first_platform_without_user_ids, width = 80.dp)
     InfoRow(painterResource(R.drawable.shield), R.string.immune_to_spam_and_abuse, R.string.people_can_connect_only_via_links_you_share)
@@ -67,11 +66,12 @@ fun SimpleXInfoLayout(
     Box(
       Modifier
         .fillMaxWidth()
-        .padding(bottom = DEFAULT_PADDING.times(1.5f), top = DEFAULT_PADDING), contentAlignment = Alignment.Center
+        .padding(bottom = DEFAULT_PADDING, top = DEFAULT_PADDING), contentAlignment = Alignment.Center
     ) {
       SimpleButtonDecorated(text = stringResource(R.string.how_it_works), icon = painterResource(R.drawable.ic_info),
         click = showModal { HowItWorks(user, onboardingStage) })
     }
+    Spacer(Modifier.weight(1f))
   }
 }
 
@@ -120,7 +120,7 @@ fun OnboardingActionButton(
     Modifier
       .border(border = BorderStroke(1.dp, MaterialTheme.colors.primary), shape = RoundedCornerShape(50))
       .padding(
-      horizontal = DEFAULT_PADDING * 2,
+      horizontal = DEFAULT_PADDING * 3,
       vertical = 4.dp
     )
   } else {
@@ -130,14 +130,13 @@ fun OnboardingActionButton(
   SimpleButtonFrame(click = {
     onclick?.invoke()
     onboardingStage.value = onboarding
-    if (onboarding != null) {
-      SimplexApp.context.chatModel.controller.appPrefs.onboardingStage.set(onboarding)
-    }
   }, modifier) {
     Text(stringResource(labelId), style = MaterialTheme.typography.h2, color = MaterialTheme.colors.primary, fontSize = 20.sp)
     Icon(
       painterResource(R.drawable.ic_arrow_forward_ios), "next stage", tint = MaterialTheme.colors.primary,
-      modifier = Modifier.padding(start = DEFAULT_PADDING.div(4)).size(20.dp)
+      modifier = Modifier
+        .padding(start = DEFAULT_PADDING, top = 5.dp)
+        .size(15.dp)
     )
   }
 }

apps/android/app/src/main/java/chat/simplex/app/views/onboarding/WhatsNewView.kt

@@ -20,7 +20,6 @@ import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
-import androidx.compose.ui.unit.sp
 import chat.simplex.app.BuildConfig
 import chat.simplex.app.R
 import chat.simplex.app.model.ChatModel
@@ -43,7 +42,9 @@ fun WhatsNewView(viaSettings: Boolean = false, close: () -> Unit) {
       )
     }
 
-    Column(modifier = Modifier.padding(bottom = 12.dp)) {
+    Column(
+      modifier = Modifier.padding(bottom = 12.dp)
+    ) {
       Row(
         verticalAlignment = Alignment.CenterVertically,
         horizontalArrangement = Arrangement.spacedBy(8.dp),
@@ -52,16 +53,16 @@ fun WhatsNewView(viaSettings: Boolean = false, close: () -> Unit) {
         Icon(icon, stringResource(titleId), tint = MaterialTheme.colors.secondary)
         Text(
           generalGetString(titleId),
-          maxLines = 2,
+          maxLines = 1,
           overflow = TextOverflow.Ellipsis,
-          style = MaterialTheme.typography.h4,
+          style = MaterialTheme.typography.h3,
           fontWeight = FontWeight.Medium
         )
         if (link != null) {
           linkButton(link)
         }
       }
-      Text(generalGetString(descrId), fontSize = 15.sp)
+      Text(generalGetString(descrId))
     }
   }
 
@@ -113,23 +114,14 @@ fun WhatsNewView(viaSettings: Boolean = false, close: () -> Unit) {
         .fillMaxSize()
         .padding(horizontal = DEFAULT_PADDING)
         .verticalScroll(rememberScrollState()),
-      verticalArrangement = Arrangement.spacedBy(DEFAULT_PADDING.times(0.75f))
+      verticalArrangement = Arrangement.spacedBy(DEFAULT_PADDING)
     ) {
-      AppBarTitle(String.format(generalGetString(R.string.new_in_version), v.version), bottomPadding = DEFAULT_PADDING)
+      AppBarTitle(String.format(generalGetString(R.string.new_in_version), v.version))
 
       v.features.forEach { feature ->
         featureDescription(painterResource(feature.icon), feature.titleId, feature.descrId, feature.link)
       }
 
-      val uriHandler = LocalUriHandler.current
-      if (v.post != null) {
-        Row(horizontalArrangement = Arrangement.spacedBy(8.dp), modifier = Modifier.padding(top = DEFAULT_PADDING.div(4))) {
-          Text(stringResource(R.string.whats_new_read_more), color = MaterialTheme.colors.primary,
-            modifier = Modifier.clickable { uriHandler.openUriCatching(v.post) })
-          Icon(painterResource(R.drawable.ic_open_in_new), stringResource(R.string.whats_new_read_more), tint = MaterialTheme.colors.primary)
-        }
-      }
-
       if (!viaSettings) {
         Spacer(Modifier.fillMaxHeight().weight(1f))
         Box(
@@ -161,14 +153,12 @@ private data class FeatureDescription(
 
 private data class VersionDescription(
   val version: String,
-  val features: List<FeatureDescription>,
-  val post: String? = null,
+  val features: List<FeatureDescription>
 )
 
 private val versionDescriptions: List<VersionDescription> = listOf(
   VersionDescription(
     version = "v4.2",
-    post = "https://simplex.chat/blog/20221108-simplex-chat-v4.2-security-audit-new-website.html",
     features = listOf(
       FeatureDescription(
         icon = R.drawable.ic_verified_user,
@@ -190,7 +180,6 @@ private val versionDescriptions: List<VersionDescription> = listOf(
   ),
   VersionDescription(
     version = "v4.3",
-    post = "https://simplex.chat/blog/20221206-simplex-chat-v4.3-voice-messages.html",
     features = listOf(
       FeatureDescription(
         icon = R.drawable.ic_mic,
@@ -216,7 +205,6 @@ private val versionDescriptions: List<VersionDescription> = listOf(
   ),
   VersionDescription(
     version = "v4.4",
-    post = "https://simplex.chat/blog/20230103-simplex-chat-v4.4-disappearing-messages.html",
     features = listOf(
       FeatureDescription(
         icon = R.drawable.ic_timer,
@@ -242,7 +230,6 @@ private val versionDescriptions: List<VersionDescription> = listOf(
   ),
   VersionDescription(
     version = "v4.5",
-    post = "https://simplex.chat/blog/20230204-simplex-chat-v4-5-user-chat-profiles.html",
     features = listOf(
       FeatureDescription(
         icon = R.drawable.ic_manage_accounts,
@@ -274,13 +261,12 @@ private val versionDescriptions: List<VersionDescription> = listOf(
         icon = R.drawable.ic_translate,
         titleId = R.string.v4_5_italian_interface,
         descrId = R.string.v4_5_italian_interface_descr,
-        link = "https://github.com/simplex-chat/simplex-chat/tree/stable#help-translating-simplex-chat"
+        link = "https://github.com/simplex-chat/simplex-chat/tree/stable#translate-the-apps"
       )
     )
   ),
   VersionDescription(
     version = "v4.6",
-    post = "https://simplex.chat/blog/20230328-simplex-chat-v4-6-hidden-profiles.html",
     features = listOf(
       FeatureDescription(
         icon = R.drawable.ic_lock,
@@ -311,13 +297,12 @@ private val versionDescriptions: List<VersionDescription> = listOf(
         icon = R.drawable.ic_translate,
         titleId = R.string.v4_6_chinese_spanish_interface,
         descrId = R.string.v4_6_chinese_spanish_interface_descr,
-        link = "https://github.com/simplex-chat/simplex-chat/tree/stable#help-translating-simplex-chat"
+        link = "https://github.com/simplex-chat/simplex-chat/tree/stable#translate-the-apps"
       )
     )
   ),
   VersionDescription(
     version = "v5.0",
-    post = "https://simplex.chat/blog/20230422-simplex-chat-vision-funding-v5-videos-files-passcode.html",
     features = listOf(
       FeatureDescription(
         icon = R.drawable.ic_upload_file,
@@ -333,45 +318,7 @@ private val versionDescriptions: List<VersionDescription> = listOf(
         icon = R.drawable.ic_translate,
         titleId = R.string.v5_0_polish_interface,
         descrId = R.string.v5_0_polish_interface_descr,
-        link = "https://github.com/simplex-chat/simplex-chat/tree/stable#help-translating-simplex-chat"
-      )
-    )
-  ),
-  // Also in v5.1
-  // preference to disable calls per contact
-  // configurable SOCKS proxy port
-  // access welcome message via a group profile
-  // improve calls on lock screen
-  // better formatting of times and dates
-  VersionDescription(
-    version = "v5.1",
-    post = "https://simplex.chat/blog/20230523-simplex-chat-v5-1-message-reactions-self-destruct-passcode.html",
-    features = listOf(
-      FeatureDescription(
-        icon = R.drawable.ic_add_reaction,
-        titleId = R.string.v5_1_message_reactions,
-        descrId = R.string.v5_1_message_reactions_descr
-      ),
-      FeatureDescription(
-        icon = R.drawable.ic_chat,
-        titleId = R.string.v5_1_better_messages,
-        descrId = R.string.v5_1_better_messages_descr
-      ),
-      FeatureDescription(
-        icon = R.drawable.ic_light_mode,
-        titleId = R.string.v5_1_custom_themes,
-        descrId = R.string.v5_1_custom_themes_descr
-      ),
-      FeatureDescription(
-        icon = R.drawable.ic_lock,
-        titleId = R.string.v5_1_self_destruct_passcode,
-        descrId = R.string.v5_1_self_destruct_passcode_descr
-      ),
-      FeatureDescription(
-        icon = R.drawable.ic_translate,
-        titleId = R.string.v5_1_japanese_portuguese_interface,
-        descrId = R.string.whats_new_thanks_to_users_contribute_weblate,
-        link = "https://github.com/simplex-chat/simplex-chat/tree/stable#help-translating-simplex-chat"
+        link = "https://github.com/simplex-chat/simplex-chat/tree/stable#translate-the-apps"
       )
     )
   )

apps/android/app/src/main/java/chat/simplex/app/views/usersettings/AcceptRequestsView.kt

@@ -0,0 +1,160 @@
+package chat.simplex.app.views.usersettings
+
+import SectionBottomSpacer
+import SectionCustomFooter
+import SectionView
+import androidx.compose.foundation.layout.*
+import androidx.compose.foundation.rememberScrollState
+import androidx.compose.foundation.verticalScroll
+import androidx.compose.material.MaterialTheme
+import androidx.compose.material.Text
+import androidx.compose.ui.res.painterResource
+import androidx.compose.runtime.*
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+import chat.simplex.app.R
+import chat.simplex.app.model.*
+import chat.simplex.app.ui.theme.*
+import chat.simplex.app.views.helpers.*
+
+@Composable
+fun AcceptRequestsView(m: ChatModel, contactLink: UserContactLinkRec) {
+  var contactLink by remember { mutableStateOf(contactLink) }
+  AcceptRequestsLayout(
+    contactLink,
+    saveState = { new: MutableState<AutoAcceptState>, old: MutableState<AutoAcceptState> ->
+      withApi {
+        val link = m.controller.userAddressAutoAccept(new.value.autoAccept)
+        if (link != null) {
+          contactLink = link
+          m.userAddress.value = link
+          old.value = new.value
+        }
+      }
+    }
+  )
+}
+
+@Composable
+private fun AcceptRequestsLayout(
+  contactLink: UserContactLinkRec,
+  saveState: (new: MutableState<AutoAcceptState>, old: MutableState<AutoAcceptState>) -> Unit,
+) {
+  Column(
+    Modifier.fillMaxWidth().verticalScroll(rememberScrollState()),
+  ) {
+    AppBarTitle(stringResource(R.string.contact_requests))
+    val autoAcceptState = remember { mutableStateOf(AutoAcceptState(contactLink)) }
+    val autoAcceptStateSaved = remember { mutableStateOf(autoAcceptState.value) }
+    SectionView(stringResource(R.string.accept_requests).uppercase()) {
+      PreferenceToggleWithIcon(stringResource(R.string.accept_automatically), painterResource(R.drawable.ic_check), checked = autoAcceptState.value.enable) {
+        autoAcceptState.value = if (!it)
+          AutoAcceptState()
+        else
+          AutoAcceptState(it, autoAcceptState.value.incognito, autoAcceptState.value.welcomeText)
+      }
+      if (autoAcceptState.value.enable) {
+        PreferenceToggleWithIcon(
+          stringResource(R.string.incognito),
+          if (autoAcceptState.value.incognito) painterResource(R.drawable.ic_theater_comedy_filled) else painterResource(R.drawable.ic_theater_comedy),
+          if (autoAcceptState.value.incognito) Indigo else MaterialTheme.colors.secondary,
+          autoAcceptState.value.incognito,
+        ) {
+          autoAcceptState.value = AutoAcceptState(autoAcceptState.value.enable, it, autoAcceptState.value.welcomeText)
+        }
+      }
+    }
+    val welcomeText = remember { mutableStateOf(autoAcceptState.value.welcomeText) }
+    SectionCustomFooter(PaddingValues(horizontal = DEFAULT_PADDING)) {
+      ButtonsFooter(
+        cancel = {
+          autoAcceptState.value = autoAcceptStateSaved.value
+          welcomeText.value = autoAcceptStateSaved.value.welcomeText
+        },
+        save = { saveState(autoAcceptState, autoAcceptStateSaved) },
+        disabled = autoAcceptState.value == autoAcceptStateSaved.value
+      )
+    }
+    Spacer(Modifier.height(DEFAULT_PADDING))
+    if (autoAcceptState.value.enable) {
+      Text(
+        stringResource(R.string.section_title_welcome_message), color = MaterialTheme.colors.secondary, style = MaterialTheme.typography.body2,
+        modifier = Modifier.padding(start = DEFAULT_PADDING, bottom = 5.dp), fontSize = 12.sp
+      )
+      TextEditor(Modifier.padding(horizontal = DEFAULT_PADDING).height(160.dp), text = welcomeText)
+      LaunchedEffect(welcomeText.value) {
+        if (welcomeText.value != autoAcceptState.value.welcomeText) {
+          autoAcceptState.value = AutoAcceptState(autoAcceptState.value.enable, autoAcceptState.value.incognito, welcomeText.value)
+        }
+      }
+    }
+    SectionBottomSpacer()
+  }
+}
+
+@Composable
+private fun ButtonsFooter(cancel: () -> Unit, save: () -> Unit, disabled: Boolean) {
+  Row(
+    Modifier.fillMaxWidth(),
+    horizontalArrangement = Arrangement.SpaceBetween,
+    verticalAlignment = Alignment.CenterVertically
+  ) {
+    FooterButton(painterResource(R.drawable.ic_replay), stringResource(R.string.cancel_verb), cancel, disabled)
+    FooterButton(painterResource(R.drawable.ic_check), stringResource(R.string.save_verb), save, disabled)
+  }
+}
+
+private class AutoAcceptState {
+  var enable: Boolean = false
+    private set
+  var incognito: Boolean = false
+    private set
+  var welcomeText: String = ""
+    private set
+
+  constructor(enable: Boolean = false, incognito: Boolean = false, welcomeText: String = "") {
+    this.enable = enable
+    this.incognito = incognito
+    this.welcomeText = welcomeText
+  }
+
+  constructor(contactLink: UserContactLinkRec) {
+    contactLink.autoAccept?.let { aa ->
+      enable = true
+      incognito = aa.acceptIncognito
+      aa.autoReply?.let { msg ->
+        welcomeText = msg.text
+      } ?: run {
+        welcomeText = ""
+      }
+    }
+  }
+
+  val autoAccept: AutoAccept?
+    get() {
+      if (enable) {
+        var autoReply: MsgContent? = null
+        val s = welcomeText.trim()
+        if (s != "") {
+          autoReply = MsgContent.MCText(s)
+        }
+        return AutoAccept(incognito, autoReply)
+      }
+      return null
+    }
+
+  override fun equals(other: Any?): Boolean {
+    if (other !is AutoAcceptState) return false
+    return this.enable == other.enable && this.incognito == other.incognito && this.welcomeText == other.welcomeText
+  }
+
+  override fun hashCode(): Int {
+    var result = enable.hashCode()
+    result = 31 * result + incognito.hashCode()
+    result = 31 * result + welcomeText.hashCode()
+    return result
+  }
+}

apps/android/app/src/main/java/chat/simplex/app/views/usersettings/Appearance.kt

@@ -240,8 +240,8 @@ fun CustomizeThemeView(editColor: (ThemeColor, Color) -> Unit) {
       val theme = remember { mutableStateOf(null as String?) }
       val exportThemeLauncher = rememberSaveThemeLauncher(context, theme)
       SectionItemView({
-        val overrides = ThemeManager.currentThemeOverridesForExport(isInDarkTheme)
-        theme.value = yaml.encodeToString<ThemeOverrides>(overrides)
+        val themeData = ThemeManager.currentThemeData(isInDarkTheme)
+        theme.value = yaml.encodeToString<ThemeData>(themeData)
         exportThemeLauncher.launch("simplex.theme")
       }) {
         Text(generalGetString(R.string.export_theme), color = colors.primary)
@@ -251,7 +251,7 @@ fun CustomizeThemeView(editColor: (ThemeColor, Color) -> Unit) {
         if (uri != null) {
           val theme = getThemeFromUri(uri)
           if (theme != null) {
-            ThemeManager.saveAndApplyThemeOverrides(theme, isInDarkTheme)
+            ThemeManager.saveAndApplyThemeData(currentTheme.name, theme, isInDarkTheme)
           }
         }
       }
@@ -320,10 +320,8 @@ private fun LangSelector(state: State<String>, onSelected: (String) -> Unit) {
     "es" to "Español",
     "fr" to "Français",
     "it" to "Italiano",
-    "ja" to "日本語",
     "nl" to "Nederlands",
     "pl" to "Polski",
-    "pt-BR" to "Português (Brasil)",
     "ru" to "Русский",
     "zh-CN" to "简体中文"
   )

apps/android/app/src/main/java/chat/simplex/app/views/usersettings/CallSettings.kt

@@ -126,30 +126,6 @@ fun SharedPreferenceToggleWithIcon(
   }
 }
 
-@Composable
-fun SharedPreferenceToggleWithIcon(
-  text: String,
-  icon: Painter,
-  onClickInfo: () -> Unit,
-  checked: Boolean,
-  onCheckedChange: (Boolean) -> Unit,
-) {
-  Row(Modifier.fillMaxWidth(), verticalAlignment = Alignment.CenterVertically) {
-    Text(text, Modifier.padding(end = 4.dp))
-    Icon(
-      icon,
-      null,
-      Modifier.clickable(onClick = onClickInfo),
-      tint = MaterialTheme.colors.primary
-    )
-    Spacer(Modifier.fillMaxWidth().weight(1f))
-    DefaultSwitch(
-      checked = checked,
-      onCheckedChange = onCheckedChange,
-    )
-  }
-}
-
 @Composable
 fun <T>SharedPreferenceRadioButton(text: String, prefState: MutableState<T>, preference: SharedPreference<T>, value: T) {
   Row(verticalAlignment = Alignment.CenterVertically) {

apps/android/app/src/main/java/chat/simplex/app/views/usersettings/NetworkAndServers.kt

@@ -48,13 +48,12 @@ fun NetworkAndServersView(
     chatModel.userSMPServersUnsaved.value = null
   }
 
-  val proxyPort = remember { derivedStateOf { chatModel.controller.appPrefs.networkProxyHostPort.state.value?.split(":")?.lastOrNull()?.toIntOrNull() ?: 9050 } }
   NetworkAndServersLayout(
     developerTools = developerTools,
     networkUseSocksProxy = networkUseSocksProxy,
     onionHosts = onionHosts,
     sessionMode = sessionMode,
-    proxyPort = proxyPort,
+    proxyPort = remember { derivedStateOf { chatModel.controller.appPrefs.networkProxyHostPort.state.value?.split(":")?.lastOrNull()?.toIntOrNull() ?: 9050 } },
     showModal = showModal,
     showSettingsModal = showSettingsModal,
     showCustomModal = showCustomModal,
@@ -62,15 +61,14 @@ fun NetworkAndServersView(
       if (enable) {
         AlertManager.shared.showAlertDialog(
           title = generalGetString(R.string.network_enable_socks),
-          text = generalGetString(R.string.network_enable_socks_info).format(proxyPort.value),
+          text = generalGetString(R.string.network_enable_socks_info),
           confirmText = generalGetString(R.string.confirm_verb),
           onConfirm = {
             withApi {
-              val conf = NetCfg.proxyDefaults.withHostPort(chatModel.controller.appPrefs.networkProxyHostPort.get())
-              chatModel.controller.apiSetNetworkConfig(conf)
-              chatModel.controller.setNetCfg(conf)
+              chatModel.controller.apiSetNetworkConfig(NetCfg.proxyDefaults)
+              chatModel.controller.setNetCfg(NetCfg.proxyDefaults)
               networkUseSocksProxy.value = true
-              onionHosts.value = conf.onionHosts
+              onionHosts.value = NetCfg.proxyDefaults.onionHosts
             }
           }
         )
@@ -81,11 +79,10 @@ fun NetworkAndServersView(
           confirmText = generalGetString(R.string.confirm_verb),
           onConfirm = {
             withApi {
-              val conf = NetCfg.defaults
-              chatModel.controller.apiSetNetworkConfig(conf)
-              chatModel.controller.setNetCfg(conf)
+              chatModel.controller.apiSetNetworkConfig(NetCfg.defaults)
+              chatModel.controller.setNetCfg(NetCfg.defaults)
               networkUseSocksProxy.value = false
-              onionHosts.value = conf.onionHosts
+              onionHosts.value = NetCfg.defaults.onionHosts
             }
           }
         )
@@ -209,31 +206,35 @@ fun UseSocksProxySwitch(
     ) {
       Icon(
         painterResource(R.drawable.ic_settings_ethernet),
-        stringResource(R.string.network_socks_toggle_use_socks_proxy),
+        stringResource(R.string.network_socks_toggle),
         tint = MaterialTheme.colors.secondary
       )
       TextIconSpaced(false)
-      val text = buildAnnotatedString {
-        append(generalGetString(R.string.network_socks_toggle_use_socks_proxy) + " (")
-        val style = SpanStyle(color = MaterialTheme.colors.primary)
-        withAnnotation(tag = "PORT", annotation = generalGetString(R.string.network_proxy_port).format(proxyPort.value)) {
-          withStyle(style) { append(generalGetString(R.string.network_proxy_port).format(proxyPort.value)) }
-        }
-        append(")")
-      }
-      ClickableText(
-        text,
-        style = TextStyle(color = MaterialTheme.colors.onBackground, fontSize = 16.sp, fontFamily = FontFamily(Font(R.font.inter_regular))),
-        onClick = { offset ->
-          text.getStringAnnotations(tag = "PORT", start = offset, end = offset)
-            .firstOrNull()?.let { _ ->
-              showSettingsModal { SockProxySettings(it) }()
+      if (networkUseSocksProxy.value) {
+          val text = buildAnnotatedString {
+            append(generalGetString(R.string.network_socks_toggle_use_socks_proxy) + " (")
+            val style = SpanStyle(color = MaterialTheme.colors.primary)
+            withAnnotation(tag = "PORT", annotation = generalGetString(R.string.network_proxy_port).format(proxyPort.value)) {
+              withStyle(style) { append(generalGetString(R.string.network_proxy_port).format(proxyPort.value)) }
             }
-        },
-        shouldConsumeEvent = { offset ->
-          text.getStringAnnotations(tag = "PORT", start = offset, end = offset).any()
-        }
-      )
+            append(")")
+          }
+          ClickableText(
+            text,
+            style = TextStyle(color =  MaterialTheme.colors.onBackground, fontSize = 16.sp, fontFamily = FontFamily(Font(R.font.inter_regular))),
+            onClick = { offset ->
+              text.getStringAnnotations(tag = "PORT", start = offset, end = offset)
+                .firstOrNull()?.let { _ ->
+                  showSettingsModal { SockProxySettings(it) }()
+                }
+            },
+            shouldConsumeEvent = { offset ->
+              text.getStringAnnotations(tag = "PORT", start = offset, end = offset).any()
+            }
+          )
+      } else {
+        Text(stringResource(R.string.network_socks_toggle))
+      }
     }
     DefaultSwitch(
       checked = networkUseSocksProxy.value,
@@ -261,15 +262,13 @@ fun SockProxySettings(m: ChatModel) {
     val save = {
       withBGApi {
         m.controller.appPrefs.networkProxyHostPort.set(hostUnsaved.value.text + ":" + portUnsaved.value.text)
-        if (m.controller.appPrefs.networkUseSocksProxy.get()) {
-          m.controller.apiSetNetworkConfig(m.controller.getNetCfg())
-        }
+        m.controller.apiSetNetworkConfig(m.controller.getNetCfg())
       }
     }
     SectionView {
       SectionItemView {
         ResetToDefaultsButton({
-          val reset = {
+          showUpdateNetworkSettingsDialog {
             m.controller.appPrefs.networkProxyHostPort.set(defaultHostPort)
             val newHost = defaultHostPort.split(":").first()
             val newPort = defaultHostPort.split(":").last()
@@ -277,13 +276,6 @@ fun SockProxySettings(m: ChatModel) {
             portUnsaved.value = portUnsaved.value.copy(newPort, TextRange(newPort.length))
             save()
           }
-          if (m.controller.appPrefs.networkUseSocksProxy.get()) {
-            showUpdateNetworkSettingsDialog {
-              reset()
-            }
-          } else {
-            reset()
-          }
         }, disabled = hostPort == defaultHostPort)
       }
       SectionItemView {
@@ -315,7 +307,7 @@ fun SockProxySettings(m: ChatModel) {
           hostUnsaved.value = hostUnsaved.value.copy(prevHost, TextRange(prevHost.length))
           portUnsaved.value = portUnsaved.value.copy(prevPort, TextRange(prevPort.length))
         },
-        save = { if (m.controller.appPrefs.networkUseSocksProxy.get()) showUpdateNetworkSettingsDialog { save() } else save() },
+        save = { showUpdateNetworkSettingsDialog { save() } },
         revertDisabled = hostPort == (hostUnsaved.value.text + ":" + portUnsaved.value.text),
         saveDisabled = hostPort == (hostUnsaved.value.text + ":" + portUnsaved.value.text) ||
             remember { derivedStateOf { !validHost(hostUnsaved.value.text) } }.value ||

apps/android/app/src/main/java/chat/simplex/app/views/usersettings/Preferences.kt

@@ -15,6 +15,7 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
 import chat.simplex.app.R
 import chat.simplex.app.model.*
+import chat.simplex.app.ui.theme.*
 import chat.simplex.app.views.helpers.*
 
 @Composable
@@ -71,11 +72,6 @@ private fun PreferencesLayout(
       applyPrefs(preferences.copy(fullDelete = SimpleChatPreference(allow = it)))
     }
     SectionDividerSpaced(true, maxBottomPadding = false)
-//    val allowReactions = remember(preferences) { mutableStateOf(preferences.reactions.allow) }
-//    FeatureSection(ChatFeature.Reactions, allowReactions) {
-//      applyPrefs(preferences.copy(reactions = SimpleChatPreference(allow = it)))
-//    }
-//    SectionDividerSpaced(true, maxBottomPadding = false)
     val allowVoice = remember(preferences) { mutableStateOf(preferences.voice.allow) }
     FeatureSection(ChatFeature.Voice, allowVoice) {
       applyPrefs(preferences.copy(voice = SimpleChatPreference(allow = it)))
@@ -103,10 +99,11 @@ private fun FeatureSection(feature: ChatFeature, allowFeature: State<FeatureAllo
       FeatureAllowed.values().map { it to it.text },
       allowFeature,
       icon = feature.icon,
+      enabled = remember { mutableStateOf(feature != ChatFeature.Calls) },
       onSelected = onSelected,
     )
   }
-  SectionTextFooter(feature.allowDescription(allowFeature.value))
+  SectionTextFooter(feature.allowDescription(allowFeature.value) + (if (feature == ChatFeature.Calls) generalGetString(R.string.available_in_v51) else ""))
 }
 
 @Composable

apps/android/app/src/main/java/chat/simplex/app/views/usersettings/PrivacySettings.kt

@@ -6,8 +6,9 @@ import SectionItemView
 import SectionTextFooter
 import SectionView
 import android.view.WindowManager
-import androidx.compose.foundation.*
 import androidx.compose.foundation.layout.*
+import androidx.compose.foundation.rememberScrollState
+import androidx.compose.foundation.verticalScroll
 import androidx.compose.material.*
 import androidx.compose.runtime.*
 import androidx.compose.ui.Alignment
@@ -16,18 +17,12 @@ import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
-import androidx.compose.ui.unit.sp
 import androidx.fragment.app.FragmentActivity
 import chat.simplex.app.R
 import chat.simplex.app.model.*
-import chat.simplex.app.ui.theme.*
-import chat.simplex.app.views.ProfileNameField
 import chat.simplex.app.views.helpers.*
 import chat.simplex.app.views.helpers.DatabaseUtils.ksAppPassword
-import chat.simplex.app.views.helpers.DatabaseUtils.ksSelfDestructPassword
-import chat.simplex.app.views.isValidDisplayName
 import chat.simplex.app.views.localauth.SetAppPasscodeView
-import chat.simplex.app.views.onboarding.ReadableText
 
 enum class LAMode {
   SYSTEM,
@@ -116,9 +111,6 @@ fun SimplexLockView(
   val laLockDelay = remember { chatModel.controller.appPrefs.laLockDelay }
   val showChangePasscode = remember { derivedStateOf { performLA.value && currentLAMode.state.value == LAMode.PASSCODE } }
   val activity = LocalContext.current as FragmentActivity
-  val selfDestructPref = remember { chatModel.controller.appPrefs.selfDestruct }
-  val selfDestructDisplayName = remember { mutableStateOf(chatModel.controller.appPrefs.selfDestructDisplayName.get() ?: "") }
-  val selfDestructDisplayNamePref = remember { chatModel.controller.appPrefs.selfDestructDisplayName }
 
   fun resetLAEnabled(onOff: Boolean) {
     chatModel.controller.appPrefs.performLA.set(onOff)
@@ -131,11 +123,6 @@ fun SimplexLockView(
     laUnavailableInstructionAlert()
   }
 
-  fun resetSelfDestruct() {
-    selfDestructPref.set(false)
-    ksSelfDestructPassword.remove()
-  }
-
   fun toggleLAMode(toLAMode: LAMode) {
     authenticate(
       if (toLAMode == LAMode.SYSTEM) {
@@ -143,7 +130,7 @@ fun SimplexLockView(
       } else {
         generalGetString(R.string.chat_lock)
       },
-      generalGetString(R.string.change_lock_mode), activity = activity
+      generalGetString(R.string.change_lock_mode), activity
     ) { laResult ->
       when (laResult) {
         is LAResult.Error -> {
@@ -153,15 +140,16 @@ fun SimplexLockView(
         LAResult.Success -> {
           when (toLAMode) {
             LAMode.SYSTEM -> {
-              authenticate(generalGetString(R.string.auth_enable_simplex_lock), promptSubtitle = "", activity = activity, usingLAMode = toLAMode) { laResult ->
+              authenticate(generalGetString(R.string.auth_enable_simplex_lock), promptSubtitle = "", activity, toLAMode) { laResult ->
                 when (laResult) {
                   LAResult.Success -> {
                     currentLAMode.set(toLAMode)
                     ksAppPassword.remove()
-                    resetSelfDestruct()
                     laTurnedOnAlert()
                   }
-                  is LAResult.Unavailable, is LAResult.Error -> laFailedAlert()
+                  is LAResult.Unavailable, is LAResult.Error -> {
+                    laFailedAlert()
+                  }
                   is LAResult.Failed -> { /* Can be called multiple times on every failure */ }
                 }
               }
@@ -176,7 +164,7 @@ fun SimplexLockView(
                       passcodeAlert(generalGetString(R.string.passcode_set))
                     },
                     cancel = {},
-                    close = close
+                    close
                   )
                 }
               }
@@ -188,27 +176,8 @@ fun SimplexLockView(
     }
   }
 
-  fun toggleSelfDestruct(selfDestruct: SharedPreference<Boolean>) {
-    authenticate(generalGetString(R.string.la_current_app_passcode), generalGetString(R.string.change_self_destruct_mode), activity = activity) { laResult ->
-      when (laResult) {
-        is LAResult.Error -> laFailedAlert()
-        is LAResult.Failed -> { /* Can be called multiple times on every failure */ }
-        LAResult.Success -> {
-          if (!selfDestruct.get()) {
-            ModalManager.shared.showCustomModal { close ->
-              EnableSelfDestruct(selfDestruct, close)
-            }
-          } else {
-            resetSelfDestruct()
-          }
-        }
-        is LAResult.Unavailable -> disableUnavailableLA()
-      }
-    }
-  }
-
   fun changeLAPassword() {
-    authenticate(generalGetString(R.string.la_current_app_passcode), generalGetString(R.string.la_change_app_passcode), activity = activity) { laResult ->
+    authenticate(generalGetString(R.string.la_current_app_passcode), generalGetString(R.string.la_change_app_passcode), activity) { laResult ->
       when (laResult) {
         LAResult.Success -> {
           ModalManager.shared.showCustomModal { close ->
@@ -218,32 +187,7 @@ fun SimplexLockView(
                   passcodeAlert(generalGetString(R.string.passcode_changed))
                 }, cancel = {
                   passcodeAlert(generalGetString(R.string.passcode_not_changed))
-                }, close = close
-              )
-            }
-          }
-        }
-        is LAResult.Error -> laFailedAlert()
-        is LAResult.Failed -> {}
-        is LAResult.Unavailable -> disableUnavailableLA()
-      }
-    }
-  }
-
-  fun changeSelfDestructPassword() {
-    authenticate(generalGetString(R.string.la_current_app_passcode), generalGetString(R.string.change_self_destruct_passcode), activity = activity) { laResult ->
-      when (laResult) {
-        LAResult.Success -> {
-          ModalManager.shared.showCustomModal { close ->
-            Surface(Modifier.fillMaxSize(), color = MaterialTheme.colors.background) {
-              SetAppPasscodeView(
-                passcodeKeychain = ksSelfDestructPassword,
-                submit = {
-                  selfDestructPasscodeAlert(generalGetString(R.string.self_destruct_passcode_changed))
-                }, cancel = {
-                  passcodeAlert(generalGetString(R.string.passcode_not_changed))
-                },
-                close = close
+                }, close
               )
             }
           }
@@ -279,8 +223,7 @@ fun SimplexLockView(
                     },
                     cancel = {
                       resetLAEnabled(false)
-                    },
-                    close = close
+                    }, close
                   )
                 }
               }
@@ -307,85 +250,11 @@ fun SimplexLockView(
           }
         }
       }
-      if (performLA.value && laMode.value == LAMode.PASSCODE) {
-        SectionDividerSpaced()
-        SectionView(stringResource(R.string.self_destruct_passcode).uppercase()) {
-          val openInfo = {
-            ModalManager.shared.showModal {
-              SelfDestructInfoView()
-            }
-          }
-          SettingsActionItemWithContent(null, null, click = openInfo) {
-            SharedPreferenceToggleWithIcon(
-              stringResource(R.string.enable_self_destruct),
-              painterResource(R.drawable.ic_info),
-              openInfo,
-              remember { selfDestructPref.state }.value
-            ) {
-              toggleSelfDestruct(selfDestructPref)
-            }
-          }
-
-          if (remember { selfDestructPref.state }.value) {
-            Column(Modifier.padding(horizontal = DEFAULT_PADDING, vertical = DEFAULT_PADDING_HALF)) {
-              Text(
-                stringResource(R.string.self_destruct_new_display_name),
-                fontSize = 16.sp,
-                modifier = Modifier.padding(bottom = DEFAULT_PADDING_HALF)
-              )
-              ProfileNameField(selfDestructDisplayName, "", ::isValidDisplayName)
-              LaunchedEffect(selfDestructDisplayName.value) {
-                val new = selfDestructDisplayName.value
-                if (isValidDisplayName(new) && selfDestructDisplayNamePref.get() != new) {
-                  selfDestructDisplayNamePref.set(new)
-                }
-              }
-            }
-            SectionItemView({ changeSelfDestructPassword() }) {
-              Text(stringResource(R.string.change_self_destruct_passcode))
-            }
-          }
-        }
-      }
     }
     SectionBottomSpacer()
   }
 }
 
-@Composable
-private fun SelfDestructInfoView() {
-  Column(
-    Modifier.fillMaxWidth().verticalScroll(rememberScrollState()).padding(horizontal = DEFAULT_PADDING),
-  ) {
-    AppBarTitle(stringResource(R.string.self_destruct), withPadding = false)
-    ReadableText(stringResource(R.string.if_you_enter_self_destruct_code))
-    Column(verticalArrangement = Arrangement.spacedBy(10.dp)) {
-      TextListItem("1.", stringResource(R.string.all_app_data_will_be_cleared))
-      TextListItem("2.", stringResource(R.string.app_passcode_replaced_with_self_destruct))
-      TextListItem("3.", stringResource(R.string.empty_chat_profile_is_created))
-    }
-    SectionBottomSpacer()
-  }
-}
-
-@Composable
-private fun EnableSelfDestruct(
-  selfDestruct: SharedPreference<Boolean>,
-  close: () -> Unit
-) {
-  Surface(Modifier.fillMaxSize(), color = MaterialTheme.colors.background) {
-    SetAppPasscodeView(
-      passcodeKeychain = ksSelfDestructPassword, title = generalGetString(R.string.set_passcode), reason = generalGetString(R.string.enabled_self_destruct_passcode),
-      submit = {
-        selfDestruct.set(true)
-        selfDestructPasscodeAlert(generalGetString(R.string.self_destruct_passcode_enabled))
-      },
-      cancel = {},
-      close = close
-    )
-  }
-}
-
 @Composable
 private fun EnableLock(performLA: MutableState<Boolean>, onCheckedChange: (Boolean) -> Unit) {
   SectionItemView {
@@ -431,14 +300,6 @@ private fun LockDelaySelector(state: State<Int>, onSelected: (Int) -> Unit) {
   )
 }
 
-@Composable
-private fun TextListItem(n: String, text: String) {
-  Box {
-    Text(n)
-    Text(text, Modifier.padding(start = 20.dp))
-  }
-}
-
 private fun laDelayText(t: Int): String {
   val m = t / 60
   val s = t % 60
@@ -458,7 +319,3 @@ private fun passcodeAlert(title: String) {
     text = generalGetString(R.string.la_please_remember_to_store_password)
   )
 }
-
-private fun selfDestructPasscodeAlert(title: String) {
-  AlertManager.shared.showAlertMsg(title, generalGetString(R.string.if_you_enter_passcode_data_removed))
-}

apps/android/app/src/main/java/chat/simplex/app/views/usersettings/ProtocolServerView.kt

@@ -27,8 +27,6 @@ import chat.simplex.app.model.ServerAddress.Companion.parseServerAddress
 import chat.simplex.app.ui.theme.*
 import chat.simplex.app.views.helpers.*
 import chat.simplex.app.views.newchat.QRCode
-import kotlinx.coroutines.flow.collect
-import kotlinx.coroutines.flow.distinctUntilChanged
 import kotlinx.coroutines.isActive
 import kotlinx.coroutines.launch
 
@@ -142,16 +140,14 @@ private fun CustomServer(
   ) {
     val testedPreviously = remember { mutableMapOf<String, Boolean?>() }
     TextEditor(
-      serverAddress,
-      Modifier.height(144.dp)
-    )
-    LaunchedEffect(Unit) {
-      snapshotFlow { serverAddress.value }
-        .distinctUntilChanged()
-        .collect {
-          testedPreviously[server.server] = server.tested
-          onUpdate(server.copy(server = it, tested = testedPreviously[serverAddress.value]))
-        }
+      Modifier.height(144.dp),
+      text = serverAddress,
+      border = false,
+      fontSize = 16.sp,
+      background = if (isInDarkTheme()) GroupDark else MaterialTheme.colors.background
+    ) {
+      testedPreviously[server.server] = server.tested
+      onUpdate(server.copy(server = it, tested = testedPreviously[serverAddress.value]))
     }
   }
   SectionDividerSpaced()

apps/android/app/src/main/java/chat/simplex/app/views/usersettings/ProtocolServersView.kt

@@ -266,7 +266,7 @@ private fun HowToButton() {
   SettingsActionItem(
     painterResource(R.drawable.ic_open_in_new),
     stringResource(R.string.how_to_use_your_servers),
-    { uriHandler.openUriCatching("https://simplex.chat/docs/server.html") },
+    { uriHandler.openUriCatching("https://github.com/simplex-chat/simplex-chat/blob/stable/docs/SERVER.md") },
     textColor = MaterialTheme.colors.primary,
     iconColor = MaterialTheme.colors.primary
   )

apps/android/app/src/main/java/chat/simplex/app/views/usersettings/RTCServers.kt

@@ -120,7 +120,7 @@ fun RTCServersLayout(
       } else {
         Text(stringResource(R.string.enter_one_ICE_server_per_line))
         if (editRTCServers) {
-          TextEditor(userRTCServersStr, Modifier.height(160.dp), contentPadding = PaddingValues())
+          TextEditor(Modifier.height(160.dp), text = userRTCServersStr)
 
           Row(
             Modifier.fillMaxWidth(),
@@ -197,7 +197,7 @@ private fun howToButton() {
   val uriHandler = LocalUriHandler.current
   Row(
     verticalAlignment = Alignment.CenterVertically,
-    modifier = Modifier.clickable { uriHandler.openUriCatching("https://simplex.chat/docs/webrtc.html#configure-mobile-apps") }
+    modifier = Modifier.clickable { uriHandler.openUriCatching("https://github.com/simplex-chat/simplex-chat/blob/stable/docs/WEBRTC.md#configure-mobile-apps") }
   ) {
     Text(stringResource(R.string.how_to), color = MaterialTheme.colors.primary)
     Icon(

apps/android/app/src/main/java/chat/simplex/app/views/usersettings/SettingsView.kt

@@ -8,6 +8,7 @@ import SectionView
 import TextIconSpaced
 import android.content.Context
 import android.content.res.Configuration
+import androidx.activity.compose.BackHandler
 import androidx.compose.foundation.*
 import androidx.compose.foundation.layout.*
 import androidx.compose.material.*
@@ -150,7 +151,7 @@ fun SettingsLayout(
         val profileHidden = rememberSaveable { mutableStateOf(false) }
         SettingsActionItem(painterResource(R.drawable.ic_manage_accounts), stringResource(R.string.your_chat_profiles), { withAuth(generalGetString(R.string.auth_open_chat_profiles), generalGetString(R.string.auth_log_in_using_credential)) { showSettingsModalWithSearch { it, search -> UserProfilesView(it, search, profileHidden) } } }, disabled = stopped, extraPadding = true)
         SettingsIncognitoActionItem(incognitoPref, incognito, stopped) { showModal { IncognitoView() }() }
-        SettingsActionItem(painterResource(R.drawable.ic_qr_code), stringResource(R.string.your_simplex_contact_address), showCustomModal { it, close -> UserAddressView(it, shareViaProfile = it.currentUser.value!!.addressShared, close = close) }, disabled = stopped, extraPadding = true)
+        SettingsActionItem(painterResource(R.drawable.ic_qr_code), stringResource(R.string.your_simplex_contact_address), showModal { CreateLinkView(it, CreateLinkTab.LONG_TERM) }, disabled = stopped, extraPadding = true)
         ChatPreferencesItem(showCustomModal, stopped = stopped)
       }
       SectionDividerSpaced()
@@ -361,15 +362,15 @@ fun ChatLockItem(
   Text("v${BuildConfig.VERSION_NAME} (${BuildConfig.VERSION_CODE})")
 }
 
-@Composable fun ProfilePreview(profileOf: NamedChat, size: Dp = 60.dp, iconColor: Color = MaterialTheme.colors.secondaryVariant, textColor: Color = MaterialTheme.colors.onBackground, stopped: Boolean = false) {
-  ProfileImage(size = size, image = profileOf.image, color = iconColor)
+@Composable fun ProfilePreview(profileOf: NamedChat, size: Dp = 60.dp, color: Color = MaterialTheme.colors.secondaryVariant, stopped: Boolean = false) {
+  ProfileImage(size = size, image = profileOf.image, color = color)
   Spacer(Modifier.padding(horizontal = 8.dp))
   Column(Modifier.height(size), verticalArrangement = Arrangement.Center) {
     Text(
       profileOf.displayName,
       style = MaterialTheme.typography.caption,
       fontWeight = FontWeight.Bold,
-      color = if (stopped) MaterialTheme.colors.secondary else textColor,
+      color = if (stopped) MaterialTheme.colors.secondary else Color.Unspecified,
       maxLines = 1,
       overflow = TextOverflow.Ellipsis
     )
@@ -377,7 +378,7 @@ fun ChatLockItem(
       Text(
         profileOf.fullName,
         Modifier.padding(vertical = 5.dp),
-        color = if (stopped) MaterialTheme.colors.secondary else textColor,
+        color = if (stopped) MaterialTheme.colors.secondary else Color.Unspecified,
         maxLines = 1,
         overflow = TextOverflow.Ellipsis
       )
@@ -483,7 +484,7 @@ private fun runAuth(title: String, desc: String, context: Context, onFinish: (su
   authenticate(
     title,
     desc,
-    activity = context as FragmentActivity,
+    context as FragmentActivity,
     completed = { laResult ->
       onFinish(laResult == LAResult.Success || laResult is LAResult.Unavailable)
     }

apps/android/app/src/main/java/chat/simplex/app/views/usersettings/UserAddressLearnMore.kt

@@ -1,24 +0,0 @@
-package chat.simplex.app.views.usersettings
-
-import androidx.compose.foundation.*
-import androidx.compose.foundation.layout.*
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.res.stringResource
-import chat.simplex.app.R
-import chat.simplex.app.views.helpers.*
-import chat.simplex.app.views.onboarding.ReadableText
-import chat.simplex.app.views.onboarding.ReadableTextWithLink
-
-@Composable
-fun UserAddressLearnMore() {
-  Column(
-    Modifier.verticalScroll(rememberScrollState()),
-  ) {
-    AppBarTitle(stringResource(R.string.simplex_address))
-    ReadableText(R.string.you_can_share_your_address)
-    ReadableText(R.string.you_wont_lose_your_contacts_if_delete_address)
-    ReadableText(R.string.you_can_accept_or_reject_connection)
-    ReadableTextWithLink(R.string.read_more_in_user_guide_with_link, "https://simplex.chat/docs/guide/app-settings.html#your-simplex-contact-address")
-  }
-}

apps/android/app/src/main/java/chat/simplex/app/views/usersettings/UserAddressView.kt

@@ -1,425 +1,118 @@
 package chat.simplex.app.views.usersettings
 
 import SectionBottomSpacer
-import SectionDividerSpaced
-import SectionItemView
-import SectionTextFooter
-import SectionView
 import android.content.res.Configuration
-import android.util.Log
 import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.rememberScrollState
-import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.foundation.verticalScroll
-import androidx.compose.material.*
-import androidx.compose.runtime.*
-import androidx.compose.runtime.saveable.rememberSaveable
+import androidx.compose.material.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
 import chat.simplex.app.R
-import chat.simplex.app.TAG
-import chat.simplex.app.model.*
+import chat.simplex.app.model.ChatModel
+import chat.simplex.app.model.UserContactLinkRec
 import chat.simplex.app.ui.theme.*
-import chat.simplex.app.views.chat.ShareAddressButton
 import chat.simplex.app.views.helpers.*
 import chat.simplex.app.views.newchat.QRCode
 
 @Composable
-fun UserAddressView(
-  chatModel: ChatModel,
-  viaCreateLinkView: Boolean = false,
-  shareViaProfile: Boolean = false,
-  close: () -> Unit
-) {
-  val context = LocalContext.current
-  val shareViaProfile = remember { mutableStateOf(shareViaProfile) }
-  var progressIndicator by remember { mutableStateOf(false) }
-  val onCloseHandler: MutableState<(close: () -> Unit) -> Unit> = remember { mutableStateOf({ _ -> }) }
-
-  fun setProfileAddress(on: Boolean) {
-    progressIndicator = true
-    withBGApi {
-      try {
-        val u = chatModel.controller.apiSetProfileAddress(on)
-        if (u != null) {
-          chatModel.updateUser(u)
+fun UserAddressView(chatModel: ChatModel) {
+  val cxt = LocalContext.current
+  UserAddressLayout(
+    userAddress = remember { chatModel.userAddress }.value,
+    createAddress = {
+      withApi {
+        val connReqContact = chatModel.controller.apiCreateUserAddress()
+        if (connReqContact != null) {
+          chatModel.userAddress.value = UserContactLinkRec(connReqContact)
         }
-      } catch (e: Exception) {
-        Log.e(TAG, "UserAddressView apiSetProfileAddress: ${e.stackTraceToString()}")
-      } finally {
-        progressIndicator = false
       }
-    }
-  }
-  val userAddress = remember { chatModel.userAddress }
-  val showLayout = @Composable {
-    UserAddressLayout(
-      userAddress = userAddress.value,
-      shareViaProfile,
-      onCloseHandler,
-      createAddress = {
-        withApi {
-          progressIndicator = true
-          val connReqContact = chatModel.controller.apiCreateUserAddress()
-          if (connReqContact != null) {
-            chatModel.userAddress.value = UserContactLinkRec(connReqContact)
-
-//            TODO uncomment in v5.2
-//            AlertManager.shared.showAlertDialog(
-//              title = generalGetString(R.string.share_address_with_contacts_question),
-//              text = generalGetString(R.string.add_address_to_your_profile),
-//              confirmText = generalGetString(R.string.share_verb),
-//              onConfirm = {
-//                setProfileAddress(true)
-//                shareViaProfile.value = true
-//              }
-//            )
-          }
-          progressIndicator = false
-        }
-      },
-      learnMore = {
-        ModalManager.shared.showModal {
-          Column(
-            Modifier
-              .fillMaxHeight()
-              .padding(horizontal = DEFAULT_PADDING),
-            verticalArrangement = Arrangement.SpaceBetween
-          ) {
-            UserAddressLearnMore()
-          }
-        }
-      },
-      share = { userAddress: String -> shareText(context, userAddress) },
-      sendEmail = { userAddress ->
-        sendEmail(
-        context,
-          generalGetString(R.string.email_invite_subject),
-          generalGetString(R.string.email_invite_body).format(userAddress.connReqContact)
-        )
-      },
-      setProfileAddress = ::setProfileAddress,
-      deleteAddress = {
-        AlertManager.shared.showAlertDialog(
-          title = generalGetString(R.string.delete_address__question),
-          text = if (shareViaProfile.value) generalGetString(R.string.all_your_contacts_will_remain_connected_update_sent) else generalGetString(R.string.all_your_contacts_will_remain_connected),
-          confirmText = generalGetString(R.string.delete_verb),
-          onConfirm = {
-            progressIndicator = true
-            withApi {
-              val u = chatModel.controller.apiDeleteUserAddress()
-              if (u != null) {
-                chatModel.userAddress.value = null
-                chatModel.updateUser(u)
-                shareViaProfile.value = false
-                progressIndicator = false
-              }
-            }
-          },
-          destructive = true,
-        )
-      },
-      saveAas = { aas: AutoAcceptState, savedAAS: MutableState<AutoAcceptState> ->
-        withBGApi {
-          val address = chatModel.controller.userAddressAutoAccept(aas.autoAccept)
-          if (address != null) {
-            chatModel.userAddress.value = address
-            savedAAS.value = aas
-          }
-        }
-      },
-    )
-  }
-
-  if (viaCreateLinkView) {
-    showLayout()
-  } else {
-    ModalView(close = { onCloseHandler.value(close) }) {
-      showLayout()
-    }
-  }
-
-  if (progressIndicator) {
-    Box(
-      Modifier.fillMaxSize(),
-      contentAlignment = Alignment.Center
-    ) {
-      if (userAddress.value != null) {
-        Surface(Modifier.size(50.dp), color = MaterialTheme.colors.background.copy(0.9f), shape = RoundedCornerShape(50)){}
+    },
+    share = { userAddress: String -> shareText(cxt, userAddress) },
+    acceptRequests = {
+      chatModel.userAddress.value?.let { address ->
+        ModalManager.shared.showModal(settings = true) { AcceptRequestsView(chatModel, address) }
       }
-      CircularProgressIndicator(
-        Modifier
-          .padding(horizontal = 2.dp)
-          .size(30.dp),
-        color = MaterialTheme.colors.secondary,
-        strokeWidth = 3.dp
+    },
+    deleteAddress = {
+      AlertManager.shared.showAlertDialog(
+        title = generalGetString(R.string.delete_address__question),
+        text = generalGetString(R.string.all_your_contacts_will_remain_connected),
+        confirmText = generalGetString(R.string.delete_verb),
+        onConfirm = {
+          withApi {
+            chatModel.controller.apiDeleteUserAddress()
+            chatModel.userAddress.value = null
+          }
+        },
+        destructive = true,
       )
     }
-  }
+  )
 }
 
 @Composable
-private fun UserAddressLayout(
+fun UserAddressLayout(
   userAddress: UserContactLinkRec?,
-  shareViaProfile: MutableState<Boolean>,
-  onCloseHandler: MutableState<(close: () -> Unit) -> Unit>,
   createAddress: () -> Unit,
-  learnMore: () -> Unit,
   share: (String) -> Unit,
-  sendEmail: (UserContactLinkRec) -> Unit,
-  setProfileAddress: (Boolean) -> Unit,
-  deleteAddress: () -> Unit,
-  saveAas: (AutoAcceptState, MutableState<AutoAcceptState>) -> Unit,
+  acceptRequests: () -> Unit,
+  deleteAddress: () -> Unit
 ) {
   Column(
     Modifier.verticalScroll(rememberScrollState()),
   ) {
-    AppBarTitle(stringResource(R.string.simplex_address), false)
+    AppBarTitle(stringResource(R.string.your_contact_address), false)
+    Text(
+      stringResource(R.string.you_can_share_your_address_anybody_will_be_able_to_connect),
+      Modifier.padding(bottom = 12.dp),
+      lineHeight = 22.sp
+    )
     Column(
       Modifier.fillMaxWidth().padding(bottom = DEFAULT_PADDING_HALF),
       horizontalAlignment = Alignment.CenterHorizontally,
       verticalArrangement = Arrangement.SpaceEvenly
     ) {
       if (userAddress == null) {
-        SectionView {
-          CreateAddressButton(createAddress)
-          SectionTextFooter(stringResource(R.string.create_address_and_let_people_connect))
-        }
-        SectionDividerSpaced(maxBottomPadding = false)
-        SectionView {
-          LearnMoreButton(learnMore)
-        }
-        LaunchedEffect(Unit) {
-          onCloseHandler.value = { close -> close() }
-        }
+        SimpleButton(stringResource(R.string.create_address), icon = painterResource(R.drawable.ic_qr_code), click = createAddress)
       } else {
-        val autoAcceptState = remember { mutableStateOf(AutoAcceptState(userAddress)) }
-        val autoAcceptStateSaved = remember { mutableStateOf(autoAcceptState.value) }
-        SectionView(stringResource(R.string.address_section_title).uppercase()) {
-          QRCode(userAddress.connReqContact, Modifier.padding(horizontal = DEFAULT_PADDING, vertical = DEFAULT_PADDING_HALF).aspectRatio(1f))
-          ShareAddressButton { share(userAddress.connReqContact) }
-          ShareViaEmailButton { sendEmail(userAddress) }
-//          TODO uncomment in v5.2
-//          ShareWithContactsButton(shareViaProfile, setProfileAddress)
-          AutoAcceptToggle(autoAcceptState) { saveAas(autoAcceptState.value, autoAcceptStateSaved) }
-          LearnMoreButton(learnMore)
-        }
-        if (autoAcceptState.value.enable) {
-          SectionDividerSpaced()
-          AutoAcceptSection(autoAcceptState, autoAcceptStateSaved, saveAas)
-        }
-
-        SectionDividerSpaced(maxBottomPadding = false)
-
-        SectionView {
-          DeleteAddressButton(deleteAddress)
-          SectionTextFooter(stringResource(R.string.your_contacts_will_remain_connected))
-        }
-        LaunchedEffect(Unit) {
-          onCloseHandler.value = { close ->
-            if (autoAcceptState.value == autoAcceptStateSaved.value) close()
-            else showUnsavedChangesAlert({ saveAas(autoAcceptState.value, autoAcceptStateSaved); close() }, close)
-          }
+        QRCode(userAddress.connReqContact, Modifier.aspectRatio(1f))
+        Row(
+          horizontalArrangement = Arrangement.spacedBy(10.dp),
+          verticalAlignment = Alignment.CenterVertically,
+          modifier = Modifier.padding(vertical = DEFAULT_PADDING)
+        ) {
+          SimpleButton(
+            stringResource(R.string.share_link),
+            icon = painterResource(R.drawable.ic_share),
+            click = { share(userAddress.connReqContact) })
+          SimpleButtonIconEnded(
+            stringResource(R.string.contact_requests),
+            icon = painterResource(R.drawable.ic_chevron_right),
+            click = acceptRequests
+          )
         }
+        SimpleButton(
+          stringResource(R.string.delete_address),
+          icon = painterResource(R.drawable.ic_delete),
+          color = Color.Red,
+          click = deleteAddress
+        )
       }
     }
     SectionBottomSpacer()
   }
 }
 
-@Composable
-private fun CreateAddressButton(onClick: () -> Unit) {
-  SettingsActionItem(
-    painterResource(R.drawable.ic_qr_code),
-    stringResource(R.string.create_simplex_address),
-    onClick,
-    iconColor = MaterialTheme.colors.primary,
-    textColor = MaterialTheme.colors.primary,
-  )
-}
-
-@Composable
-private fun LearnMoreButton(onClick: () -> Unit) {
-  SettingsActionItem(
-    painterResource(R.drawable.ic_info),
-    stringResource(R.string.learn_more_about_address),
-    onClick,
-  )
-}
-
-@Composable
-fun ShareViaEmailButton(onClick: () -> Unit) {
-  SettingsActionItem(
-    painterResource(R.drawable.ic_mail),
-    stringResource(R.string.invite_friends),
-    onClick,
-    iconColor = MaterialTheme.colors.primary,
-    textColor = MaterialTheme.colors.primary,
-  )
-}
-
-@Composable
-fun ShareWithContactsButton(shareViaProfile: MutableState<Boolean>, setProfileAddress: (Boolean) -> Unit) {
-  PreferenceToggleWithIcon(
-    stringResource(R.string.share_with_contacts),
-    painterResource(R.drawable.ic_person),
-    checked = shareViaProfile.value,
-  ) { on ->
-    shareViaProfile.value = on
-    if (on) {
-      AlertManager.shared.showAlertDialog(
-        title = generalGetString(R.string.share_address_with_contacts_question),
-        text = generalGetString(R.string.profile_update_will_be_sent_to_contacts),
-        confirmText = generalGetString(R.string.share_verb),
-        onConfirm = {
-          setProfileAddress(on)
-        },
-        onDismiss = {
-          shareViaProfile.value = !on
-        },
-        onDismissRequest = {
-          shareViaProfile.value = !on
-        })
-    } else {
-      AlertManager.shared.showAlertDialog(
-        title = generalGetString(R.string.stop_sharing_address),
-        text = generalGetString(R.string.profile_update_will_be_sent_to_contacts),
-        confirmText = generalGetString(R.string.stop_sharing),
-        onConfirm = {
-          setProfileAddress(on)
-        },
-        onDismiss = {
-          shareViaProfile.value = !on
-        },
-        onDismissRequest = {
-          shareViaProfile.value = !on
-        })
-  }
-  }
-}
-
-@Composable
-private fun AutoAcceptToggle(autoAcceptState: MutableState<AutoAcceptState>, saveAas: (AutoAcceptState) -> Unit) {
-  PreferenceToggleWithIcon(stringResource(R.string.auto_accept_contact), painterResource(R.drawable.ic_check), checked = autoAcceptState.value.enable) {
-    autoAcceptState.value = if (!it)
-      AutoAcceptState()
-    else
-      AutoAcceptState(it, autoAcceptState.value.incognito, autoAcceptState.value.welcomeText)
-    saveAas(autoAcceptState.value)
-  }
-}
-
-@Composable
-private fun DeleteAddressButton(onClick: () -> Unit) {
-  SettingsActionItem(
-    painterResource(R.drawable.ic_delete),
-    stringResource(R.string.delete_address),
-    onClick,
-    iconColor = MaterialTheme.colors.error,
-    textColor = MaterialTheme.colors.error,
-  )
-}
-
-private class AutoAcceptState {
-  var enable: Boolean = false
-    private set
-  var incognito: Boolean = false
-    private set
-  var welcomeText: String = ""
-    private set
-
-  constructor(enable: Boolean = false, incognito: Boolean = false, welcomeText: String = "") {
-    this.enable = enable
-    this.incognito = incognito
-    this.welcomeText = welcomeText
-  }
-
-  constructor(contactLink: UserContactLinkRec) {
-    contactLink.autoAccept?.let { aa ->
-      enable = true
-      incognito = aa.acceptIncognito
-      aa.autoReply?.let { msg ->
-        welcomeText = msg.text
-      } ?: run {
-        welcomeText = ""
-      }
-    }
-  }
-
-  val autoAccept: AutoAccept?
-    get() {
-      if (enable) {
-        var autoReply: MsgContent? = null
-        val s = welcomeText.trim()
-        if (s != "") {
-          autoReply = MsgContent.MCText(s)
-        }
-        return AutoAccept(incognito, autoReply)
-      }
-      return null
-    }
-
-  override fun equals(other: Any?): Boolean {
-    if (other !is AutoAcceptState) return false
-    return this.enable == other.enable && this.incognito == other.incognito && this.welcomeText == other.welcomeText
-  }
-
-  override fun hashCode(): Int {
-    var result = enable.hashCode()
-    result = 31 * result + incognito.hashCode()
-    result = 31 * result + welcomeText.hashCode()
-    return result
-  }
-}
-
-@Composable
-private fun AutoAcceptSection(
-  autoAcceptState: MutableState<AutoAcceptState>,
-  savedAutoAcceptState: MutableState<AutoAcceptState>,
-  saveAas: (AutoAcceptState, MutableState<AutoAcceptState>) -> Unit
-) {
-  SectionView(stringResource(R.string.auto_accept_contact).uppercase()) {
-    AcceptIncognitoToggle(autoAcceptState)
-    WelcomeMessageEditor(autoAcceptState)
-    SaveAASButton(autoAcceptState.value == savedAutoAcceptState.value) { saveAas(autoAcceptState.value, savedAutoAcceptState) }
-  }
-}
-
-@Composable
-private fun AcceptIncognitoToggle(autoAcceptState: MutableState<AutoAcceptState>) {
-  PreferenceToggleWithIcon(
-    stringResource(R.string.accept_contact_incognito_button),
-    if (autoAcceptState.value.incognito) painterResource(R.drawable.ic_theater_comedy_filled) else painterResource(R.drawable.ic_theater_comedy),
-    if (autoAcceptState.value.incognito) Indigo else MaterialTheme.colors.secondary,
-    autoAcceptState.value.incognito,
-  ) {
-    autoAcceptState.value = AutoAcceptState(autoAcceptState.value.enable, it, autoAcceptState.value.welcomeText)
-  }
-}
-
-@Composable
-private fun WelcomeMessageEditor(autoAcceptState: MutableState<AutoAcceptState>) {
-  val welcomeText = rememberSaveable { mutableStateOf(autoAcceptState.value.welcomeText) }
-  TextEditor(welcomeText, Modifier.height(100.dp), placeholder = stringResource(R.string.enter_welcome_message_optional))
-  LaunchedEffect(welcomeText.value) {
-    if (welcomeText.value != autoAcceptState.value.welcomeText) {
-      autoAcceptState.value = AutoAcceptState(autoAcceptState.value.enable, autoAcceptState.value.incognito, welcomeText.value)
-    }
-  }
-}
-
-@Composable
-private fun SaveAASButton(disabled: Boolean, onClick: () -> Unit) {
-  SectionItemView(onClick, disabled = disabled) {
-    Text(stringResource(R.string.save_verb), color = if (disabled) MaterialTheme.colors.secondary else MaterialTheme.colors.primary)
-  }
-}
-
 @Preview(showBackground = true)
 @Preview(
   uiMode = Configuration.UI_MODE_NIGHT_YES,
@@ -433,27 +126,12 @@ fun PreviewUserAddressLayoutNoAddress() {
       userAddress = null,
       createAddress = {},
       share = { _ -> },
+      acceptRequests = {},
       deleteAddress = {},
-      saveAas = { _, _ -> },
-      setProfileAddress = { _ -> },
-      learnMore = {},
-      shareViaProfile = remember { mutableStateOf(false) },
-      onCloseHandler = remember { mutableStateOf({}) },
-      sendEmail = {},
     )
   }
 }
 
-private fun showUnsavedChangesAlert(save: () -> Unit, revert: () -> Unit) {
-  AlertManager.shared.showAlertDialogStacked(
-    title = generalGetString(R.string.save_settings_question),
-    confirmText = generalGetString(R.string.save_auto_accept_settings),
-    dismissText = generalGetString(R.string.exit_without_saving),
-    onConfirm = save,
-    onDismiss = revert,
-  )
-}
-
 @Preview(showBackground = true)
 @Preview(
   uiMode = Configuration.UI_MODE_NIGHT_YES,
@@ -467,13 +145,8 @@ fun PreviewUserAddressLayoutAddressCreated() {
       userAddress = UserContactLinkRec("https://simplex.chat/contact#/?v=1&smp=smp%3A%2F%2FPQUV2eL0t7OStZOoAsPEV2QYWt4-xilbakvGUGOItUo%3D%40smp6.simplex.im%2FK1rslx-m5bpXVIdMZg9NLUZ_8JBm8xTt%23MCowBQYDK2VuAyEALDeVe-sG8mRY22LsXlPgiwTNs9dbiLrNuA7f3ZMAJ2w%3D"),
       createAddress = {},
       share = { _ -> },
+      acceptRequests = {},
       deleteAddress = {},
-      saveAas = { _, _ -> },
-      setProfileAddress = { _ -> },
-      learnMore = {},
-      shareViaProfile = remember { mutableStateOf(false) },
-      onCloseHandler = remember { mutableStateOf({}) },
-      sendEmail = {},
     )
   }
 }

apps/android/app/src/main/res/drawable/ic_add_reaction.xml

@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24.dp"
-    android:height="24.dp"
-    android:viewportWidth="960"
-    android:viewportHeight="960">
-  <path
-      android:fillColor="#FF000000"
-      android:pathData="M480.33,875Q398.63,875 326.7,843.74Q254.78,812.47 201.14,758.74Q147.5,705 116.25,633.21Q85,561.42 85,479.8Q85,398.09 116.36,325.93Q147.73,253.78 201.13,200.39Q254.54,147 326.79,116Q399.04,85 479.92,85Q526.76,85 570.69,95.51Q614.62,106.03 654,125Q650.5,133.5 649.25,142.08Q648,150.67 648,160Q648,167.9 648.75,174.95Q649.5,182 652,189Q614,166.5 570.93,154.5Q527.86,142.5 479.9,142.5Q339.69,142.5 241.09,240.75Q142.5,339 142.5,479.51Q142.5,620.03 241.24,718.76Q339.97,817.5 480.49,817.5Q621,817.5 719.25,718.91Q817.5,620.31 817.5,480Q817.5,441.47 809.25,404.99Q801,368.5 786,336Q796.96,343.76 810.93,347.88Q824.9,352 840,352Q843.36,352 846.75,352Q850.14,352 853.5,351.5Q864,382 869.5,413.93Q875,445.87 875,479.82Q875,560.91 843.99,633.3Q812.97,705.68 759.49,758.99Q706,812.3 633.98,843.65Q561.95,875 480.33,875ZM624.45,426.5Q647.4,426.5 662.45,411.5Q677.5,396.49 677.5,373.55Q677.5,350.6 662.5,335.55Q647.49,320.5 624.55,320.5Q601.6,320.5 586.55,335.5Q571.5,350.51 571.5,373.45Q571.5,396.4 586.5,411.45Q601.51,426.5 624.45,426.5ZM335.45,426.5Q358.4,426.5 373.45,411.5Q388.5,396.49 388.5,373.55Q388.5,350.6 373.5,335.55Q358.49,320.5 335.55,320.5Q312.6,320.5 297.55,335.5Q282.5,350.51 282.5,373.45Q282.5,396.4 297.5,411.45Q312.51,426.5 335.45,426.5ZM480,696Q544.5,696 599.25,661.5Q654,627 679,566.5L281,566.5Q307,627 361.25,661.5Q415.5,696 480,696ZM480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480ZM811.5,188.5L760,188.5Q747.75,188.5 739.63,180.33Q731.5,172.15 731.5,159.82Q731.5,147.5 739.63,139.25Q747.75,131 760,131L811.5,131L811.5,80Q811.5,67.75 819.67,59.38Q827.85,51 840.17,51Q852.5,51 860.75,59.38Q869,67.75 869,80L869,131L920,131Q932.25,131 940.63,139.43Q949,147.85 949,160.17Q949,172.5 940.63,180.5Q932.25,188.5 920,188.5L869,188.5L869,240Q869,252.25 860.58,260.38Q852.15,268.5 839.83,268.5Q827.5,268.5 819.5,260.38Q811.5,252.25 811.5,240L811.5,188.5Z"/>
-</vector>

apps/android/app/src/main/res/drawable/ic_add_reaction_filled.xml

@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24.dp"
-    android:height="24.dp"
-    android:viewportWidth="960"
-    android:viewportHeight="960">
-  <path
-      android:fillColor="#FF000000"
-      android:pathData="M811.5,188.5L760,188.5Q748.5,188.5 740,180.33Q731.5,172.15 731.5,159.82Q731.5,147.5 739.63,139.25Q747.75,131 760,131L811.5,131L811.5,80Q811.5,67.75 819.67,59.38Q827.85,51 840.17,51Q852.5,51 860.75,59.38Q869,67.75 869,80L869,131L920,131Q932.25,131 940.63,139.43Q949,147.85 949,160.17Q949,172.5 940.63,180.5Q932.25,188.5 920,188.5L869,188.5L869,240Q869,251.5 860.58,260Q852.15,268.5 839.83,268.5Q827.5,268.5 819.5,260.38Q811.5,252.25 811.5,240L811.5,188.5ZM480.33,875Q398.63,875 326.7,843.74Q254.78,812.47 201.14,758.74Q147.5,705 116.25,633.21Q85,561.42 85,479.8Q85,398.09 116.36,325.93Q147.73,253.78 201.13,200.39Q254.54,147 326.79,116Q399.04,85 479.92,85Q526.76,85 570.69,95.51Q614.62,106.03 654,125Q650.5,133.5 649.25,142.08Q648,150.67 648,159.57Q648,198 671.44,228.46Q694.88,258.93 732.5,267.5Q741.57,305.17 772.03,328.58Q802.48,352 840.28,352Q843.36,352 846.75,352Q850.14,352 853.5,351.5Q864,382 869.5,413.93Q875,445.87 875,479.82Q875,560.91 843.99,633.3Q812.97,705.68 759.49,758.99Q706,812.3 633.98,843.65Q561.95,875 480.33,875ZM624.45,426.5Q647.4,426.5 662.45,411.5Q677.5,396.49 677.5,373.55Q677.5,350.6 662.5,335.55Q647.49,320.5 624.55,320.5Q601.6,320.5 586.55,335.5Q571.5,350.51 571.5,373.45Q571.5,396.4 586.5,411.45Q601.51,426.5 624.45,426.5ZM335.45,426.5Q358.4,426.5 373.45,411.5Q388.5,396.49 388.5,373.55Q388.5,350.6 373.5,335.55Q358.49,320.5 335.55,320.5Q312.6,320.5 297.55,335.5Q282.5,350.51 282.5,373.45Q282.5,396.4 297.5,411.45Q312.51,426.5 335.45,426.5ZM480,696Q544.5,696 599.25,661.5Q654,627 679,566.5L281,566.5Q307,627 361.25,661.5Q415.5,696 480,696Z"/>
-</vector>

apps/android/app/src/main/res/drawable/ic_close.xml

@@ -5,5 +5,5 @@
     android:viewportHeight="960">
   <path
       android:fillColor="#FF000000"
-      android:pathData="M480,520.5L271,729.5Q262,738.5 250.75,738.5Q239.5,738.5 230.5,729.5Q221.5,720.5 221.5,709.25Q221.5,698 230.5,689L440,479.5L230.5,270Q221.5,261.5 221.5,250.25Q221.5,239 230.5,230Q239.5,221 250.75,221Q262,221 271,230L480,439.5L689,230.5Q698,221.5 709.25,221.5Q720.5,221.5 729.5,230.5Q738.5,239.5 738.5,250.75Q738.5,262 729.5,271L520.5,480L730,689.5Q738.5,698.5 738.5,709.75Q738.5,721 730,729.5Q721,738.5 709.75,738.5Q698.5,738.5 689.5,729.5L480,520.5Z"/>
+      android:pathData="m480,520.5 l-209,209q-9,9 -20.25,9t-20.25,-9q-9,-9 -9,-20.25t9,-20.25L440,479.5 230.5,270q-9,-8.5 -9,-19.75t9,-20.25q9,-9 20.25,-9t20.25,9l209,209.5 209,-209q9,-9 20.25,-9t20.25,9q9,9 9,20.25t-9,20.25l-209,209L730,689.5q8.5,9 8.5,20.25T730,729.5q-9,9 -20.25,9t-20.25,-9L480,520.5Z"/>
 </vector>

apps/android/app/src/main/res/drawable/ic_person.xml

@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="960"
-    android:viewportHeight="960">
-  <path
-      android:fillColor="#FF000000"
-      android:pathData="M480.02,479.5q-65.52,0 -106.52,-40.98t-41,-106.5q0,-65.52 40.98,-106.52t106.5,-41q65.52,0 106.52,40.98t41,106.5q0,65.52 -40.98,106.52t-106.5,41ZM738,793.5L222,793.5q-23.72,0 -40.61,-16.89Q164.5,759.72 164.5,736v-33.51q0,-37.49 18.75,-63.99t48.43,-40.17Q298,569 358.5,554T480,539q61,0 121,15.25t126.4,44.43q30.82,13.64 49.46,39.85Q795.5,664.75 795.5,702.47v33.77q0,23.45 -16.89,40.36Q761.72,793.5 738,793.5ZM222,736h516v-33.37q0,-16.32 -9.75,-30.97Q718.5,657 705,650q-64,-30.5 -116.29,-42t-108.57,-11.5Q423.5,596.5 370.5,608t-116,42q-14,7 -23.25,21.73T222,702.74L222,736ZM480,422q39,0 64.5,-25.5T570,332q0,-39 -25.5,-64.5T480,242q-39,0 -64.5,25.5T390,332q0,39 25.5,64.5T480,422ZM480,332ZM480,736Z"/>
-</vector>

apps/android/app/src/main/res/values-ar/strings.xml

@@ -30,7 +30,8 @@
     <string name="smp_servers_preset_add">أضف خوادم محددة مسبقًا</string>
     <string name="smp_servers_add_to_another_device">أضف إلى جهاز آخر</string>
     <string name="users_delete_all_chats_deleted">سيتم حذف جميع الدردشات والرسائل - لا يمكن التراجع عن هذا!</string>
-    <string name="network_enable_socks_info">الوصول إلى الخوادم عبر بروكسي SOCKS على المنفذ %d؟ يجب بدء تشغيل الوكيل قبل تمكين هذا الخيار.</string>
+    <string name="network_enable_socks_info">الوصول إلى الخوادم عبر بروكسي SOCKS على المنفذ 9050؟ يجب بدء تشغيل الوكيل قبل تمكين هذا الخيار.</string>
+    <string name="accept_requests">قبول طلبات</string>
     <string name="smp_servers_add">إضافة خادم …</string>
     <string name="network_settings">إعدادات الشبكة المتقدمة</string>
     <string name="all_group_members_will_remain_connected">سيبقى جميع أعضاء المجموعة على اتصال.</string>

apps/android/app/src/main/res/values-cs/strings.xml

@@ -9,17 +9,18 @@
     <string name="network_settings">Pokročilá nastavení sítě</string>
     <string name="accept">Přijmout</string>
     <string name="smp_servers_add">Přidat server…</string>
-    <string name="network_enable_socks_info">Přistupovat k serverům přes SOCKS proxy na portu %d\? Před povolením této možnosti musí být spuštěna proxy.</string>
+    <string name="network_enable_socks_info">Přistupovat k serverům přes SOCKS proxy na portu 9050\? Před povolením této možnosti musí být spuštěna proxy.</string>
     <string name="accept_feature">Přijmout</string>
     <string name="allow_your_contacts_to_send_disappearing_messages">Povolte svým kontaktům odesílat mizící zprávy.</string>
     <string name="about_simplex_chat">O <xliff:g id="appNameFull">SimpleX Chat</xliff:g></string>
     <string name="smp_servers_add_to_another_device">Přidat do jiného zařízení</string>
+    <string name="accept_requests">Přijímat žádosti</string>
     <string name="allow_verb">Povolit</string>
     <string name="allow_voice_messages_question">Povolit hlasové zprávy\?</string>
     <string name="about_simplex">O SimpleX</string>
     <string name="a_plus_b">a + b</string>
     <string name="accept_call_on_lock_screen">Přijmout</string>
-    <string name="chat_item_ttl_day">1 den</string>
+    <string name="chat_item_ttl_day">1 dni</string>
     <string name="group_member_role_admin">správce</string>
     <string name="users_add">Přidat profil</string>
     <string name="users_delete_all_chats_deleted">Všechny chaty a zprávy budou smazány – tuto akci nelze vrátit zpět!</string>
@@ -128,7 +129,7 @@
     <string name="error_sending_message">Chyba odesílání zprávy</string>
     <string name="error_adding_members">Chyba přidávání členů</string>
     <string name="contact_already_exists">Kontakt již existuje</string>
-    <string name="you_are_already_connected_to_vName_via_this_link">Jste již připojeni k <xliff:g id="contactName" example="Alice">%1$s</xliff:g>.</string>
+    <string name="you_are_already_connected_to_vName_via_this_link">Jste již připojeni k <xliff:g id="contactName" example="Alice">%1$s!</xliff:g>.</string>
     <string name="invalid_connection_link">Neplatný odkaz na spojení</string>
     <string name="error_accepting_contact_request">Chyba příjmu požadavku od kontaktu</string>
     <string name="error_changing_address">Chyba změny adresy</string>
@@ -240,6 +241,8 @@
     <string name="network_session_mode_entity">Připojení</string>
     <string name="core_simplexmq_version">simplexmq: v%s (%2s)</string>
     <string name="create_address">Vytvořit adresu</string>
+    <string name="accept_automatically">Automaticky</string>
+    <string name="section_title_welcome_message">UVÍTACÍ ZPRÁVA</string>
     <string name="save_and_notify_group_members">Uložit a upozornit členy skupiny</string>
     <string name="exit_without_saving">Ukončit bez uložení</string>
     <string name="the_messaging_and_app_platform_protecting_your_privacy_and_security">Platforma pro zasílání zpráv a aplikace chránící vaše soukromí a bezpečnost.</string>
@@ -375,6 +378,7 @@
     <string name="delete_pending_connection__question">Smazat čekající připojení\?</string>
     <string name="icon_descr_settings">Nastavení</string>
     <string name="image_descr_qr_code">QR kód</string>
+    <string name="show_QR_code_for_your_contact_to_scan_from_the_app__multiline">Váš kontakt může z aplikace naskenovat QR kód.</string>
     <string name="if_you_cannot_meet_in_person_show_QR_in_video_call_or_via_another_channel">Pokud se nemůžete setkat osobně, ukažte ve <b>videohovoru QR kód</b> nebo sdílejte odkaz.</string>
     <string name="scan_code">Skenovat kód</string>
     <string name="incorrect_code">Nesprávný bezpečnostní kód!</string>
@@ -383,7 +387,7 @@
     <string name="clear_verification">Jasné ověření</string>
     <string name="to_verify_compare">Chcete-li ověřit koncové šifrování u svého kontaktu, porovnejte (nebo naskenujte) kód na svých zařízeních.</string>
     <string name="your_settings">Vaše nastavení</string>
-    <string name="your_simplex_contact_address">Vaše SimpleX adresa</string>
+    <string name="your_simplex_contact_address">Vaše adresa <xliff:g id="appName">SimpleX</xliff:g></string>
     <string name="database_passphrase_and_export">Heslo databáze a export</string>
     <string name="your_chat_profiles">Chat profily</string>
     <string name="chat_with_the_founder">Zaslat otázky a nápady</string>
@@ -392,6 +396,7 @@
     <string name="network_use_onion_hosts_required_desc">Pro připojení budou vyžadováni Onion hostitelé.</string>
     <string name="update_network_session_mode_question">Aktualizovat režim dopravní izolace\?</string>
     <string name="app_version_code">Sestavení aplikace: %s</string>
+    <string name="you_can_share_your_address_anybody_will_be_able_to_connect">Můžete sdílet svou adresu jako odkaz nebo jako QR kód - kdokoli se k vám bude moci připojit. O své kontakty nepřijdete, pokud ji později smažete.</string>
     <string name="share_link">Sdílet odkaz</string>
     <string name="delete_address">Smazat adresu</string>
     <string name="full_name__field">Celé jméno:</string>
@@ -568,7 +573,7 @@
     <string name="you_have_no_chats">Nemáte žádné konverzace</string>
     <string name="icon_descr_cancel_image_preview">Zrušit náhled obrázku</string>
     <string name="share_message">Sdílet zprávu…</string>
-    <string name="share_image">Sdílet média…</string>
+    <string name="share_image">Sdílet obrázek…</string>
     <string name="icon_descr_cancel_file_preview">Zrušit náhled souboru</string>
     <string name="images_limit_title">Příliš mnoho obrázků!</string>
     <string name="waiting_for_file">Čekání na soubor</string>
@@ -635,6 +640,7 @@
     <string name="ensure_ICE_server_address_are_correct_format_and_unique">Ujistěte se, že adresy serverů WebRTC ICE jsou ve správném formátu, oddělené na řádcích a nejsou duplicitní.</string>
     <string name="save_servers_button">Uložit</string>
     <string name="network_and_servers">Síť a servery</string>
+    <string name="network_socks_toggle">Použít proxy server SOCKS (port 9050)</string>
     <string name="update_onion_hosts_settings_question">Aktualizovat nastavení hostitelů .onion\?</string>
     <string name="network_use_onion_hosts">Použít hostitele .onion</string>
     <string name="network_use_onion_hosts_prefer">Když bude dostupný</string>
@@ -653,6 +659,7 @@
     <string name="core_version">Verze jádra: v%s</string>
     <string name="delete_address__question">Smazat adresu\?</string>
     <string name="all_your_contacts_will_remain_connected">Všechny vaše kontakty zůstanou připojeny.</string>
+    <string name="contact_requests">Žádosti o kontakt</string>
     <string name="display_name__field">Zobrazované jméno:</string>
     <string name="your_profile_is_stored_on_device_and_shared_only_with_contacts_simplex_cannot_see_it">Váš profil je uložen v zařízení a je sdílen pouze s vašimi kontakty. <xliff:g id="appName">SimpleX</xliff:g> servery váš profil vidět nemohou.</string>
     <string name="save_preferences_question">Uložit předvolby\?</string>
@@ -690,9 +697,9 @@
     <string name="onboarding_notifications_mode_subtitle">Lze změnit později v nastavení.</string>
     <string name="onboarding_notifications_mode_off">Když aplikace běží</string>
     <string name="onboarding_notifications_mode_service">Okamžité</string>
-    <string name="onboarding_notifications_mode_off_desc"><b>Nejlepší pro baterii</b>. Budete přijímat oznámení pouze když aplikace běží (žádná služba na pozadí).</string>
-    <string name="onboarding_notifications_mode_periodic_desc"><b>Dobré pro baterii</b>. Služba na pozadí bude kontrolovat každých 10 minut. Můžete zmeškat hovory nebo naléhavé zprávy.</string>
-    <string name="onboarding_notifications_mode_service_desc"><b>Využívá více baterie</b>! Služba na pozadí je spuštěna vždy - oznámení se zobrazí, jakmile jsou zprávy k dispozici.</string>
+    <string name="onboarding_notifications_mode_off_desc"><b>Nejlepší pro baterii</b>. Budete přijímat oznámení pouze když aplikace běží, služba na pozadí NEBUDE použita.</string>
+    <string name="onboarding_notifications_mode_periodic_desc"><b>Dobré pro baterii</b>. Služba na pozadí bude kontrolovat nové zprávy každých 10 minut. Můžete zmeškat hovory a naléhavé zprávy.</string>
+    <string name="onboarding_notifications_mode_service_desc"><b>Využívá více baterie</b>! Služba na pozadí je vždy spuštěna - oznámení se zobrazí, jakmile jsou zprávy k dispozici.</string>
     <string name="paste_the_link_you_received">Vložení přijatého odkazu</string>
     <string name="incoming_video_call">Příchozí videohovor</string>
     <string name="incoming_audio_call">Příchozí zvukový hovor</string>
@@ -950,11 +957,12 @@
     <string name="v4_5_italian_interface">Italské rozhraní</string>
     <string name="v4_5_italian_interface_descr">Díky uživatelům - překládejte prostřednictvím Weblate!</string>
     <string name="you_will_be_connected_when_your_contacts_device_is_online">Budete připojeni, jakmile bude zařízení vašeho kontaktu online, vyčkejte prosím nebo se podívejte později!</string>
+    <string name="your_contact_address">Vaše adresa</string>
     <string name="your_chat_profile_will_be_sent_to_your_contact">Váš chat profil bude odeslán
 \nvašemu kontaktu</string>
     <string name="your_chats">Vaše konverzace</string>
     <string name="paste_connection_link_below_to_connect">Do níže uvedeného pole vložte odkaz, který jste obdrželi pro spojení s kontaktem.</string>
-    <string name="share_invitation_link">Sdílet jednorázovou pozvánku</string>
+    <string name="share_invitation_link">Sdílet pozvánku</string>
     <string name="status_e2e_encrypted">koncově šifrované</string>
     <string name="moderated_description">moderované</string>
     <string name="moderated_item_description">moderovaný %s</string>
@@ -1129,136 +1137,4 @@
     <string name="stop_file__action">Zastavit soubor</string>
     <string name="stop_snd_file__title">Zastavit odesílání souboru\?</string>
     <string name="stop_rcv_file__title">Zastavit příjem souboru\?</string>
-    <string name="learn_more_about_address">O adrese SimpleX</string>
-    <string name="one_time_link_short">Jednorázový odkaz</string>
-    <string name="message_reactions">Reakce na zprávy</string>
-    <string name="send_disappearing_message_send">Poslat</string>
-    <string name="self_destruct_passcode">Samodestrukční heslo</string>
-    <string name="self_destruct_passcode_changed">Heslo pro sebedestrukci změněno!</string>
-    <string name="color_primary_variant">Další zbarvení</string>
-    <string name="color_secondary">Sekundární</string>
-    <string name="empty_chat_profile_is_created">Vytvořit prázdný chat profil se zadaným názvem a otevřít aplikaci jako obvykle.</string>
-    <string name="if_you_enter_passcode_data_removed">Pokud tento přístupový kód zadáte při otevření aplikace, všechna data budou nenávratně smazána!</string>
-    <string name="color_secondary_variant">Další sekundární</string>
-    <string name="color_background">Pozadí</string>
-    <string name="color_surface">Menu a upozornění</string>
-    <string name="custom_time_picker_custom">vlastní</string>
-    <string name="custom_time_picker_select">Vybrat</string>
-    <string name="error_loading_details">Chyba načítání podrobností</string>
-    <string name="info_menu">Info</string>
-    <string name="auth_open_chat_profiles">Otevřít chat profily</string>
-    <string name="edit_history">Historie</string>
-    <string name="received_message">Přijatá zpráva</string>
-    <string name="sent_message">Poslaná zpráva</string>
-    <string name="disappearing_message">Mizící zpráva</string>
-    <string name="send_disappearing_message">Poslat mizící zprávu</string>
-    <string name="send_disappearing_message_1_minute">1 minutu</string>
-    <string name="send_disappearing_message_30_seconds">30 vteřin</string>
-    <string name="send_disappearing_message_custom_time">Vlastní čas</string>
-    <string name="all_your_contacts_will_remain_connected_update_sent">Všechny vaše kontakty zůstanou připojeny. Aktualizace profilu bude odeslána vašim kontaktům.</string>
-    <string name="invite_friends">Pozvat přátele</string>
-    <string name="enabled_self_destruct_passcode">Povolit sebedestrukční heslo</string>
-    <string name="self_destruct">Sebedestrukce</string>
-    <string name="enable_self_destruct">Povolit sebedestrukci</string>
-    <string name="if_you_enter_self_destruct_code">Pokud při otevření aplikace zadáte sebedestrukční heslo:</string>
-    <string name="self_destruct_passcode_enabled">Sebedestrukční heslo povoleno!</string>
-    <string name="set_passcode">Nastavit heslo</string>
-    <string name="info_row_updated_at">Záznam aktualizován v</string>
-    <string name="info_row_sent_at">Posláno v</string>
-    <string name="share_address">Sdílet adresu</string>
-    <string name="info_row_moderated_at">Upraveno v</string>
-    <string name="info_row_received_at">Přijato v</string>
-    <string name="share_text_received_at">Přijato v: %s</string>
-    <string name="share_text_updated_at">Záznam aktualizován v: %s</string>
-    <string name="share_text_sent_at">Posláno v: %s</string>
-    <string name="share_text_disappears_at">Zmizí v: %s</string>
-    <string name="share_text_moderated_at">Upraveno v: %s</string>
-    <string name="current_version_timestamp">%s (aktuální)</string>
-    <string name="dark_theme">Tmavý motiv</string>
-    <string name="import_theme">Import motivu</string>
-    <string name="theme_simplex">SimpleX</string>
-    <string name="export_theme">Export motivu</string>
-    <string name="color_sent_message">Poslaná zpráva</string>
-    <string name="color_title">Titul</string>
-    <string name="color_received_message">Přijatá zpráva</string>
-    <string name="allow_your_contacts_adding_message_reactions">Povolit kontaktům přidávat reakce na zprávy.</string>
-    <string name="both_you_and_your_contact_can_add_message_reactions">Vy i váš kontakt můžete přidávat reakce na zprávy.</string>
-    <string name="message_reactions_prohibited_in_this_chat">Reakce na zprávy jsou v tomto chatu zakázány.</string>
-    <string name="prohibit_message_reactions">Zakázat reakce na zprávy.</string>
-    <string name="prohibit_message_reactions_group">Zakázat reakce na zprávy.</string>
-    <string name="group_members_can_add_message_reactions">Členové skupin mohou přidávat reakce na zprávy.</string>
-    <string name="message_reactions_are_prohibited">Reakce na zprávy jsou v této skupině zakázány.</string>
-    <string name="custom_time_unit_months">měsíců</string>
-    <string name="learn_more">Zjistit více</string>
-    <string name="share_with_contacts">Sdílet s kontakty</string>
-    <string name="group_welcome_preview">Náhled</string>
-    <string name="opening_database">Otvírání databáze…</string>
-    <string name="error_setting_address">Chyba nastavení adresy</string>
-    <string name="scan_qr_to_connect_to_contact">Pro připojení může váš kontakt naskenovat QR kód, nebo použít odkaz v aplikaci.</string>
-    <string name="you_can_accept_or_reject_connection">Když někdo požádá o připojení, můžete žádost přijmout nebo odmítnout.</string>
-    <string name="read_more_in_user_guide_with_link">Přečtěte si více v <font color="#0088ff">Uživatelské příručce</font>.</string>
-    <string name="simplex_address">Adresa SimpleX</string>
-    <string name="theme_colors_section_title">BARVY MOTIVU</string>
-    <string name="customize_theme_title">Přizpůsobit motiv</string>
-    <string name="profile_update_will_be_sent_to_contacts">Aktualizace profilu bude zaslána vašim kontaktům.</string>
-    <string name="share_address_with_contacts_question">Sdílet adresu s kontakty\?</string>
-    <string name="stop_sharing_address">Přestat sdílet adresu\?</string>
-    <string name="create_address_and_let_people_connect">Vytvořit adresu, aby se s vámi lidé mohli spojit.</string>
-    <string name="save_auto_accept_settings">Uložit nastavení automatického přijímání</string>
-    <string name="stop_sharing">Přestat sdílet</string>
-    <string name="auto_accept_contact">Automaticky přijmout</string>
-    <string name="you_can_create_it_later">Můžete vytvořit později</string>
-    <string name="dont_create_address">Nevytvářet adresu</string>
-    <string name="email_invite_body">Ahoj!
-\nSpojte se se mnou přes SimpleX Chat: %s</string>
-    <string name="email_invite_subject">Promluvme si v SimpleX Chatu</string>
-    <string name="whats_new_read_more">Přečíst více</string>
-    <string name="v5_1_self_destruct_passcode_descr">Všechna data se při zadání vymažou.</string>
-    <string name="v5_1_better_messages">Lepší zprávy</string>
-    <string name="v5_1_custom_themes_descr">Přizpůsobit a sdílet barevné motivy.</string>
-    <string name="v5_1_custom_themes">Vlastní motiv</string>
-    <string name="v5_1_message_reactions_descr">Konečně je máme! 🚀</string>
-    <string name="v5_1_message_reactions">Reakce na zprávy</string>
-    <string name="v5_1_self_destruct_passcode">Samodestrukční heslo</string>
-    <string name="v5_1_japanese_portuguese_interface">Japonské a portugalské uživatelské rozhraní</string>
-    <string name="custom_time_unit_minutes">minut</string>
-    <string name="custom_time_unit_seconds">vteřin</string>
-    <string name="whats_new_thanks_to_users_contribute_weblate">Díky uživatelům - překládejte prostřednictvím Weblate!</string>
-    <string name="v5_1_better_messages_descr">- 5 minutové hlasové zprávy.
-\n- vlastní čas mizení.
-\n- historie úprav.</string>
-    <string name="custom_time_unit_days">dní</string>
-    <string name="custom_time_unit_hours">hodin</string>
-    <string name="custom_time_unit_weeks">týdnů</string>
-    <string name="send_disappearing_message_5_minutes">5 minut</string>
-    <string name="add_address_to_your_profile">Přidejte adresu do svého profilu, aby ji vaše kontakty mohly sdílet s dalšími lidmi. Aktualizace profilu bude zaslána vašim kontaktům.</string>
-    <string name="all_app_data_will_be_cleared">Všechna data aplikace jsou smazána.</string>
-    <string name="address_section_title">Adresa</string>
-    <string name="allow_message_reactions">Povolit reakce na zprávy.</string>
-    <string name="allow_message_reactions_only_if">Povolit reakce na zprávy, pokud je váš kontakt povolí.</string>
-    <string name="create_simplex_address">Vytvořit SimpleX adresu</string>
-    <string name="continue_to_next_step">Pokračovat</string>
-    <string name="enter_welcome_message_optional">Zadat uvítací zprávu... (volitelně)</string>
-    <string name="if_you_cant_meet_in_person">Pokud se nemůžete setkat osobně, zobrazte QR kód ve videohovoru nebo sdílejte odkaz.</string>
-    <string name="change_self_destruct_mode">Změnit režim sebedestrukce</string>
-    <string name="change_self_destruct_passcode">Změnit sebedestrukční heslo</string>
-    <string name="item_info_current">(aktuální)</string>
-    <string name="share_text_database_id">ID databáze: %d</string>
-    <string name="info_row_deleted_at">Smazáno v</string>
-    <string name="share_text_deleted_at">Smazáno v: %s</string>
-    <string name="info_row_disappears_at">Zmizí v</string>
-    <string name="enter_welcome_message">Zadat uvítací zprávu…</string>
-    <string name="import_theme_error">Chyba importu motivu</string>
-    <string name="import_theme_error_desc">Ujistěte se, že soubor má správnou syntaxi YAML. Exportujte motiv, abyste měli příklad struktury souboru.</string>
-    <string name="self_destruct_new_display_name">Nově zobrazované jméno:</string>
-    <string name="only_you_can_add_message_reactions">Reakce na zprávy můžete přidávat pouze vy.</string>
-    <string name="save_settings_question">Uložit nastavení\?</string>
-    <string name="only_your_contact_can_add_message_reactions">Reakce na zprávy může přidávat pouze váš kontakt.</string>
-    <string name="your_contacts_will_remain_connected">Vaše kontakty zůstanou připojeny.</string>
-    <string name="you_can_share_this_address_with_your_contacts">Tuto adresu můžete sdílet se svými kontakty, aby se mohli připojit k %s.</string>
-    <string name="your_contacts_will_see_it">Vaše kontakty v SimpleX ji uvidí.
-\nMůžete ji změnit v Nastavení.</string>
-    <string name="you_can_share_your_address">Svou adresu můžete sdílet jako odkaz nebo QR kód - kdokoli se k vám může připojit.</string>
-    <string name="you_wont_lose_your_contacts_if_delete_address">Pokud později adresu odstraníte, o kontakty nepřijdete.</string>
-    <string name="app_passcode_replaced_with_self_destruct">Přístupový kód aplikace je nahrazen sebedestrukčním přístupovým heslem.</string>
 </resources>

apps/android/app/src/main/res/values-de/strings.xml

@@ -63,7 +63,7 @@
     <string name="error_receiving_file">Fehler beim Empfangen der Datei</string>
     <string name="error_creating_address">Fehler beim Erstellen der Adresse</string>
     <string name="contact_already_exists">Kontakt ist bereits vorhanden</string>
-    <string name="you_are_already_connected_to_vName_via_this_link">Sie sind bereits mit <xliff:g id="contactName" example="Alice">%1$s</xliff:g> verbunden.</string>
+    <string name="you_are_already_connected_to_vName_via_this_link">Sie sind bereits mit <xliff:g id="contactName" example="Alice">%1$s!</xliff:g> verbunden.</string>
     <string name="invalid_connection_link">Ungültiger Verbindungslink</string>
     <string name="please_check_correct_link_and_maybe_ask_for_a_new_one">Überprüfen Sie bitte, ob Sie den richtigen Link genutzt haben oder bitten Sie Ihren Kontakt darum, Ihnen nochmal einen Link zuzusenden.</string>
     <string name="connection_error_auth">Verbindungsfehler (AUTH)</string>
@@ -328,11 +328,12 @@
     <string name="you_will_be_connected_when_group_host_device_is_online">Sie werden mit der Gruppe verbunden, sobald das Endgerät des Gruppen-Hosts online ist. Bitte warten oder schauen Sie später nochmal nach!</string>
     <string name="you_will_be_connected_when_your_connection_request_is_accepted">Sie werden verbunden, sobald Ihre Verbindungsanfrage akzeptiert wird. Bitte warten oder schauen Sie später nochmal nach!</string>
     <string name="you_will_be_connected_when_your_contacts_device_is_online">Sie werden verbunden, sobald das Endgerät Ihres Kontakts online ist. Bitte warten oder schauen Sie später nochmal nach!</string>
+    <string name="show_QR_code_for_your_contact_to_scan_from_the_app__multiline">Zeigen Sie Ihrem Kontakt den QR-Code aus der App zum Scannen.</string>
     <string name="if_you_cannot_meet_in_person_show_QR_in_video_call_or_via_another_channel">Wenn Sie sich nicht persönlich treffen können, können Sie <b>den QR-Code während eines Videoanrufs anzeigen</b> oder einen Einladungslink über einen anderen Kanal mit Ihrem Kontakt teilen.</string>
     <string name="your_chat_profile_will_be_sent_to_your_contact">Ihr Chat-Profil wird
 \nan Ihren Kontakt gesendet</string>
     <string name="if_you_cannot_meet_in_person_scan_QR_in_video_call_or_ask_for_invitation_link">Wenn Sie sich nicht persönlich treffen können, können Sie <b>den QR-Code während eines Videoanrufs scannen</b> oder Ihr Kontakt kann einen Einladungslink über einen anderen Kanal mit Ihnen teilen.</string>
-    <string name="share_invitation_link">Einmal-Link teilen</string>
+    <string name="share_invitation_link">Einladungslink teilen</string>
     <string name="paste_connection_link_below_to_connect">Fügen Sie den erhaltenen Link in das Feld unten ein, um sich mit Ihrem Kontakt zu verbinden.</string>
     <string name="your_profile_will_be_sent">Ihr Chat-Profil wird an Ihren Kontakt gesendet</string>
     <!-- PasteToConnect.kt -->
@@ -344,9 +345,10 @@
     <!-- CreateLinkView.kt -->
     <string name="create_one_time_link">Link / QR-Code erstellen</string>
     <string name="one_time_link">Einmaliger Einladungs-Link</string>
+    <string name="your_contact_address">Meine Kontaktadresse</string>
     <!-- settings - SettingsView.kt -->
     <string name="your_settings">Meine Einstellungen</string>
-    <string name="your_simplex_contact_address">Meine SimpleX-Adresse</string>
+    <string name="your_simplex_contact_address">Meine <xliff:g id="appName">SimpleX</xliff:g> Kontaktadresse</string>
     <string name="database_passphrase_and_export">Datenbank-Passwort &amp; -Export</string>
     <string name="about_simplex_chat">Über <xliff:g id="appNameFull">SimpleX Chat</xliff:g></string>
     <string name="how_to_use_simplex_chat">Wie man SimpleX nutzt</string>
@@ -395,8 +397,9 @@
     <string name="network_and_servers">Netzwerk &amp; Server</string>
     <string name="network_settings">Erweiterte Netzwerkeinstellungen</string>
     <string name="network_settings_title">Netzwerkeinstellungen</string>
+    <string name="network_socks_toggle">SOCKS-Proxy verwenden (Port 9050)</string>
     <string name="network_enable_socks">SOCKS-Proxy verwenden?</string>
-    <string name="network_enable_socks_info">Zugriff auf die Server über SOCKS-Proxy auf Port %d? Der Proxy muss gestartet werden, bevor diese Option aktiviert wird.</string>
+    <string name="network_enable_socks_info">Zugriff auf die Server über SOCKS-Proxy auf Port 9050? Der Proxy muss gestartet werden, bevor diese Option aktiviert wird.</string>
     <string name="network_disable_socks">Direkte Internetverbindung verwenden?</string>
     <string name="network_disable_socks_info">Wenn Sie dies bestätigen, können die Messaging-Server Ihre IP-Adresse und Ihren Provider sehen und mit welchen Servern Sie sich verbinden.</string>
     <string name="update_onion_hosts_settings_question">Einstellung für .onion-Hosts aktualisieren?</string>
@@ -415,8 +418,14 @@
     <string name="create_address">Adresse erstellen</string>
     <string name="delete_address__question">Adresse löschen?</string>
     <string name="all_your_contacts_will_remain_connected">Alle Ihre Kontakte bleiben verbunden.</string>
+    <string name="you_can_share_your_address_anybody_will_be_able_to_connect">Sie können Ihre Adresse als Link oder als QR-Code teilen – Jede Person kann sich darüber mit Ihnen verbinden. Sie werden Ihre mit dieser Adresse verbundenen Kontakte nicht verlieren, wenn Sie diese Adresse später löschen.</string>
     <string name="share_link">Link teilen</string>
     <string name="delete_address">Adresse löschen</string>
+    <!-- AcceptRequestsView.kt -->
+    <string name="contact_requests">Kontaktanfragen</string>
+    <string name="accept_requests">Anfragen annehmen</string>
+    <string name="accept_automatically">Automatisch</string>
+    <string name="section_title_welcome_message">Begrüßungsmeldung</string>
     <!-- User profile details - UserProfileView.kt -->
     <string name="display_name__field">Angezeigter Name:</string>
     <string name="full_name__field">"Vollständiger Name:</string>
@@ -905,8 +914,8 @@
     <string name="live">LIVE</string>
     <string name="view_security_code">Schauen Sie sich den Sicherheitscode an</string>
     <string name="onboarding_notifications_mode_service">Sofort</string>
-    <string name="onboarding_notifications_mode_periodic_desc"><b>Gute Option für die Batterieausdauer</b>. Der Hintergrundservice überprüft alle 10 Minuten nach Nachrichten. Sie können eventuell Anrufe oder dringende Nachrichten verpassen.</string>
-    <string name="onboarding_notifications_mode_off_desc"><b>Beste Option für die Batterieausdauer</b>. Sie empfangen Benachrichtigungen nur solange die App abläuft (kein aktiver Hintergrundservice).</string>
+    <string name="onboarding_notifications_mode_periodic_desc"><b>Gute Option für die Batterieausdauer</b>. Der Hintergrundservice überprüft alle 10 Minuten nach neuen Nachrichten. Sie können eventuell Anrufe und dringende Nachrichten verpassen.</string>
+    <string name="onboarding_notifications_mode_off_desc"><b>Beste Option für die Batterieausdauer</b>. Sie empfangen Benachrichtigungen nur solange die App abläuft. Der Hintergrundservice wird nicht genutzt!</string>
     <string name="send_verb">Senden</string>
     <string name="is_verified">%s wurde erfolgreich überprüft</string>
     <string name="clear_verification">Überprüfung zurücknehmen</string>
@@ -942,7 +951,7 @@
     <string name="failed_to_parse_chat_title">Fehler beim Laden des Chats</string>
     <string name="failed_to_parse_chats_title">Fehler beim Laden der Chats</string>
     <string name="contact_developers">Bitte aktualisieren Sie die App und nehmen Sie Kontakt mit den Entwicklern auf.</string>
-    <string name="onboarding_notifications_mode_service_desc"><b>Benötigt mehr Leistung Ihrer Batterie</b>! Der Hintergrundservice läuft permanent ab. Benachrichtigungen werden Ihnen angezeigt, sobald Sie neue Nachrichten erhalten haben.</string>
+    <string name="onboarding_notifications_mode_service_desc"><b>Benötigt mehr Leistung Ihrer Batterie</b>! Der Hintergrundservice läuft die ganze Zeit ab. Benachrichtigungen werden Ihnen sofort angezeigt, nachdem Sie neue Nachrichten erhalten haben.</string>
     <string name="create_group_link">Gruppenlink erstellen</string>
     <string name="allow_your_contacts_to_send_disappearing_messages">Erlauben Sie Ihren Kontakten das Senden von verschwindenden Nachrichten.</string>
     <string name="prohibit_sending_disappearing_messages">Das Senden von verschwindenden Nachrichten verbieten.</string>
@@ -1175,7 +1184,7 @@
     <string name="alert_text_msg_bad_id">Die ID der nächsten Nachricht ist falsch (kleiner oder gleich der Vorherigen).
 \nDies kann passieren, wenn es einen Fehler gegeben hat oder die Verbindung kompromittiert wurde.</string>
     <string name="alert_text_decryption_error_header"><xliff:g id="message count" example="1">%1$d</xliff:g> Nachrichten konnten nicht entschlüsselt werden.</string>
-    <string name="alert_text_msg_bad_hash">Der Hash der vorherigen Nachricht unterscheidet sich.</string>
+    <string name="alert_text_msg_bad_hash">Der Hash der vorherigen Nachricht ist unterschiedlich.</string>
     <string name="you_can_turn_on_lock">Sie können die SimpleX Sperre über die Einstellungen aktivieren.</string>
     <string name="network_socks_proxy_settings">SOCKS-Proxy Einstellungen</string>
     <string name="la_lock_mode_system">System-Authentifizierung</string>
@@ -1209,136 +1218,4 @@
     <string name="only_your_contact_can_make_calls">Nur Ihr Kontakt kann Anrufe tätigen.</string>
     <string name="v5_0_app_passcode">App Passwort</string>
     <string name="calls_prohibited_with_this_contact">Audio/Video Anrufe sind nicht erlaubt.</string>
-    <string name="address_section_title">Adresse</string>
-    <string name="share_address">Adresse teilen</string>
-    <string name="export_theme">Design exportieren</string>
-    <string name="import_theme_error">Fehler beim Importieren des Designs</string>
-    <string name="color_title">Bezeichnung</string>
-    <string name="opening_database">Öffne Datenbank …</string>
-    <string name="error_setting_address">Fehler bei der Adresseinstellung</string>
-    <string name="learn_more">Mehr erfahren</string>
-    <string name="scan_qr_to_connect_to_contact">Um eine Verbindung herzustellen, kann Ihr Kontakt den QR-Code scannen oder den Link in der App verwenden.</string>
-    <string name="simplex_address">SimpleX-Adresse</string>
-    <string name="you_can_accept_or_reject_connection">Wenn Personen eine Verbindung anfordern, können Sie diese annehmen oder ablehnen.</string>
-    <string name="you_wont_lose_your_contacts_if_delete_address">Sie werden Ihre Kontakte nicht verlieren, falls Sie Ihre Adresse später löschen.</string>
-    <string name="customize_theme_title">Design anpassen</string>
-    <string name="theme_colors_section_title">DESIGN-FARBEN</string>
-    <string name="add_address_to_your_profile">Fügen Sie die Adresse zu Ihrem Profil hinzu, damit Ihre Kontakte sie mit anderen Personen teilen können. Es wird eine Profilaktualisierung an Ihre Kontakte gesendet.</string>
-    <string name="all_your_contacts_will_remain_connected_update_sent">Alle Ihre Kontakte bleiben verbunden. Es wird eine Profilaktualisierung an Ihre Kontakte gesendet.</string>
-    <string name="create_address_and_let_people_connect">Erstellen Sie eine Adresse, damit sich Personen mit Ihnen verbinden können.</string>
-    <string name="create_simplex_address">SimpleX-Adresse erstellen</string>
-    <string name="share_with_contacts">Mit Kontakten teilen</string>
-    <string name="your_contacts_will_remain_connected">Ihre Kontakte bleiben verbunden.</string>
-    <string name="auto_accept_contact">Automatisch akzeptieren</string>
-    <string name="enter_welcome_message_optional">Geben Sie eine Begrüßungsmeldung ein … (optional)</string>
-    <string name="invite_friends">Freunde einladen</string>
-    <string name="email_invite_subject">Lassen Sie uns in SimpleX Chat kommunizieren</string>
-    <string name="profile_update_will_be_sent_to_contacts">Profil-Aktualisierung wird an Ihre Kontakte gesendet.</string>
-    <string name="save_auto_accept_settings">Einstellungen von \"Automatisch akzeptieren\" speichern</string>
-    <string name="save_settings_question">Einstellungen speichern\?</string>
-    <string name="share_address_with_contacts_question">Die Adresse mit Kontakten teilen\?</string>
-    <string name="stop_sharing">Teilen beenden</string>
-    <string name="stop_sharing_address">Das Teilen der Adresse beenden\?</string>
-    <string name="dont_create_address">Keine Adresse erstellt</string>
-    <string name="email_invite_body">Hallo!
-\nVerbinden Sie sich per SimpleX Chat mit mir: %s</string>
-    <string name="you_can_create_it_later">Sie können dies später erstellen</string>
-    <string name="enter_welcome_message">Geben Sie eine Begrüßungsmeldung ein …</string>
-    <string name="group_welcome_preview">Vorschau</string>
-    <string name="you_can_share_this_address_with_your_contacts">Sie können diese Adresse mit Ihren Kontakten teilen, um sie mit %s verbinden zu lassen.</string>
-    <string name="color_secondary_variant">Zweite Akzentfarbe</string>
-    <string name="color_background">Hintergrund-Farbe</string>
-    <string name="import_theme">Design importieren</string>
-    <string name="color_surface">Menüs &amp; Benachrichtigungen</string>
-    <string name="color_received_message">Empfangene Nachricht</string>
-    <string name="color_secondary">Zweite Farbe</string>
-    <string name="color_sent_message">Gesendete Nachricht</string>
-    <string name="theme_simplex">SimpleX</string>
-    <string name="learn_more_about_address">Über die SimpleX-Adresse</string>
-    <string name="one_time_link_short">Einmal-Link</string>
-    <string name="color_primary_variant">Erste Akzentfarbe</string>
-    <string name="continue_to_next_step">Weiter</string>
-    <string name="dark_theme">Dunkles Design</string>
-    <string name="if_you_cant_meet_in_person">Falls Sie sich nicht persönlich treffen können, zeigen Sie den QR-Code in einem Videoanruf oder teilen Sie den Link.</string>
-    <string name="read_more_in_user_guide_with_link">Lesen Sie mehr dazu in der <font color="#0088ff">Benutzeranleitung</font>.</string>
-    <string name="import_theme_error_desc">Stellen Sie sicher, dass die Datei die korrekte YAML-Syntax hat. Exportieren sie das Design, um ein Beispiel für die Dateistruktur des Designs zu erhalten.</string>
-    <string name="auth_open_chat_profiles">Offene Chat-Profile</string>
-    <string name="you_can_share_your_address">Sie können Ihre Adresse als Link oder QR-Code teilen - jede Person kann sich mit Ihnen verbinden.</string>
-    <string name="your_contacts_will_see_it">Ihre Kontakte in SimpleX werden es sehen.
-\nSie können es in den Einstellungen ändern.</string>
-    <string name="all_app_data_will_be_cleared">App-Daten werden komplett gelöscht.</string>
-    <string name="empty_chat_profile_is_created">Es wurde ein leeres Chat-Profil mit dem eingegebenen Namen erstellt und die App öffnet wie gewohnt.</string>
-    <string name="if_you_enter_self_destruct_code">Wenn Sie Ihr Selbstzerstörungspasswort während des Öffnens der App eingeben:</string>
-    <string name="self_destruct_new_display_name">Neuer angezeigter Name:</string>
-    <string name="self_destruct_passcode_changed">Das Selbstzerstörungspasswort wurde geändert!</string>
-    <string name="change_self_destruct_mode">Selbstzerstörungs-Modus ändern</string>
-    <string name="change_self_destruct_passcode">Selbstzerstörungspasswort ändern</string>
-    <string name="enabled_self_destruct_passcode">Selbstzerstörungspasswort aktivieren</string>
-    <string name="self_destruct">Selbstzerstörung</string>
-    <string name="self_destruct_passcode_enabled">Das Selbstzerstörungspasswort wurde aktiviert!</string>
-    <string name="app_passcode_replaced_with_self_destruct">Das App Passwort wurde durch das Selbstzerstörungspasswort ersetzt.</string>
-    <string name="enable_self_destruct">Selbstzerstörung aktivieren</string>
-    <string name="if_you_enter_passcode_data_removed">Wenn Sie dieses Passwort während des Öffnens der App eingeben, werden alle App-Daten unwiederbringlich gelöscht!</string>
-    <string name="self_destruct_passcode">Selbstzerstörungspasswort</string>
-    <string name="set_passcode">Passwort eingeben</string>
-    <string name="message_reactions_are_prohibited">In dieser Gruppe sind Reaktionen auf Nachrichten nicht erlaubt.</string>
-    <string name="error_loading_details">Fehler beim Laden von Details</string>
-    <string name="received_message">Empfangene Nachricht</string>
-    <string name="info_menu">Information</string>
-    <string name="sent_message">Gesendete Nachricht</string>
-    <string name="send_disappearing_message_custom_time">Zeit anpassen</string>
-    <string name="disappearing_message">Verschwindende Nachricht</string>
-    <string name="send_disappearing_message_send">Senden</string>
-    <string name="send_disappearing_message_1_minute">1 Minute</string>
-    <string name="send_disappearing_message">Verschwindende Nachricht senden</string>
-    <string name="info_row_moderated_at">Moderiert um</string>
-    <string name="info_row_deleted_at">Gelöscht um</string>
-    <string name="info_row_received_at">Empfangen um</string>
-    <string name="info_row_updated_at">Datensatz aktualisiert um</string>
-    <string name="info_row_sent_at">Gesendet um</string>
-    <string name="share_text_moderated_at">Moderiert um: %s</string>
-    <string name="share_text_database_id">Datenbank-ID: %d</string>
-    <string name="share_text_received_at">Empfangen um: %s</string>
-    <string name="share_text_updated_at">Datensatz aktualisiert um: %s</string>
-    <string name="current_version_timestamp">%s (aktuell)</string>
-    <string name="share_text_sent_at">Gesendet um: %s</string>
-    <string name="message_reactions">Reaktionen auf Nachrichten</string>
-    <string name="allow_your_contacts_adding_message_reactions">Erlauben Sie Ihren Kontakten Reaktionen auf Nachrichten zu geben.</string>
-    <string name="both_you_and_your_contact_can_add_message_reactions">Sowohl Sie, als auch Ihr Kontakt können Reaktionen auf Nachrichten geben.</string>
-    <string name="only_you_can_add_message_reactions">Nur Sie können Reaktionen auf Nachrichten geben.</string>
-    <string name="prohibit_message_reactions">Reaktionen auf Nachrichten nicht erlauben.</string>
-    <string name="allow_message_reactions_only_if">Reaktionen auf Nachrichten sind nur möglich, falls Ihr Kontakt dies erlaubt.</string>
-    <string name="only_your_contact_can_add_message_reactions">Nur Ihr Kontakt kann Reaktionen auf Nachrichten geben.</string>
-    <string name="allow_message_reactions">Reaktionen auf Nachrichten erlauben.</string>
-    <string name="prohibit_message_reactions_group">Reaktionen auf Nachrichten nicht erlauben.</string>
-    <string name="group_members_can_add_message_reactions">Gruppenmitglieder können eine Reaktion auf Nachrichten geben.</string>
-    <string name="whats_new_read_more">Mehr erfahren</string>
-    <string name="v5_1_message_reactions_descr">Endlich haben wir sie! 🚀</string>
-    <string name="v5_1_message_reactions">Reaktionen auf Nachrichten</string>
-    <string name="v5_1_self_destruct_passcode">Selbstzerstörungspasswort</string>
-    <string name="v5_1_self_destruct_passcode_descr">Sobald es eingegeben wird, werden alle Daten gelöscht.</string>
-    <string name="v5_1_custom_themes">Benutzerdefinierte Designs</string>
-    <string name="v5_1_japanese_portuguese_interface">Japanische und Portugiesische Bedienoberfläche</string>
-    <string name="custom_time_unit_minutes">Minuten</string>
-    <string name="custom_time_unit_seconds">Sekunden</string>
-    <string name="whats_new_thanks_to_users_contribute_weblate">Dank der Nutzer - Tragen Sie per Weblate bei!</string>
-    <string name="v5_1_better_messages">Verbesserungen bei Nachrichten</string>
-    <string name="v5_1_custom_themes_descr">Farbdesigns anpassen und weitergeben.</string>
-    <string name="custom_time_unit_days">Tage</string>
-    <string name="custom_time_unit_hours">Stunden</string>
-    <string name="v5_1_better_messages_descr">- Bis zu 5 Minuten lange Sprachnachrichten
-\n- Zeit für verschwindende Nachrichten anpassen
-\n- Vergangenheit bearbeiten</string>
-    <string name="custom_time_picker_custom">benutzerdefiniert</string>
-    <string name="custom_time_unit_months">Monate</string>
-    <string name="custom_time_picker_select">Auswählen</string>
-    <string name="custom_time_unit_weeks">Wochen</string>
-    <string name="send_disappearing_message_5_minutes">5 Minuten</string>
-    <string name="item_info_current">(aktuell)</string>
-    <string name="send_disappearing_message_30_seconds">30 Sekunden</string>
-    <string name="share_text_deleted_at">Gelöscht um: %s</string>
-    <string name="info_row_disappears_at">Verschwindet um</string>
-    <string name="share_text_disappears_at">Verschwindet um: %s</string>
-    <string name="edit_history">Vergangenheit</string>
-    <string name="message_reactions_prohibited_in_this_chat">In diesem Chat sind Reaktionen auf Nachrichten nicht erlaubt.</string>
 </resources>

apps/android/app/src/main/res/values-el/strings.xml

@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="chat_item_ttl_day">1 μέρα</string>
-    <string name="chat_item_ttl_month">1 μήνας</string>
-    <string name="about_simplex">Για το SimpleX</string>
-    <string name="scan_QR_code">Σαρώστε τον QR κωδικό</string>
-    <string name="a_plus_b">α + β</string>
-    <string name="about_simplex_chat">Για το <xliff:g id="appNameFull">SimpleX Chat</xliff:g></string>
-    <string name="scan_code_from_contacts_app">Σαρώστε τον κωδικό ασφαλείας από την εφαρμογή επαφών σας</string>
-    <string name="smp_server_test_secure_queue">Ασφαλή ουρά</string>
-    <string name="network_option_seconds_label">δε</string>
-    <string name="security_code">Κωδικός ασφαλείας</string>
-    <string name="smp_servers_scan_qr">Σαρώστε τον κωδικό QR διακομιστή</string>
-    <string name="secret">μυστικό</string>
-    <string name="chat_item_ttl_week">1 εβδομάδα</string>
-    <string name="v4_2_security_assessment">αξιολόγηση ασφαλείας</string>
-    <string name="allow_verb">Συναινώ</string>
-    <string name="accept_contact_button">Αποδοχή</string>
-    <string name="accept_contact_incognito_button">Αποδοχή ανώνυμης περιήγησης</string>
-    <string name="smp_servers_preset_add">Προσθήκη προκαθορισμένου διακομιστή</string>
-    <string name="smp_servers_add_to_another_device">Προσθήκη σε άλλη συσκευή</string>
-    <string name="all_your_contacts_will_remain_connected">Όλες οι επαφές σας θα παραμείνουν ενεργές.</string>
-    <string name="accept_call_on_lock_screen">Αποδοχή</string>
-    <string name="group_member_role_admin">διαχειριστής</string>
-    <string name="button_add_welcome_message">Προσθέστε μήνυμα καλωσορίσματος</string>
-    <string name="all_group_members_will_remain_connected">Όλα τα μέλη της ομάδας θα παραμήνουν συνδεδεμένα.</string>
-    <string name="users_add">Προσθήκη προφίλ</string>
-    <string name="color_primary">Προφορά</string>
-    <string name="chat_preferences_always">πάντα</string>
-    <string name="accept_feature">Αποδοχή</string>
-    <string name="allow_disappearing_messages_only_if">Επιτρέψτε τα μηνύματα που εξαφανίζονται μόνο εάν το επιτρέπει η επαφή σας.</string>
-    <string name="allow_your_contacts_irreversibly_delete">Επιτρέψτε στις επαφές σας να διαγράφουν μη αναστρέψιμα τα απεσταλμένα μηνύματα.</string>
-    <string name="allow_your_contacts_to_send_disappearing_messages">Επιτρέψτε στις επαφές σας να στέλνουν μηνύματα που εξαφανίζονται.</string>
-    <string name="allow_voice_messages_only_if">Επιτρέπονται τα φωνητικά μηνύματα μόνο εάν τα επιτρέπει η επαφή σας.</string>
-    <string name="allow_your_contacts_to_call">Επιτρέψτε στις επαφές σας να σας καλέσουν.</string>
-    <string name="allow_your_contacts_to_send_voice_messages">Επιτρέψτε στις επαφές σας να στέλνουν φωνητικά μηνύματα.</string>
-    <string name="allow_direct_messages">Να επιτρέπεται η αποστολή άμεσων μηνυμάτων στα μέλη.</string>
-    <string name="allow_to_send_disappearing">Επιτρέπεται η αποστολή μηνυμάτων που εξαφανίζονται.</string>
-    <string name="allow_to_send_voice">Επιτρέπεται η αποστολή φωνητικών μηνυμάτων.</string>
-    <string name="app_name"><xliff:g id="appName">SimpleX</xliff:g></string>
-    <string name="accept">Αποδοχή</string>
-    <string name="accept_connection_request__question">Αποδοχή αιτήματος σύνδεσης;</string>
-    <string name="callstatus_accepted">αποδεκτή κλήση</string>
-    <string name="network_enable_socks_info">Πρόσβαση στους διακομιστές μέσω SOCKS proxy στην πόρτα 9050; Ο διακομιστής μεσολάβησης (proxy server) πρέπει να είναι ενεργός πριν ενεργοποιηθεί αυτή η ρύθμιση.</string>
-    <string name="accept_requests">Αποδοχή αιτημάτων</string>
-    <string name="smp_servers_add">Προσθήκη διακομιστή…</string>
-    <string name="network_settings">Προχωρημένες ρυθμίσεις δικτύου</string>
-    <string name="v4_3_improved_server_configuration_desc">Προσθήκη διακομιστών μέσω σάρωσης QR κωδικών.</string>
-    <string name="v4_2_group_links_desc">Οι διαχειριστές μπορούν να δημιουργήσουν τους συνδέσμους συμμετοχής σε ομάδες.</string>
-    <string name="users_delete_all_chats_deleted">Όλες οι συνομιλίες και τα μηνύματα θα διαγραφούν - αυτή η ενέργεια δεν μπορεί να αντιστραφεί!</string>
-    <string name="clear_chat_warning">Όλα τα μηνύματα θα διαγραφούν - αυτή η ενέργεια δεν μπορεί να αντιστραφεί! Τα μηνύματα θα διαγραφούν ΜΟΝΟ για εσάς.</string>
-    <string name="allow_irreversible_message_deletion_only_if">Επιτρέψτε τη μη αναστρέψιμη διαγραφή μηνυμάτων μόνο εάν σας το επιτρέπει η επαφή σας.</string>
-    <string name="allow_calls_only_if">Επιτρέπονται οι κλήσεις μόνο εάν η επαφή σας τις επιτρέπει.</string>
-    <string name="allow_to_delete_messages">Επιτρέψτε τη μη αναστρέψιμη διαγραφή των απεσταλμένων μηνυμάτων.</string>
-    <string name="allow_voice_messages_question">Να επιτρέπονται τα φωνητικά μηνύματα;</string>
-    <string name="notifications_mode_service">Πάντα ενεργό</string>
-    <string name="always_use_relay">Να χρησιμοποιείται πάντα αναμεταδότη</string>
-</resources>

apps/android/app/src/main/res/values-es/strings.xml

@@ -2,70 +2,70 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="auth_unavailable">Autenticación no disponible</string>
     <string name="accept_contact_button">Aceptar</string>
-    <string name="network_settings">Configuración avanzada de red</string>
-    <string name="onboarding_notifications_mode_off_desc"><b>Mejor para la batería</b>. Recibirás notificaciones sólo cuando la aplicación se esté ejecutando, SIN servicio en segundo plano.</string>
-    <string name="onboarding_notifications_mode_periodic_desc"><b>Bueno para la batería</b>. El servicio en segundo plano comprueba si hay mensajes cada 10 minutos. Puedes perder llamadas o mensajes urgentes.</string>
+    <string name="network_settings">Configuración de red avanzada</string>
+    <string name="onboarding_notifications_mode_off_desc"><b>Mejor para la batería</b>. Recibirás notificaciones sólo cuando la aplicación se esté ejecutando, el servicio NO se usará en segundo plano.</string>
+    <string name="onboarding_notifications_mode_periodic_desc"><b>Bueno para la batería</b>. El servicio en segundo plano comprueba si hay mensajes nuevos cada 10 minutos. Puedes perderte llamadas y mensajes urgentes.</string>
     <string name="accept_call_on_lock_screen">Aceptar</string>
     <string name="full_backup">Copia de seguridad de los datos de la aplicación</string>
     <string name="chat_item_ttl_day">un dia</string>
     <string name="chat_item_ttl_month">un mes</string>
     <string name="chat_item_ttl_week">una semana</string>
-    <string name="allow_disappearing_messages_only_if">Se permiten los mensajes temporales pero sólo si tu contacto también los permite.</string>
-    <string name="v4_3_improved_server_configuration_desc">Añadir servidores mediante el escaneo de códigos QR.</string>
+    <string name="allow_disappearing_messages_only_if">Se permiten mensajes temporales sólo si tu contacto también los permite.</string>
+    <string name="v4_3_improved_server_configuration_desc">Añadir servidores escaneando códigos QR.</string>
     <string name="smp_servers_preset_add">Añadir servidores predefinidos</string>
     <string name="all_group_members_will_remain_connected">Todos los miembros del grupo permanecerán conectados.</string>
-    <string name="allow_irreversible_message_deletion_only_if">Se permite la eliminación irreversible de mensajes pero sólo si tu contacto también lo permite para tí.</string>
+    <string name="allow_irreversible_message_deletion_only_if">Se permite la eliminación irreversible de mensajes sólo si tu contacto también lo permite para tí.</string>
     <string name="keychain_allows_to_receive_ntfs">Android Keystore se usará para almacenar de forma segura la contraseña después de reiniciar la aplicación o cambiar la frase de contraseña - permitirá recibir notificaciones.</string>
     <string name="allow_your_contacts_to_send_disappearing_messages">Permites a tus contactos enviar mensajes temporales</string>
     <string name="allow_your_contacts_to_send_voice_messages">Permites a tus contactos enviar mensajes de voz.</string>
     <string name="chat_preferences_always">siempre</string>
     <string name="notifications_mode_off_desc">La aplicación sólo puede recibir notificaciones cuando se está ejecutando. No se iniciará ningún servicio en segundo plano.</string>
-    <string name="settings_section_title_icon">ICONO APLICACIÓN</string>
+    <string name="settings_section_title_icon">ICONO DE LA APLICACIÓN</string>
     <string name="incognito_random_profile_from_contact_description">Se enviará un perfil aleatorio al contacto del que recibió este enlace</string>
     <string name="turning_off_service_and_periodic">La optimización de la batería está activa, desactivando el servicio en segundo plano y las solicitudes periódicas de nuevos mensajes. Puedes volver a activarlos en Configuración.</string>
     <string name="notifications_mode_service_desc">El servicio está siempre en funcionamiento en segundo plano. Las notificaciones se muestran en cuanto haya mensajes nuevos.</string>
     <string name="it_can_disabled_via_settings_notifications_still_shown"><b>Se puede desactivar en Configuración</b> – las notificaciones se seguirán mostrando mientras la app esté en funcionamiento.</string>
     <string name="notifications_mode_service">Siempre activo</string>
     <string name="allow_verb">Permitir</string>
-    <string name="above_then_preposition_continuation">arriba y luego:</string>
+    <string name="above_then_preposition_continuation">arriba, entonces:</string>
     <string name="add_new_contact_to_create_one_time_QR_code"><b>Añadir nuevo contacto</b>: para crear tu código QR de un solo uso para tu contacto.</string>
     <string name="accept_connection_request__question">¿Aceptar solicitud de conexión\?</string>
     <string name="accept_contact_incognito_button">Aceptar incógnito</string>
-    <string name="clear_chat_warning">Se eliminarán todos los mensajes SOLO para tí. ¡No se puede deshacer!</string>
+    <string name="clear_chat_warning">Se eliminarán todos los mensajes SOLO para tí. ¡No puede deshacerse!</string>
     <string name="smp_servers_add">Añadir servidor…</string>
-    <string name="network_enable_socks_info">¿Acceder a los servidores a través del proxy SOCKS en el puerto %d\? El proxy debe iniciarse antes de activar esta opción.</string>
+    <string name="network_enable_socks_info">¿Acceder a los servidores a través del proxy SOCKS en el puerto 9050\? El proxy debe iniciarse antes de activar esta opción.</string>
     <string name="all_your_contacts_will_remain_connected">Todos tus contactos permanecerán conectados.</string>
     <string name="appearance_settings">Apariencia</string>
     <string name="app_version_title">Versión</string>
-    <string name="network_session_mode_user_description">Se usará una conexión TCP independiente (y credencial SOCKS) <b>por cada perfil de chat que tengas en la aplicación</b>.</string>
-    <string name="network_session_mode_entity_description">Se usará una conexión TCP independiente (y credencial SOCKS) <b>por cada contacto y miembro del grupo</b>.
-\n<b>Atención</b>: si tienes muchas conexiones, tu consumo de batería y tráfico pueden ser sustancialmente mayor y algunas conexiones pueden fallar.</string>
+    <string name="network_session_mode_user_description">Se usará una conexión TCP independiente (y una credencial SOCKS) <b>para cada perfil de chat que tengas en la aplicación</b>.</string>
+    <string name="network_session_mode_entity_description">Se usará una conexión TCP independiente (y una credencial SOCKS) <b>para cada contacto y miembro del grupo</b>.
+\n<b>Ten en cuenta</b>: si tienes muchas conexiones, tu consumo de batería y tráfico puede ser sustancialmente mayor y algunas conexiones pueden fallar.</string>
     <string name="a_plus_b">a + b</string>
     <string name="about_simplex">Acerca de SimpleX</string>
     <string name="bold">negrita</string>
     <string name="callstatus_accepted">llamada aceptada</string>
     <string name="accept">Aceptar</string>
-    <string name="audio_call_no_encryption">llamada (sin cifrar)</string>
-    <string name="icon_descr_audio_call">llamada</string>
-    <string name="settings_audio_video_calls">Llamadas y videollamadas</string>
+    <string name="audio_call_no_encryption">llamada de audio (sin cifrado e2e)</string>
+    <string name="icon_descr_audio_call">llamada de audio</string>
+    <string name="settings_audio_video_calls">Llamadas y Videollamadas</string>
     <string name="icon_descr_audio_off">Audio desactivado</string>
     <string name="icon_descr_audio_on">Audio activado</string>
     <string name="integrity_msg_bad_id">ID de mensaje erróneo</string>
-    <string name="auto_accept_images">Auto aceptar imágenes</string>
-    <string name="users_delete_all_chats_deleted">Se eliminarán todos los chats y mensajes. ¡No se puede deshacer!</string>
+    <string name="auto_accept_images">Aceptar automáticamente imágenes</string>
+    <string name="users_delete_all_chats_deleted">Se eliminarán todos los chats y mensajes. ¡No puede deshacerse!</string>
     <string name="accept_feature">Aceptar</string>
-    <string name="allow_to_send_disappearing">Se permiten mensajes temporales.</string>
+    <string name="allow_to_send_disappearing">Permitir enviar mensajes temporales.</string>
     <string name="keychain_is_storing_securely">Android Keystore se utiliza para almacenar de forma segura la contraseña - permite que el servicio de notificación funcione.</string>
     <string name="users_add">Añadir perfil</string>
     <string name="incognito_random_profile_description">Se enviará un perfil aleatorio a tu contacto</string>
     <string name="color_primary">Color</string>
     <string name="allow_your_contacts_irreversibly_delete">Permites a tus contactos eliminar irreversiblemente los mensajes enviados.</string>
-    <string name="allow_voice_messages_only_if">Se permiten los mensajes de voz pero sólo si tu contacto también los permite.</string>
-    <string name="allow_direct_messages">Se permiten mensajes directos entre miembros.</string>
-    <string name="allow_to_delete_messages">Se permite la eliminación irreversible de mensajes.</string>
-    <string name="allow_to_send_voice">Se permiten mensajes de voz.</string>
-    <string name="v4_2_group_links_desc">Los administradores pueden crear enlaces para unirse a grupos.</string>
-    <string name="v4_2_auto_accept_contact_requests">Auto aceptar solicitudes de contacto</string>
+    <string name="allow_voice_messages_only_if">Se permiten mensajes de voz sólo si tu contacto también los permite.</string>
+    <string name="allow_direct_messages">Permitir el envío de mensajes directos a los miembros.</string>
+    <string name="allow_to_delete_messages">Permitir la eliminación irreversible de los mensajes enviados.</string>
+    <string name="allow_to_send_voice">Permitir enviar mensajes de voz.</string>
+    <string name="v4_2_group_links_desc">Los administradores pueden crear los enlaces para unirse a los grupos.</string>
+    <string name="v4_2_auto_accept_contact_requests">Aceptar automáticamente solicitudes del contacto</string>
     <string name="attach">Adjuntar</string>
     <string name="integrity_msg_bad_hash">hash de mensaje erróneo</string>
     <string name="answer_call">Responder llamada</string>
@@ -75,18 +75,20 @@
     <string name="about_simplex_chat">Sobre <xliff:g id="appNameFull">SimpleX Chat</xliff:g></string>
     <string name="smp_servers_add_to_another_device">Añadir a otro dispositivo</string>
     <string name="app_version_name">Versión de la aplicación: v%s</string>
+    <string name="accept_requests">Aceptar solicitudes</string>
+    <string name="accept_automatically">Automáticamente</string>
     <string name="icon_descr_asked_to_receive">Solicita recibir la imagen</string>
-    <string name="impossible_to_recover_passphrase"><b>Atención</b>: NO podrás recuperar o cambiar la contraseña si la pierdes.</string>
+    <string name="impossible_to_recover_passphrase"><b>Ten en cuenta</b>: NO podrás recuperar o cambiar la contraseña si la pierdes.</string>
     <string name="both_you_and_your_contact_can_send_voice">Tanto tú como tu contacto podéis enviar mensajes de voz.</string>
-    <string name="onboarding_notifications_mode_service_desc"><b>¡Consume más batería!</b> El servicio en segundo plano se ejecuta siempre y las notificaciones se mostrarán en cuanto haya mensajes disponibles.</string>
+    <string name="onboarding_notifications_mode_service_desc"><b>¡Gasta más batería!</b> El servicio en segundo plano está siempre en funcionamiento - las notificaciones se mostrarán tan pronto como los mensajes estén disponibles.</string>
     <string name="both_you_and_your_contacts_can_delete">Tanto tú como tu contacto podéis eliminar de forma irreversible los mensajes enviados.</string>
     <string name="both_you_and_your_contact_can_send_disappearing">Tanto tú como tu contacto podéis enviar mensajes temporales.</string>
-    <string name="scan_QR_code_to_connect_to_contact_who_shows_QR_code"><b>Escanear código QR</b>: para conectar con tu contacto mediante su código QR.</string>
+    <string name="scan_QR_code_to_connect_to_contact_who_shows_QR_code"><b>Escanear código QR</b>: para conectar con tu contacto que te muestre código QR.</string>
     <string name="create_profile_button">Crear</string>
     <string name="create_one_time_link">Crear enlace de invitación de un solo uso.</string>
     <string name="create_group">Crear grupo secreto</string>
     <string name="database_passphrase_will_be_updated">La contraseña de cifrado de la base de datos será actualizada.</string>
-    <string name="info_row_database_id">ID de base de datos</string>
+    <string name="info_row_database_id">ID de la base de datos</string>
     <string name="direct_messages_are_prohibited_in_chat">Los mensajes directos entre miembros del grupo no están permitidos.</string>
     <string name="passphrase_is_different">La contraseña es distinta a la almacenada en Keystore</string>
     <string name="database_will_be_encrypted_and_passphrase_stored">La base de datos será cifrada y la contraseña se guardará en Keystore.</string>
@@ -101,7 +103,7 @@
     <string name="disappearing_prohibited_in_this_chat">Los mensajes temporales no están permitidos en este chat.</string>
     <string name="disappearing_messages_are_prohibited">Los mensajes temporales no están permitidos en este grupo.</string>
     <string name="display_name_cannot_contain_whitespace">El nombre mostrado no puede contener espacios en blanco.</string>
-    <string name="encrypted_video_call">Videollamada con cifrado de extremo a extremo</string>
+    <string name="encrypted_video_call">Videollamada con cifrado e2e</string>
     <string name="display_name_connection_established">conexión establecida</string>
     <string name="simplex_link_mode_description">Descripción</string>
     <string name="smp_server_test_connect">Conectar</string>
@@ -111,12 +113,12 @@
     <string name="maximum_supported_file_size">El tamaño máximo de archivo admitido es <xliff:g id="maxFileSize">%1$s</xliff:g></string>
     <string name="clear_verification">Eliminar verificación</string>
     <string name="create_profile">Crear perfil</string>
-    <string name="encrypted_audio_call">Llamada con cifrado de extremo a extremo</string>
-    <string name="status_e2e_encrypted">cifrado de extremo a extremo</string>
+    <string name="encrypted_audio_call">llamada con cifrado e2e</string>
+    <string name="status_e2e_encrypted">Cifrado e2e</string>
     <string name="integrity_msg_duplicate">mensaje duplicado</string>
     <string name="settings_section_title_develop">DESARROLLO</string>
     <string name="settings_developer_tools">Herramientas desarrollo</string>
-    <string name="delete_files_and_media_for_all_users">Eliminar los archivos de todos los perfiles</string>
+    <string name="delete_files_and_media_for_all_users">Eliminar archivos para todos los perfiles Chat</string>
     <string name="delete_messages">Eliminar mensaje</string>
     <string name="database_encrypted">¡Base de datos cifrada!</string>
     <string name="encrypted_with_random_passphrase">La base de datos está cifrada con una contraseña aleatoria, puedes cambiarla.</string>
@@ -143,9 +145,9 @@
     <string name="group_member_status_announced">conectando (anunciado)</string>
     <string name="connection_local_display_name">conexión&lt;xliff:g xmlns:xliff=\"urn:oasis:names:tc:xliff:document:1.2\" id=\"connection ID\" example=\"1\"&gt;</string>
     <string name="connect_via_link_or_qr">Conectar mediante enlace / Código QR</string>
-    <string name="delete_contact_all_messages_deleted_cannot_undo_warning">El contacto y todos los mensajes serán eliminados. ¡No se puede deshacer!</string>
+    <string name="delete_contact_all_messages_deleted_cannot_undo_warning">El contacto y todos los mensajes serán eliminados. ¡No puede deshacerse!</string>
     <string name="icon_descr_contact_checked">Contacto verificado</string>
-    <string name="status_contact_has_e2e_encryption">el contacto dispone de cifrado de extremo a extremo</string>
+    <string name="status_contact_has_e2e_encryption">El contacto dispone de cifrado e2e</string>
     <string name="smp_server_test_disconnect">Desconectar</string>
     <string name="notification_preview_mode_contact">Nombre del contacto</string>
     <string name="copy_verb">Copiar</string>
@@ -165,7 +167,7 @@
     <string name="icon_descr_server_status_connected">Conectado</string>
     <string name="copied">Copiado en portapapeles</string>
     <string name="share_one_time_link">Crear enlace de invitación de un solo uso.</string>
-    <string name="desktop_scan_QR_code_from_app_via_scan_QR_code">💻 PC: escanéa el código QR desde la aplicación mediante <b>Escanear código QR </b></string>
+    <string name="desktop_scan_QR_code_from_app_via_scan_QR_code">💻 PC: escanéa el código QR desde la app mediante <b>Escanéo de código QR </b></string>
     <string name="delete_contact_menu_action">Eliminar</string>
     <string name="delete_group_menu_action">Eliminar</string>
     <string name="alert_title_contact_connection_pending">¡El contacto aun no se ha conectado!</string>
@@ -224,12 +226,12 @@
     <string name="archive_created_on_ts">Creado: <xliff:g id="archive_ts">%1$s</xliff:g></string>
     <string name="delete_archive">Eliminar archivo</string>
     <string name="group_member_status_connected">conectado</string>
-    <string name="conn_level_desc_direct">directa</string>
+    <string name="conn_level_desc_direct">directo</string>
     <string name="chat_preferences_contact_allows">El contacto permite</string>
     <string name="chat_preferences_default">predefinido (%s)</string>
     <string name="full_deletion">Eliminar para todos</string>
     <string name="feature_enabled">activado</string>
-    <string name="contacts_can_mark_messages_for_deletion">Tus contactos sólo pueden marcar los mensajes para eliminar. Tu podrás verlos.</string>
+    <string name="contacts_can_mark_messages_for_deletion">El contacto solo puede marcar los mensajes para eliminar. Tu podrás verlos.</string>
     <string name="ttl_w">%ds</string>
     <string name="deleted_description">eliminado</string>
     <string name="connect_via_contact_link">¿Conectar mediante enlace de contacto\?</string>
@@ -242,7 +244,7 @@
     <string name="contact_connection_pending">conectando…</string>
     <string name="group_connection_pending">conectando…</string>
     <string name="icon_descr_context">Icono contextual</string>
-    <string name="status_contact_has_no_e2e_encryption">el contacto no dispone de cifrado</string>
+    <string name="status_contact_has_no_e2e_encryption">El contacto no dispone de cifrado e2e</string>
     <string name="icon_descr_call_connecting">Conectando llamada</string>
     <string name="create_secret_group_title">Crear grupo secreto</string>
     <string name="icon_descr_email">Email</string>
@@ -252,6 +254,7 @@
 \nContraseña</string>
     <string name="contribute">Contribuye</string>
     <string name="core_version">Core versión: v%s</string>
+    <string name="contact_requests">Solicitud del contacto</string>
     <string name="delete_image">Eliminar imagen</string>
     <string name="edit_image">Editar imagen</string>
     <string name="settings_section_title_chats">CHATS</string>
@@ -261,8 +264,8 @@
     <string name="change_member_role_question">¿Cambiar rol de grupo\?</string>
     <string name="v4_4_verify_connection_security_desc">Compara los códigos de seguridad con tus contactos</string>
     <string name="choose_file">Archivo</string>
-    <string name="clear_verb">Vaciar</string>
-    <string name="clear_chat_button">Vaciar chat</string>
+    <string name="clear_verb">Limpiar</string>
+    <string name="clear_chat_button">Limpiar chat</string>
     <string name="configure_ICE_servers">Configurar servidores ICE</string>
     <string name="callstatus_ended">Llamada terminada <xliff:g id="duration" example="01:15">%1$s</xliff:g></string>
     <string name="callstatus_error">error en la llamada</string>
@@ -270,24 +273,24 @@
     <string name="callstatus_in_progress">llamada en curso</string>
     <string name="colored">coloreado</string>
     <string name="rcv_group_event_changed_your_role">ha cambiado tu rol a %s</string>
-    <string name="snd_conn_event_switch_queue_phase_changing_for_member">cambiando de servidor para %s</string>
+    <string name="snd_conn_event_switch_queue_phase_changing_for_member">cambiando dirección por %s</string>
     <string name="group_member_status_complete">completado</string>
     <string name="invite_prohibited">¡No se puede invitar el contacto!</string>
     <string name="cannot_receive_file">No se puede recibir el archivo</string>
     <string name="database_initialization_error_title">No se puede iniciar la base de datos</string>
-    <string name="clear_chat_question">¿Vaciar chat\?</string>
+    <string name="clear_chat_question">Limpiar chat\?</string>
     <string name="network_session_mode_user">Perfil de Chat</string>
     <string name="chat_is_stopped_indication">Chat está detenido</string>
     <string name="rcv_group_event_changed_member_role">rol de %s cambiado a %s</string>
     <string name="change_role">Cambiar rol</string>
     <string name="v4_5_transport_isolation_descr">Mediante perfil de Chat (por defecto) o por conexión (BETA)</string>
-    <string name="snd_conn_event_switch_queue_phase_changing">cambiando de servidor…</string>
+    <string name="snd_conn_event_switch_queue_phase_changing">cambiando dirección…</string>
     <string name="chat_preferences">Preferencias de Chat</string>
     <string name="feature_cancelled_item">cancelado %s</string>
     <string name="chat_is_stopped">Chat está detenido</string>
     <string name="settings_section_title_calls">LLAMADAS</string>
-    <string name="chat_is_running">Chat está en ejecución</string>
-    <string name="rcv_conn_event_switch_queue_phase_changing">cambiando de servidor…</string>
+    <string name="chat_is_running">El chat está en ejecución</string>
+    <string name="rcv_conn_event_switch_queue_phase_changing">cambiando dirección…</string>
     <string name="chat_with_developers">habla con los desarrolladores</string>
     <string name="icon_descr_cancel_file_preview">Cancelar vista previa del archivo</string>
     <string name="icon_descr_cancel_image_preview">Cancelar vista previa de la imagen</string>
@@ -300,14 +303,14 @@
     <string name="cancel_verb">Cancelar</string>
     <string name="icon_descr_cancel_live_message">Cancelar mensaje en directo</string>
     <string name="confirm_verb">Confirmar</string>
-    <string name="clear_chat_menu_action">Vaciar</string>
+    <string name="clear_chat_menu_action">Limpiar</string>
     <string name="app_version_code">Build de la aplicación</string>
     <string name="call_already_ended">¡La llamada ha terminado!</string>
-    <string name="rcv_conn_event_switch_queue_phase_completed">el servidor de envío ha cambiado para tí</string>
+    <string name="rcv_conn_event_switch_queue_phase_completed">su dirección ha cambiado para tí</string>
     <string name="icon_descr_cancel_link_preview">cancelar vista previa del enlace</string>
     <string name="call_on_lock_screen">Llamadas en la ventana de bloqueo</string>
     <string name="alert_title_cant_invite_contacts">¡No se puede invitar a los contactos!</string>
-    <string name="chat_console">Consola de Chat</string>
+    <string name="chat_console">Consola del chat</string>
     <string name="chat_database_section">BASE DE DATOS DE CHAT</string>
     <string name="chat_database_deleted">Base de datos eliminada</string>
     <string name="chat_database_imported">Base de datos importada</string>
@@ -324,9 +327,9 @@
     <string name="icon_descr_flip_camera">Voltear la cámara</string>
     <string name="group_invitation_expired">Invitación de grupo caducada</string>
     <string name="alert_message_group_invitation_expired">La invitación al grupo ya no es válida, ha sido eliminada por el remitente.</string>
-    <string name="delete_group_for_self_cannot_undo_warning">El grupo se eliminará para tí. ¡No se puede deshacer!</string>
-    <string name="how_to_use_markdown">Cómo usar la sintaxis markdown</string>
-    <string name="description_via_one_time_link_incognito">en modo incógnito mediante enlace de un solo uso</string>
+    <string name="delete_group_for_self_cannot_undo_warning">El grupo se eliminará para tí. ¡No puede deshacerse!</string>
+    <string name="how_to_use_markdown">Cómo usar sintaxis markdown</string>
+    <string name="description_via_one_time_link_incognito">Incógnito mediante enlace de un uso</string>
     <string name="simplex_link_contact">Dirección de contacto SimpleX</string>
     <string name="error_saving_smp_servers">Error guardando servidores SMP</string>
     <string name="simplex_link_mode_browser_warning">Abrir el enlace en el navegador puede reducir la privacidad y seguridad de la conexión. Los enlaces SimpleX que no son de confianza aparecerán en rojo.</string>
@@ -342,7 +345,7 @@
     <string name="file_with_path">Archivo: %s</string>
     <string name="failed_to_active_user_title">¡Error cambiando perfil!</string>
     <string name="smp_servers_enter_manually">Introduce el servidor manualmente</string>
-    <string name="how_to_use_your_servers">Cómo usar los servidores</string>
+    <string name="how_to_use_your_servers">Cómo usar tus servidores</string>
     <string name="error_stopping_chat">Error deteniendo Chat</string>
     <string name="enter_correct_passphrase">Introduce la contraseña correcta.</string>
     <string name="enter_passphrase">Introduce la contraseña…</string>
@@ -358,7 +361,7 @@
     <string name="from_gallery_button">De la Galería</string>
     <string name="gallery_image_button">Imagen</string>
     <string name="gallery_video_button">Vídeo</string>
-    <string name="if_you_received_simplex_invitation_link_you_can_open_in_browser">Si has recibido un enlace de invitación a <xliff:g id="appName">SimpleX Chat</xliff:g> puedes abrirlo en tu navegador:</string>
+    <string name="if_you_received_simplex_invitation_link_you_can_open_in_browser">Si has recibido el enlace de invitación a <xliff:g id="appName">SimpleX Chat</xliff:g>, puedes abrirlo en tu navegador:</string>
     <string name="if_you_choose_to_reject_the_sender_will_not_be_notified">Si eliges rechazar, el remitente NO será notificado.</string>
     <string name="invalid_contact_link">¡Enlace no válido!</string>
     <string name="if_you_cannot_meet_in_person_scan_QR_in_video_call_or_ask_for_invitation_link">Si no puedes reunirte en persona, puedes <b>escanear el código QR en la videollamada</b>, o tu contacto puede compartir un enlace de invitación.</string>
@@ -368,8 +371,8 @@
     <string name="error_deleting_database">Error eliminando la base de datos</string>
     <string name="encrypted_database">Base de datos cifrada</string>
     <string name="error_removing_member">Error eliminando miembro</string>
-    <string name="group_members_can_send_voice">Los miembros del grupo pueden enviar mensajes de voz.</string>
-    <string name="description_via_contact_address_link_incognito">en modo incógnito mediante enlace de dirección del contacto</string>
+    <string name="group_members_can_send_voice">Los miembros del grupo pueden mandar mensajes de voz.</string>
+    <string name="description_via_contact_address_link_incognito">Incógnito mediante enlace de dirección del contacto</string>
     <string name="failed_to_create_user_title">Error creando perfil!</string>
     <string name="failed_to_parse_chat_title">No se pudo cargar el chat</string>
     <string name="failed_to_parse_chats_title">No se pudieron cargar los chats</string>
@@ -393,10 +396,10 @@
     <string name="error_saving_ICE_servers">Error guardando servidores ICE</string>
     <string name="enter_one_ICE_server_per_line">Servidores ICE (uno por línea)</string>
     <string name="full_name__field">Nombre completo:</string>
-    <string name="people_can_connect_only_via_links_you_share">Las personas pueden conectarse contigo sólo mediante los enlaces que compartes.</string>
+    <string name="people_can_connect_only_via_links_you_share">Las personas pueden conectarse contigo solo mediante los enlaces que compartes.</string>
     <string name="how_simplex_works">Cómo funciona <xliff:g id="appName">SimpleX</xliff:g></string>
     <string name="icon_descr_hang_up">Colgar</string>
-    <string name="files_and_media_section">Archivos y multimedia</string>
+    <string name="files_and_media_section">Archivo y multimedia</string>
     <string name="alert_title_no_group">¡Grupo no encontrado!</string>
     <string name="snd_group_event_group_profile_updated">perfil de grupo actualizado</string>
     <string name="error_creating_link_for_group">Error al crear enlace de grupo</string>
@@ -412,7 +415,7 @@
     <string name="export_database">Exportar base de datos</string>
     <string name="error_exporting_chat_database">Error exportando la base de datos</string>
     <string name="error_starting_chat">Error iniciando chat</string>
-    <string name="rcv_group_event_invited_via_your_group_link">se ha unido mediante tu enlace de grupo</string>
+    <string name="rcv_group_event_invited_via_your_group_link">Invitado mediante tu enlace de grupo</string>
     <string name="error_updating_link_for_group">Error actualizando el enlace de grupo</string>
     <string name="section_title_for_console">PARA CONSOLA</string>
     <string name="error_changing_role">Error cambiando rol</string>
@@ -424,11 +427,11 @@
     <string name="v4_3_improved_privacy_and_security_desc">Ocultar pantalla de aplicaciones en aplicaciones recientes.</string>
     <string name="encrypt_database">Cifrar</string>
     <string name="icon_descr_expand_role">Ampliar la selección de roles</string>
-    <string name="delete_group_for_all_members_cannot_undo_warning">El grupo se eliminará para todos los miembros. ¡No se puede deshacer!</string>
+    <string name="delete_group_for_all_members_cannot_undo_warning">El grupo se eliminará para todos los miembros. ¡No puede deshacerse!</string>
     <string name="network_option_enable_tcp_keep_alive">Activar TCP keep-alive</string>
     <string name="feature_enabled_for_you">activado para tí</string>
     <string name="server_error">error</string>
-    <string name="description_via_group_link_incognito">en modo incógnito mediante enlace de grupo</string>
+    <string name="description_via_group_link_incognito">Incógnito mediante enlace de grupo</string>
     <string name="error_adding_members">Error al añadir miembro(s)</string>
     <string name="error_sending_message">Error enviando mensaje</string>
     <string name="error_encrypting_database">Error cifrando la base de datos</string>
@@ -442,15 +445,15 @@
     <string name="paste_connection_link_below_to_connect">Pega el enlace que has recibido en el recuadro para conectar con tu contacto.</string>
     <string name="share_link">Compartir enlace</string>
     <string name="how_it_works">Cómo funciona</string>
-    <string name="delete_message_cannot_be_undone_warning">El mensaje se eliminará. ¡No se puede deshacer!</string>
+    <string name="delete_message_cannot_be_undone_warning">El mensaje se eliminará. ¡No puede deshacerse!</string>
     <string name="incognito_info_protects">La función del modo incógnito es proteger la identidad del perfil principal: por cada contacto nuevo se genera un perfil aleatorio.</string>
     <string name="turn_off_battery_optimization">Para poder usarse <b>deshabilita la optimización de batería</b> para <xliff:g id="appName">SimpleX</xliff:g> en el siguiente cuadro de diálogo. De lo contrario las notificaciones estarán desactivadas.</string>
-    <string name="install_simplex_chat_for_terminal">Instalar terminal para <xliff:g id="appNameFull">SimpleX Chat</xliff:g></string>
+    <string name="install_simplex_chat_for_terminal">Instalar <xliff:g id="appNameFull">SimpleX Chat</xliff:g> para terminal</string>
     <string name="group_invitation_item_description">invitación al grupo <xliff:g id="group_name">%1$s</xliff:g></string>
-    <string name="rcv_group_event_member_added">ha invitado a <xliff:g id="member profile" example="alice (Alice)">%1$s</xliff:g></string>
+    <string name="rcv_group_event_member_added">invitado <xliff:g id="member profile" example="alice (Alice)">%1$s</xliff:g></string>
     <string name="incognito_info_allows">Permite tener varias conexiones anónimas sin datos compartidos entre estas dentro del mismo perfil.</string>
     <string name="invite_to_group_button">Invitar al grupo</string>
-    <string name="to_verify_compare">Para comprobar el cifrado de extremo a extremo con tu contacto compara (o escanea) el código en tus dispositivos.</string>
+    <string name="to_verify_compare">Para comprobar el cifrado de extremo a extremo con su contacto compare (o escanee) el código en sus dispositivos.</string>
     <string name="database_is_not_encrypted">La base de datos no está cifrada. Escribe una contraseña para protegerla.</string>
     <string name="ensure_smp_server_address_are_correct_format_and_unique">Asegúrate de que las direcciones del servidor SMP tienen el formato correcto, están separadas por líneas y no están duplicadas.</string>
     <string name="icon_descr_instant_notifications">Notificación instantánea</string>
@@ -461,7 +464,7 @@
     <string name="onboarding_notifications_mode_service">Instantánea</string>
     <string name="join_group_button">Únete</string>
     <string name="join_group_incognito_button">Únete en modo incógnito</string>
-    <string name="conn_level_desc_indirect">indirecta (<xliff:g id="conn_level">%1$s</xliff:g>)</string>
+    <string name="conn_level_desc_indirect">indirecto (<xliff:g id="conn_level">%1$s</xliff:g>)</string>
     <string name="theme_light">Claro</string>
     <string name="chat_preferences_on">Activado</string>
     <string name="message_deletion_prohibited">La eliminación irreversible de mensajes no está permitida en este chat.</string>
@@ -489,7 +492,7 @@
     <string name="mark_unread">Marcar como no leído</string>
     <string name="invalid_QR_code">Código QR inválido</string>
     <string name="incorrect_code">¡Código de seguridad incorrecto!</string>
-    <string name="markdown_in_messages">Sintaxis markdown en los mensajes</string>
+    <string name="markdown_in_messages">Sintaxis markdown en mensajes</string>
     <string name="network_use_onion_hosts_no">No</string>
     <string name="callstatus_missed">llamada perdida</string>
     <string name="import_database_confirmation">Importar</string>
@@ -518,13 +521,13 @@
     <string name="mute_chat">Silenciar</string>
     <string name="ensure_ICE_server_address_are_correct_format_and_unique">Asegúrate de que las direcciones del servidor WebRTC ICE tienen el formato correcto, están separadas por líneas y no duplicadas.</string>
     <string name="network_use_onion_hosts_required_desc">Se requieren hosts .onion para la conexión</string>
-    <string name="network_use_onion_hosts_prefer_desc_in_alert">Se usarán hosts .onion si están disponibles.</string>
+    <string name="network_use_onion_hosts_prefer_desc_in_alert">Se usarán hosts .onion cuando estén disponibles.</string>
     <string name="immune_to_spam_and_abuse">Inmune a spam y abuso</string>
     <string name="many_people_asked_how_can_it_deliver">Muchos se preguntarán: <i>si <xliff:g id="appName">SimpleX</xliff:g> no tiene identificadores de usuario, ¿cómo puede entregar los mensajes\?</i></string>
     <string name="incoming_video_call">Videollamada entrante</string>
     <string name="snd_group_event_user_left">has salido</string>
     <string name="snd_conn_event_switch_queue_phase_completed">has cambiado la dirección</string>
-    <string name="feature_off">desactivado</string>
+    <string name="feature_off">apagado</string>
     <string name="v4_3_irreversible_message_deletion">Eliminación irreversible del mensaje</string>
     <string name="v4_3_voice_messages_desc">Máximo 40 segundos, recibido al instante.</string>
     <string name="v4_5_italian_interface">Interfaz en italiano</string>
@@ -536,12 +539,12 @@
     <string name="ok">OK</string>
     <string name="only_stored_on_members_devices">(sólo almacenado por miembros del grupo)</string>
     <string name="markdown_help">Ayuda sintaxis markdown</string>
-    <string name="network_and_servers">Servidores y Redes</string>
-    <string name="network_use_onion_hosts_prefer_desc">Se usarán hosts .onion si están disponibles.</string>
+    <string name="network_and_servers">Redes y Servidores</string>
+    <string name="network_use_onion_hosts_prefer_desc">Se usarán hosts .onion cuando estén disponibles.</string>
     <string name="italic">cursiva</string>
     <string name="incoming_audio_call">Llamada entrante</string>
-    <string name="video_call_no_encryption">videollamada (sin cifrar)</string>
-    <string name="status_no_e2e_encryption">sin cifrar</string>
+    <string name="video_call_no_encryption">videollamada (sin cifrado e2e)</string>
+    <string name="status_no_e2e_encryption">sin cifrado e2e</string>
     <string name="import_database">Importar base de datos</string>
     <string name="settings_section_title_messages">MENSAJES Y ARCHIVOS</string>
     <string name="import_database_question">¿Importar base de datos\?</string>
@@ -554,24 +557,24 @@
     <string name="icon_descr_add_members">Invitar miembros</string>
     <string name="group_member_role_observer">observador</string>
     <string name="group_member_role_member">miembro</string>
-    <string name="group_member_status_removed">expulsado</string>
-    <string name="group_member_status_invited">ha invitado a</string>
+    <string name="group_member_status_removed">eliminado</string>
+    <string name="group_member_status_invited">invitado</string>
     <string name="no_contacts_to_add">Sin contactos que añadir</string>
     <string name="new_member_role">Nuevo rol de miembro</string>
     <string name="initial_member_role">Rol inicial</string>
     <string name="info_row_local_name">Nombre local</string>
     <string name="network_status">Estado de la red</string>
     <string name="incognito">Incógnito</string>
-    <string name="chat_preferences_off">desactivado</string>
+    <string name="chat_preferences_off">apagado</string>
     <string name="new_in_version">Nuevo en %s</string>
     <string name="v4_3_improved_privacy_and_security">Seguridad y privacidad mejoradas</string>
     <string name="settings_section_title_incognito">Modo incógnito</string>
     <string name="new_database_archive">Nuevo archivo de base de datos</string>
-    <string name="old_database_archive">Archivo de bases de datos antiguas</string>
+    <string name="old_database_archive">Archivo de base de datos antiguo</string>
     <string name="snd_conn_event_switch_queue_phase_completed_for_member">has cambiado la dirección por %s</string>
     <string name="rcv_group_event_member_left">ha salido</string>
     <string name="button_leave_group">Salir del grupo</string>
-    <string name="only_group_owners_can_change_prefs">Sólo los propietarios pueden modificar las preferencias de grupo.</string>
+    <string name="only_group_owners_can_change_prefs">Sólo los propietarios del grupo pueden modificar las preferencias de grupo.</string>
     <string name="users_delete_data_only">Sólo datos del perfil local</string>
     <string name="chat_preferences_no">no</string>
     <string name="thousand_abbreviation">k</string>
@@ -581,14 +584,14 @@
     <string name="leave_group_button">Salir</string>
     <string name="leave_group_question">¿Salir del grupo\?</string>
     <string name="group_member_role_owner">propietario</string>
-    <string name="member_will_be_removed_from_group_cannot_be_undone">El miembro será expulsado del grupo. ¡No se puede deshacer!</string>
-    <string name="only_group_owners_can_enable_voice">Sólo los propietarios pueden activar los mensajes de voz.</string>
+    <string name="member_will_be_removed_from_group_cannot_be_undone">El miembro será eliminado del grupo. ¡No puede deshacerse!</string>
+    <string name="only_group_owners_can_enable_voice">Sólo los propietarios del grupo pueden activar los mensajes de voz.</string>
     <string name="group_unsupported_incognito_main_profile_sent">El modo incógnito no se admite aquí, tu perfil principal aparecerá en miembros del grupo</string>
     <string name="icon_descr_more_button">Más</string>
     <string name="mark_code_verified">Marcar como verificado</string>
     <string name="smp_servers_invalid_address">¡Dirección de servidor no válida!</string>
     <string name="make_private_connection">Establecer una conexión privada</string>
-    <string name="network_error_desc">Comprueba tu conexión de red con <xliff:g id="serverHost" example="smp.simplex.im">%1$s</xliff:g> e inténtalo de nuevo.</string>
+    <string name="network_error_desc">Comprueba su conexión de red con <xliff:g id="serverHost" example="smp.simplex.im">%1$s</xliff:g> e inténtelo de nuevo.</string>
     <string name="sender_may_have_deleted_the_connection_request">El remitente puede haber eliminado la solicitud de conexión.</string>
     <string name="error_smp_test_certificate">Posiblemente la huella digital del certificado en la dirección del servidor es incorrecta</string>
     <string name="reply_verb">Responder</string>
@@ -597,15 +600,15 @@
     <string name="select_contacts">Seleccionar contactos</string>
     <string name="save_group_profile">Guardar perfil de grupo</string>
     <string name="reset_color">Restablecer colores</string>
-    <string name="only_you_can_send_disappearing">Sólo tú puedes enviar mensajes temporales.</string>
+    <string name="only_you_can_send_disappearing">Sólo tú puedes enviar mensajes temporales</string>
     <string name="only_your_contact_can_send_disappearing">Sólo tu contacto puede enviar mensajes temporales.</string>
-    <string name="prohibit_sending_voice">No se permiten mensajes de voz.</string>
+    <string name="prohibit_sending_voice">Prohibes el envío de mensajes de voz.</string>
     <string name="notifications_mode_off">Se ejecuta sólo cuando la aplicación está abierta</string>
-    <string name="auth_open_chat_console">Abrir consola de chat</string>
+    <string name="auth_open_chat_console">Abrir la consola de chat</string>
     <string name="save_verb">Guardar</string>
     <string name="restore_database_alert_confirm">Restaurar</string>
     <string name="network_options_save">Guardar</string>
-    <string name="prohibit_message_deletion">No se permite la eliminación irreversible de mensajes.</string>
+    <string name="prohibit_message_deletion">Prohibir la eliminación irreversible de mensajes.</string>
     <string name="v4_4_live_messages_desc">Los destinatarios ven la actualizacion mientras escribes.</string>
     <string name="icon_descr_send_message">Enviar Mensaje</string>
     <string name="toast_permission_denied">¡Permiso denegado!</string>
@@ -623,15 +626,15 @@
     <string name="restore_database_alert_title">¿Restaurar copia de seguridad de la base de datos\?</string>
     <string name="onboarding_notifications_mode_title">Notificaciones privadas</string>
     <string name="image_descr_profile_image">imagen del perfil</string>
-    <string name="prohibit_sending_voice_messages">No se permiten mensajes de voz.</string>
+    <string name="prohibit_sending_voice_messages">Prohibes el envío de mensajes de voz.</string>
     <string name="protect_app_screen">Proteger la pantalla de la aplicación</string>
     <string name="read_more_in_github_with_link">Más información en nuestro <font color="#0088ff">repositorio GitHub</font> .</string>
     <string name="icon_descr_record_voice_message">Grabar mensaje de voz</string>
-    <string name="rcv_group_event_member_deleted">ha expulsado a <xliff:g id="member profile" example="alice (Alice)">%1$s</xliff:g></string>
-    <string name="send_link_previews">Enviar previsualizacion de enlaces</string>
+    <string name="rcv_group_event_member_deleted">eliminado <xliff:g id="member profile" example="alice (Alice)">%1$s</xliff:g></string>
+    <string name="send_link_previews">Enviar previsualizaciones de enlaces</string>
     <string name="send_live_message_desc">Envía un mensaje en vivo: se actualizará para el(los) destinatario(s) a medida que se escribe</string>
     <string name="icon_descr_sent_msg_status_send_failed">error de envío</string>
-    <string name="sending_via">Enviando vía</string>
+    <string name="sending_via">Enviando mediante</string>
     <string name="contact_developers">Por favor, actualiza la aplicación y ponte en contacto con los desarrolladores.</string>
     <string name="sender_cancelled_file_transfer">El remitente ha cancelado la transferencia de archivos.</string>
     <string name="smp_server_test_secure_queue">Cola segura</string>
@@ -654,7 +657,7 @@
     <string name="v4_5_reduced_battery_usage">Reducción del uso de la batería</string>
     <string name="observer_cant_send_message_desc">Póngase en contacto con el administrador del grupo.</string>
     <string name="ask_your_contact_to_enable_voice">Solicita que tu contacto habilite el envío de mensajes de voz.</string>
-    <string name="send_live_message">Mensaje en vivo</string>
+    <string name="send_live_message">Enviar mensaje en vivo</string>
     <string name="scan_QR_code">Escanear código QR</string>
     <string name="send_verb">Enviar</string>
     <string name="connect_via_link_or_qr_from_clipboard_or_in_person">(escanear o pegar desde el portapapeles)</string>
@@ -662,7 +665,7 @@
     <string name="image_descr_qr_code">Código QR</string>
     <string name="chat_with_the_founder">Consultas y sugerencias</string>
     <string name="smp_servers_preset_address">Dirección del servidor predefinida</string>
-    <string name="send_us_an_email">Contacta vía email</string>
+    <string name="send_us_an_email">Contacta por email</string>
     <string name="rate_the_app">Valora la aplicación</string>
     <string name="save_servers_button">Guardar</string>
     <string name="callstate_received_answer">respuesta recibida…</string>
@@ -677,12 +680,12 @@
     <string name="store_passphrase_securely_without_recover">Guarda la contraseña de forma segura, NO podrás acceder al chat si la pierdes.</string>
     <string name="save_archive">Guardar archivo</string>
     <string name="restore_database_alert_desc">Introduce la contraseña anterior después de restaurar la copia de seguridad de la base de datos. Esta acción no se puede deshacer.</string>
-    <string name="rcv_group_event_user_deleted">te ha expulsado</string>
-    <string name="receiving_via">Recibiendo vía</string>
+    <string name="rcv_group_event_user_deleted">te ha eliminado</string>
+    <string name="receiving_via">Recibiendo mediante</string>
     <string name="network_option_protocol_timeout">Tiempo de espera del protocolo</string>
     <string name="network_option_seconds_label">seg</string>
     <string name="users_delete_with_connections">Perfil y conexiones de servidor</string>
-    <string name="prohibit_sending_disappearing_messages">No se permiten mensajes temporales.</string>
+    <string name="prohibit_sending_disappearing_messages">Prohibes el envío de mensajes temporales</string>
     <string name="only_you_can_send_voice">Sólo tú puedes enviar mensajes de voz.</string>
     <string name="only_your_contact_can_send_voice">Sólo tu contacto puede enviar mensajes de voz.</string>
     <string name="run_chat_section">EJECUTAR CHAT</string>
@@ -690,8 +693,8 @@
     <string name="enter_correct_current_passphrase">Introduce la contraseña actual correcta.</string>
     <string name="feature_received_prohibited">recepción prohibida</string>
     <string name="only_you_can_delete_messages">Sólo tú puedes eliminar mensajes de forma irreversible (tu contacto puede marcarlos para eliminar).</string>
-    <string name="prohibit_direct_messages">No se permiten mensajes directos entre miembros.</string>
-    <string name="prohibit_sending_disappearing">No se permiten mensajes temporales.</string>
+    <string name="prohibit_direct_messages">Prohibir el envío de mensajes directos a los miembros.</string>
+    <string name="prohibit_sending_disappearing">Prohibes el envío de mensajes temporales</string>
     <string name="v4_2_security_assessment">Evaluación de la seguridad</string>
     <string name="receiving_files_not_yet_supported">la recepción de archivos aún no está disponible</string>
     <string name="sending_files_not_yet_supported">el envío de archivos aún no está disponible</string>
@@ -703,8 +706,8 @@
     <string name="restore_database">Restaurar copia de seguridad de la base de datos</string>
     <string name="save_passphrase_and_open_chat">Guardar contraseña y abrir el chat</string>
     <string name="restore_passphrase_not_found_desc">La contraseña no se ha encontrado en Keystore, introdúzcala manualmente. Esto puede haber ocurrido si has restaurado los datos de la aplicación con una herramienta de copia de seguridad. Si no es así, por favor ponte en contacto con los desarrolladores.</string>
-    <string name="remove_member_confirmation">Expulsar</string>
-    <string name="button_remove_member">Expulsar miembro</string>
+    <string name="remove_member_confirmation">Eliminar</string>
+    <string name="button_remove_member">Eliminar miembro</string>
     <string name="button_send_direct_message">Enviar mensaje directo</string>
     <string name="reset_verb">Restablecer</string>
     <string name="paste_button">Pegar</string>
@@ -738,36 +741,37 @@
     <string name="share_verb">Compartir</string>
     <string name="icon_descr_sent_msg_status_unauthorized_send">envío no autorizado</string>
     <string name="set_contact_name">Escribe un nombre para el contacto</string>
+    <string name="network_socks_toggle">Usar proxy SOCKS (puerto 9050)</string>
     <string name="unknown_error">Error desconocido</string>
     <string name="member_role_will_be_changed_with_notification">El rol cambiará a \"%s\". Se notificará a todos los miembros del grupo.</string>
-    <string name="v4_2_security_assessment_desc">La seguridad de SimpleX Chat ha sido auditada por Trail of Bits.</string>
+    <string name="v4_2_security_assessment_desc">La seguridad de SimpleX Chat fue auditada por Trail of Bits.</string>
     <string name="v4_4_disappearing_messages_desc">Los mensajes enviados se eliminarán una vez transcurrido el tiempo establecido.</string>
     <string name="ntf_channel_messages">Mensajes de chat SimpleX</string>
     <string name="icon_descr_received_msg_status_unread">no leído</string>
     <string name="text_field_set_contact_placeholder">Escribe un nombre para el contacto…</string>
-    <string name="switch_receiving_address_question">¿Cambiar servidor de recepción\?</string>
+    <string name="switch_receiving_address_question">¿Cambiar dirección de recepción\?</string>
     <string name="use_camera_button">Cámara</string>
     <string name="contact_you_shared_link_with_wont_be_able_to_connect">¡El contacto con el que has compartido este enlace NO podrá conectarse!</string>
     <string name="show_QR_code">Mostrar código QR</string>
     <string name="this_link_is_not_a_valid_connection_link">¡El enlace no es un enlace de conexión válido!</string>
     <string name="this_QR_code_is_not_a_link">¡El código QR no es un enlace!</string>
-    <string name="share_invitation_link">Compartir enlace de un uso</string>
+    <string name="share_invitation_link">Compartir enlace de invitación</string>
     <string name="update_network_session_mode_question">¿Actualizar el modo de aislamiento de transporte\?</string>
     <string name="icon_descr_speaker_on">Altavoz activado</string>
-    <string name="stop_chat_to_enable_database_actions">Para habilitar las acciones sobre la base de datos, previamente debes detener Chat</string>
+    <string name="stop_chat_to_enable_database_actions">Detén Chat para habilitar las acciones sobre la base de datos.</string>
     <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 saber más</string>
+    <string name="database_initialization_error_desc">La base de datos no funciona correctamente. Pulsa para obtener más información</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 próxima generación de mensajería privada</string>
     <string name="delete_files_and_media_desc">Esta acción no se puede deshacer. 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 no se puede deshacer. Se eliminarán los mensajes enviados y recibidos anteriores a la selección. Puede tardar varios minutos.</string>
-    <string name="messages_section_description">Esta configuración se aplica a los mensajes del perfil actual</string>
+    <string name="messages_section_description">Esta configuración se aplica a los mensajes en tu perfil actual</string>
     <string name="this_string_is_not_a_connection_link">¡Esta cadena no es un enlace de conexión!</string>
     <string name="to_preserve_privacy_simplex_has_background_service_instead_of_push_notifications_it_uses_a_few_pc_battery">Para preservar tu privacidad, en lugar de notificaciones automáticas la aplicación cuenta con un <b>servicio en segundo plano<xliff:g id="appName">SimpleX</xliff:g></b>, utiliza un pequeño porcentaje de la batería al día.</string>
     <string name="icon_descr_settings">Configuración</string>
-    <string name="icon_descr_speaker_off">Altavoz desactivado</string>
+    <string name="icon_descr_speaker_off">Altavoz apagado</string>
     <string name="add_contact_or_create_group">Inciar chat nuevo</string>
-    <string name="stop_chat_to_export_import_or_delete_chat_database">Para poder exportar, importar o eliminar la base de datos primero debes detener Chat. Durante el tiempo que esté detenido no podrás recibir ni enviar mensajes.</string>
+    <string name="stop_chat_to_export_import_or_delete_chat_database">Detén Chat para poder exportar, importar o eliminar la base de datos. No puedes recibir ni enviar mensajes mientras Chat esté detenido.</string>
     <string name="thank_you_for_installing_simplex">Gracias por instalar <xliff:g id="appNameFull">SimpleX Chat</xliff:g>!</string>
     <string name="to_protect_privacy_simplex_has_ids_for_queues">Para proteger la privacidad, en lugar de los identificadores de usuario que utilizan el resto de plataformas, <xliff:g id="appName">SimpleX</xliff:g> dispone de identificadores para las colas de mensajes, independientes para cada uno de tus contactos.</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">Para proteger tu información, activa Bloqueo SimpleX.
@@ -782,7 +786,7 @@
     <string name="ntf_channel_calls">Llamadas de chat SimpleX</string>
     <string name="notifications_mode_periodic">Se ejecuta periódicamente</string>
     <string name="notification_preview_mode_message_desc">Se muestran el nombre del contacto y el mensaje</string>
-    <string name="notification_preview_mode_contact_desc">Se muestra sólo el nombre del contacto</string>
+    <string name="notification_preview_mode_contact_desc">Se muestra solo el nombre del contacto</string>
     <string name="auth_simplex_lock_turned_on">Bloqueo SimpleX activado</string>
     <string name="auth_stop_chat">Detener chat</string>
     <string name="moderate_message_will_be_deleted_warning">El mensaje se eliminará para todos los miembros.</string>
@@ -797,8 +801,8 @@
     <string name="alert_message_no_group">Este grupo ya no existe.</string>
     <string name="incognito_info_find">Para conocer el perfil usado en una conexión en modo incógnito, pulsa el nombre del contacto o del grupo en la parte superior del chat.</string>
     <string name="accept_feature_set_1_day">Establecer 1 día</string>
-    <string name="v4_4_french_interface_descr">¡Gracias a los colaboradores! Contribuye a través de Weblate.</string>
-    <string name="v4_5_italian_interface_descr">¡Gracias a los colaboradores! Contribuye a través de Weblate.</string>
+    <string name="v4_4_french_interface_descr">Agradecimientos a los usuarios. ¡Contribuye a través de Weblate!</string>
+    <string name="v4_5_italian_interface_descr">Agradecimientos a los usuarios. ¡Contribuye a través de Weblate!</string>
     <string name="v4_5_private_filenames_descr">Para proteger la zona horaria, los archivos de imagen/voz usan la hora UTC.</string>
     <string name="v4_5_transport_isolation">Aislamiento de transporte</string>
     <string name="to_share_with_your_contact">(para compartir con tu contacto)</string>
@@ -808,7 +812,7 @@
     <string name="smp_servers_test_server">Probar servidor</string>
     <string name="smp_servers_test_servers">Probar servidores</string>
     <string name="star_on_github">Estrella en GitHub</string>
-    <string name="smp_servers_per_user">Lista de servidores para las conexiones nuevas de tu perfil actual</string>
+    <string name="smp_servers_per_user">Los servidores para nuevas conexiones de tu perfil de Chat actual</string>
     <string name="network_disable_socks">¿Usar conexión directa a Internet\?</string>
     <string name="update_onion_hosts_settings_question">¿Actualizar la configuración de los hosts .onion\?</string>
     <string name="profile_is_only_shared_with_your_contacts">El perfil sólo se comparte con tus contactos.</string>
@@ -818,7 +822,7 @@
     <string name="stop_chat_question">¿Detener Chat\?</string>
     <string name="chat_item_ttl_seconds">%s segundo(s)</string>
     <string name="group_invitation_tap_to_join">Pulsa para unirse</string>
-    <string name="rcv_group_event_updated_group_profile">ha actualizado el perfil del grupo</string>
+    <string name="rcv_group_event_updated_group_profile">perfil de grupo actualizado</string>
     <string name="network_option_tcp_connection_timeout">Tiempo de espera de la conexión TCP agotado</string>
     <string name="theme">Tema</string>
     <string name="set_group_preferences">Establece preferencias de grupo</string>
@@ -843,23 +847,24 @@
     <string name="database_backup_can_be_restored">El intento de cambiar la contraseña de la base de datos no se ha completado.</string>
     <string name="chat_help_tap_button">Pulsa el botón</string>
     <string name="to_start_a_new_chat_help_header">Para iniciar un chat nuevo</string>
-    <string name="switch_receiving_address">Cambiar servidor de recepción</string>
+    <string name="switch_receiving_address">Cambiar dirección de recepción</string>
     <string name="group_is_decentralized">El grupo está totalmente descentralizado: sólo es visible para los miembros.</string>
-    <string name="to_connect_via_link_title">Para conectarte mediante enlace</string>
+    <string name="to_connect_via_link_title">Para conectarse mediante enlace</string>
     <string name="smp_servers_test_failed">¡Error en prueba del servidor!</string>
     <string name="smp_servers_test_some_failed">Algunos servidores no superaron la prueba:</string>
     <string name="smp_servers_use_server">Usar servidor</string>
     <string name="smp_servers_use_server_for_new_conn">Usar para conexiones nuevas</string>
     <string name="theme_system">Sistema</string>
-    <string name="description_via_one_time_link">mediante enlace de un solo uso</string>
-    <string name="your_chats">Mis chats</string>
+    <string name="description_via_one_time_link">mediante enlace de un uso</string>
+    <string name="your_chats">Tus chats</string>
     <string name="voice_message_send_text">Mensaje de voz…</string>
+    <string name="your_contact_address">Mi dirección de contacto</string>
     <string name="icon_descr_video_off">Desactivar vídeo</string>
     <string name="icon_descr_video_on">Activar vídeo</string>
     <string name="wrong_passphrase">Contraseña de base de datos incorrecta</string>
     <string name="wrong_passphrase_title">¡Contraseña incorrecta!</string>
-    <string name="youve_accepted_group_invitation_connecting_to_inviting_group_member">Te has unido a este grupo. Conectando con el miembro que emite la invitacíon.</string>
-    <string name="alert_title_cant_invite_contacts_descr">Estás usando un perfil incógnito para este grupo, por tanto para evitar compartir tu perfil principal no se permite invitar a contactos</string>
+    <string name="youve_accepted_group_invitation_connecting_to_inviting_group_member">Te has unido a este grupo. Conectando con miembro del grupo invitado.</string>
+    <string name="alert_title_cant_invite_contacts_descr">Estás usando un perfil incógnito para este grupo, por tanto para evitar compartir tu perfil principal no se permite invitar contactos</string>
     <string name="you_are_invited_to_group">Has sido invitado al grupo</string>
     <string name="v4_3_voice_messages">Mensajes de voz</string>
     <string name="v4_3_irreversible_message_deletion_desc">Tus contactos pueden permitir la eliminación completa de mensajes.</string>
@@ -867,11 +872,11 @@
     <string name="voice_messages">Mensajes de voz</string>
     <string name="voice_messages_are_prohibited">Los mensajes de voz no están permitidos en este grupo.</string>
     <string name="v4_4_verify_connection_security">Comprobar la seguridad de la conexión</string>
-    <string name="you_are_already_connected_to_vName_via_this_link">¡Ya estás conectado a <xliff:g id="contactName" example="Alice">%1$s</xliff:g>.</string>
+    <string name="you_are_already_connected_to_vName_via_this_link">¡Ya estás conectado a <xliff:g id="contactName" example="Alice">%1$s! </xliff:g>.</string>
     <string name="welcome">¡Bienvenido!</string>
     <string name="your_chat_profile_will_be_sent_to_your_contact">Tu perfil Chat será enviado
 \na tu contacto</string>
-    <string name="your_ICE_servers">Mis servidores ICE</string>
+    <string name="your_ICE_servers">Tus servidores ICE</string>
     <string name="you_rejected_group_invitation">Has rechazado la invitación del grupo.</string>
     <string name="snd_group_event_changed_member_role">has cambiado el rol de %s a %s</string>
     <string name="call_connection_via_relay">mediante relay</string>
@@ -881,8 +886,9 @@
     <string name="webrtc_ice_servers">Servidores WebRTC ICE</string>
     <string name="contact_wants_to_connect_via_call"><xliff:g id="contactName" example="Alice">%1$s</xliff:g> quiere conectarse contigo mediante</string>
     <string name="failed_to_create_user_duplicate_desc">Tienes un perfil de chat con el mismo nombre mostrado. Debes elegir otro nombre.</string>
-    <string name="you_can_also_connect_by_clicking_the_link">También puedes conectarte pulsando el enlace. Si se abre en el navegador, pulsa en <b>Abrir en aplicación móvil</b>.</string>
+    <string name="you_can_also_connect_by_clicking_the_link">También puedes conectarte haciendo clic en el enlace. Si se abre en el navegador, haz clic en <b>Abrir en aplicación móvil</b>.</string>
     <string name="you_can_connect_to_simplex_chat_founder">Puedes <font color="#0088ff">ponerte en contacto con los desarrolladores de <xliff:g id="appNameFull">SimpleX Chat</xliff:g> para consultas y para recibir actualizaciones</font>.</string>
+    <string name="you_can_share_your_address_anybody_will_be_able_to_connect">Puedes compartir tu dirección como enlace o como código QR: cualquiera podrá conectarse contigo. Si lo eliminas más tarde tus contactos no se perderán.</string>
     <string name="observer_cant_send_message_title">¡No puedes enviar mensajes!</string>
     <string name="you_can_use_markdown_to_format_messages__prompt">Puedes usar la sintaxis markdown para dar formato a los mensajes:</string>
     <string name="you_must_use_the_most_recent_version_of_database">Debes usar la versión más reciente de tu base de datos ÚNICAMENTE en un dispositivo, de lo contrario podrías dejar de recibir mensajes de algunos contactos.</string>
@@ -895,7 +901,7 @@
     <string name="you_will_be_connected_when_your_contacts_device_is_online">Te conectarás cuando el dispositivo de tu contacto esté en línea, por favor espera o compruébalo más tarde.</string>
     <string name="auth_you_will_be_required_to_authenticate_when_you_start_or_resume">Se te pedirá identificarte cuándo inicies o continues usando la aplicación tras 30 segundos en segundo plano.</string>
     <string name="invite_prohibited_description">Estás intentando invitar a un contacto con el que compartes un perfil incógnito a un grupo en el que usas tu perfil principal</string>
-    <string name="simplex_link_mode_browser">Mediante navegador</string>
+    <string name="simplex_link_mode_browser">mediante navegador</string>
     <string name="simplex_link_connection">mediante <xliff:g id="serverHost" example="smp.simplex.im">%1$s</xliff:g></string>
     <string name="simplex_service_notification_title">Servicio <xliff:g id="appNameFull">SimpleX Chat</xliff:g></string>
     <string name="personal_welcome">¡Bienvenido <xliff:g>%1$s</xliff:g> !</string>
@@ -903,30 +909,31 @@
     <string name="waiting_for_file">Esperando archivo</string>
     <string name="icon_descr_waiting_for_image">Esperando imagen</string>
     <string name="voice_message_with_duration">Mensaje de voz (<xliff:g id="duration">%1$s</xliff:g> )</string>
-    <string name="network_use_onion_hosts_prefer">Si disponible</string>
+    <string name="network_use_onion_hosts_prefer">Cuando esté disponible</string>
     <string name="we_do_not_store_contacts_or_messages_on_servers">No almacenamos ninguno de tus contactos o mensajes (una vez entregados) en los servidores.</string>
     <string name="you_are_invited_to_group_join_to_connect_with_group_members">Has sido invitado al grupo. Únete para conectarte con los miembros del grupo.</string>
-    <string name="snd_group_event_member_deleted">has expulsado a <xliff:g id="member profile" example="alice (Alice)">%1$s</xliff:g></string>
+    <string name="snd_group_event_member_deleted">has eliminado <xliff:g id="member profile" example="alice (Alice)">%1$s</xliff:g></string>
     <string name="group_info_member_you">Tú: <xliff:g id="group_info_you">%1$s</xliff:g></string>
     <string name="you_can_share_group_link_anybody_will_be_able_to_connect">Puedes compartir un enlace o un código QR: cualquiera podrá unirse al grupo. Si lo eliminas más tarde los miembros del grupo no se perderán.</string>
     <string name="incognito_info_share">Cuando compartes un perfil incógnito con alguien, este perfil también se usará para los grupos a los que te inviten.</string>
-    <string name="your_preferences">Mis preferencias</string>
+    <string name="your_preferences">Tus preferencias</string>
     <string name="v4_2_auto_accept_contact_requests_desc">Con mensaje de bienvenida opcional.</string>
     <string name="you_are_observer">Tu rol es observador</string>
     <string name="verify_security_code">Comprobar código de seguridad</string>
     <string name="you_accepted_connection">Has aceptado la conexión</string>
     <string name="you_invited_your_contact">Has invitado a tu contacto</string>
-    <string name="you_will_be_connected_when_group_host_device_is_online">Te conectarás al grupo cuando el dispositivo anfitrión esté en línea, por favor espera o compruébalo más tarde.</string>
-    <string name="your_settings">Configuración</string>
-    <string name="your_SMP_servers">Mis servidores SMP</string>
+    <string name="you_will_be_connected_when_group_host_device_is_online">Te conectarás al grupo cuando el dispositivo del anfitrión esté en línea, por favor espera o compruébalo más tarde.</string>
+    <string name="show_QR_code_for_your_contact_to_scan_from_the_app__multiline">Tu contacto puede escanear el código QR desde la aplicación.</string>
+    <string name="your_settings">Mi configuración</string>
+    <string name="your_SMP_servers">Tus servidores SMP</string>
     <string name="you_control_your_chat">¡Tú controlas tu chat!</string>
     <string name="your_profile_is_stored_on_your_device">Tu perfil, contactos y mensajes entregados se almacenan en tu dispositivo.</string>
     <string name="callstate_waiting_for_answer">esperando respuesta…</string>
     <string name="callstate_waiting_for_confirmation">esperando confirmación…</string>
     <string name="onboarding_notifications_mode_off">Cuando la aplicación se está ejecutando</string>
     <string name="icon_descr_video_call">Videollamada</string>
-    <string name="your_calls">Mis llamadas</string>
-    <string name="your_ice_servers">Mis servidores ICE</string>
+    <string name="your_calls">Tus llamadas</string>
+    <string name="your_ice_servers">Tus servidores ICE</string>
     <string name="your_privacy">Privacidad</string>
     <string name="settings_section_title_you">MIS DATOS</string>
     <string name="your_chat_database">Base de datos Chat</string>
@@ -947,13 +954,13 @@
     <string name="connected_to_server_to_receive_messages_from_contact">Estás conectado al servidor utilizado para recibir mensajes de este contacto.</string>
     <string name="description_via_contact_address_link">mediante enlace de dirección de contacto</string>
     <string name="description_via_group_link">mediante enlace de grupo</string>
-    <string name="description_you_shared_one_time_link">has compartido enlace de un solo uso</string>
-    <string name="description_you_shared_one_time_link_incognito">has compartido enlace de un solo uso en módo incógnito</string>
+    <string name="description_you_shared_one_time_link">has compartido enlace de un uso</string>
+    <string name="description_you_shared_one_time_link_incognito">has compartido enlace de un uso en módo incógnito</string>
     <string name="you_have_no_chats">No tienes chats</string>
     <string name="contact_sent_large_file">El contacto ha enviado un archivo mayor al máximo admitido (<xliff:g id="maxFileSize">%1$s</xliff:g> ).</string>
     <string name="integrity_msg_skipped"><xliff:g id="connection ID" example="1">%1$d</xliff:g> mensaje(s) omitido(s)</string>
     <string name="you_will_stop_receiving_messages_from_this_group_chat_history_will_be_preserved">Dejarás de recibir mensajes de este grupo. El historial del chat se conservará.</string>
-    <string name="view_security_code">Mostrar código de seguridad</string>
+    <string name="view_security_code">Ver código de seguridad</string>
     <string name="you_need_to_allow_to_send_voice">Para poder enviar mensajes de voz antes debes permitir que tu contacto pueda enviarlos.</string>
     <string name="voice_messages_prohibited">¡Mensajes de voz prohibidos!</string>
     <string name="group_main_profile_sent">Tu perfil Chat será enviado a los miembros del grupo</string>
@@ -962,13 +969,14 @@
     <string name="icon_descr_simplex_team">Equipo <xliff:g id="appName">SimpleX</xliff:g></string>
     <string name="your_profile_will_be_sent">Tu perfil Chat se enviará a tu contacto</string>
     <string name="your_chat_profiles">Mis perfiles</string>
-    <string name="your_simplex_contact_address">Mi dirección SimpleX</string>
+    <string name="your_simplex_contact_address">Mi dirección de contacto <xliff:g id="appName">SimpleX</xliff:g></string>
     <string name="smp_servers_your_server">Tu servidor</string>
     <string name="smp_servers_your_server_address">Dirección de tu servidor</string>
+    <string name="section_title_welcome_message">MENSAJE DE BIENVENIDA</string>
     <string name="your_current_profile">Tu perfil actual</string>
     <string name="your_profile_is_stored_on_device_and_shared_only_with_contacts_simplex_cannot_see_it">Tu perfil se almacena en tu dispositivo y sólo se comparte con tus contactos. Los servidores <xliff:g id="appName">SimpleX</xliff:g> no pueden ver tu perfil.</string>
     <string name="language_system">Sistema</string>
-    <string name="button_add_welcome_message">Añadir mensaje de bienvenida</string>
+    <string name="button_add_welcome_message">Agregar mensaje de bienvenida</string>
     <string name="v4_6_audio_video_calls">Llamadas y videollamadas</string>
     <string name="smp_save_servers_question">¿Guardar servidores\?</string>
     <string name="hide_profile">Ocultar perfil</string>
@@ -981,7 +989,7 @@
     <string name="enter_password_to_show">Introduce la contraseña</string>
     <string name="user_hide">Ocultar</string>
     <string name="user_mute">Silenciar</string>
-    <string name="save_and_update_group_profile">Guardar y actualizar perfil de grupo</string>
+    <string name="save_and_update_group_profile">Guardar y actualizar perfil del grupo</string>
     <string name="tap_to_activate_profile">Pulsa sobre un perfil para activarlo.</string>
     <string name="should_be_at_least_one_visible_profile">Debe haber al menos un perfil de usuario visible.</string>
     <string name="user_unhide">Mostrar</string>
@@ -994,13 +1002,13 @@
     <string name="v4_6_group_moderation">Moderación de grupos</string>
     <string name="v4_6_hidden_chat_profiles">Perfiles Chat ocultos</string>
     <string name="v4_6_hidden_chat_profiles_descr">¡Protege tus perfiles con contraseña!</string>
-    <string name="v4_6_audio_video_calls_descr">Ahora con soporte bluetooth y otras mejoras.</string>
-    <string name="v4_6_group_welcome_message_descr">¡Guarda un mensaje para ser mostrado a los miembros nuevos!</string>
+    <string name="v4_6_audio_video_calls_descr">Soporte bluetooth y otras mejoras.</string>
+    <string name="v4_6_group_welcome_message_descr">¡Establece el mensaje mostrado a los miembros nuevos!</string>
     <string name="v4_6_chinese_spanish_interface">Interfaz en chino y español</string>
-    <string name="v4_6_chinese_spanish_interface_descr">¡Gracias a los colaboradores! Contribuye a través de Weblate.</string>
+    <string name="v4_6_chinese_spanish_interface_descr">Agradecimientos a los usuarios. ¡Contribuye a través de Weblate!</string>
     <string name="error_updating_user_privacy">Error actualizando la privacidad de usuario</string>
     <string name="confirm_password">Confirmar contraseña</string>
-    <string name="v4_6_reduced_battery_usage">Reducción consumo de batería</string>
+    <string name="v4_6_reduced_battery_usage">Consumo de batería reducido aun más</string>
     <string name="v4_6_group_welcome_message">Mensaje de bienvenida en grupos</string>
     <string name="v4_6_reduced_battery_usage_descr">¡Más mejoras en camino!</string>
     <string name="hidden_profile_password">Contraseña de perfil oculto</string>
@@ -1008,9 +1016,9 @@
     <string name="user_unmute">Activar audio</string>
     <string name="you_can_hide_or_mute_user_profile">Puedes ocultar o silenciar un perfil. Mantenlo pulsado para abrir el menú.</string>
     <string name="you_will_still_receive_calls_and_ntfs">Seguirás recibiendo llamadas y notificaciones de los perfiles silenciados cuando estén activos.</string>
-    <string name="v4_6_group_moderation_descr">Ahora los administradores pueden:
+    <string name="v4_6_group_moderation_descr">Ahora los administradores pueden
 \n- borrar mensajes de los miembros.
-\n- desactivar el rol a miembros (pasando a rol \"observador\")</string>
+\n- desactivar el rol a miembros (a rol \"observador\")</string>
     <string name="to_reveal_profile_enter_password">Para hacer visible tu perfil oculto, introduce la contraseña completa en el campo de búsqueda de la página Tus perfiles Chat.</string>
     <string name="database_upgrade">Actualización de la base de datos</string>
     <string name="database_downgrade">Volviendo a versión anterior de la base de datos</string>
@@ -1024,7 +1032,7 @@
     <string name="confirm_database_upgrades">Confirmar actualizaciones de la bases de datos</string>
     <string name="mtr_error_no_down_migration">la versión de la base de datos es más reciente que la aplicación, pero no hay migración hacia versión anterior para: %s</string>
     <string name="settings_section_title_experimenta">EXPERIMENTAL</string>
-    <string name="developer_options">IDs de la base de datos y opciónes de aislamiento de transporte.</string>
+    <string name="developer_options">ID de base de datos y opción de aislamiento de transporte.</string>
     <string name="file_will_be_received_when_contact_completes_uploading">El archivo se recibirá cuando tu contacto termine de subirlo.</string>
     <string name="image_will_be_received_when_contact_completes_uploading">La imagen se recibirá cuando tu contacto termine de subirla.</string>
     <string name="show_developer_options">Mostrar opciones de desarrollador</string>
@@ -1042,7 +1050,7 @@
     <string name="videos_limit_title">¡Demasiados vídeos!</string>
     <string name="icon_descr_video_snd_complete">Vídeo enviado</string>
     <string name="video_will_be_received_when_contact_completes_uploading">El vídeo se recibirá cuando tu contacto termine de subirlo.</string>
-    <string name="videos_limit_desc">Sólo se pueden enviar 10 vídeos de forma simultánea</string>
+    <string name="videos_limit_desc">Solo se pueden enviar 10 vídeos de forma simultánea</string>
     <string name="icon_descr_waiting_for_video">Esperando el vídeo</string>
     <string name="error_saving_xftp_servers">Error guardando servidores SMP</string>
     <string name="error_loading_xftp_servers">Error cargando servidores XFTP</string>
@@ -1054,7 +1062,7 @@
     <string name="smp_server_test_delete_file">Eliminar archivo</string>
     <string name="smp_server_test_upload_file">Subir archivo</string>
     <string name="xftp_servers">Servidores XFTP</string>
-    <string name="your_XFTP_servers">Mis servidores XFTP</string>
+    <string name="your_XFTP_servers">Tus servidores XFTP</string>
     <string name="port_verb">Puerto</string>
     <string name="network_proxy_port">puerto %d</string>
     <string name="disable_onion_hosts_when_not_supported">Establece <i>Usar hosts .onion</i> en No si el proxy SOCKS no los admite.</string>
@@ -1063,31 +1071,31 @@
     <string name="host_verb">Host</string>
     <string name="network_socks_proxy_settings">Configuración proxy SOCKS</string>
     <string name="la_authenticate">Autenticar</string>
-    <string name="la_current_app_passcode">Código de acceso</string>
+    <string name="la_current_app_passcode">Código de acceso actual</string>
     <string name="authentication_cancelled">Autenticación cancelada</string>
     <string name="change_lock_mode">Cambiar el modo de bloqueo</string>
     <string name="la_seconds">%d segundos</string>
     <string name="la_auth_failed">Error de autenticación</string>
-    <string name="la_change_app_passcode">Cambiar código de acceso</string>
+    <string name="la_change_app_passcode">Cambiar el código de acceso</string>
     <string name="passcode_not_changed">¡Código de acceso no cambiado!</string>
     <string name="la_lock_mode_system">Autenticación del sistema</string>
     <string name="la_no_app_password">Sin código de acceso de la aplicación</string>
     <string name="la_lock_mode_passcode">Campo de código de acceso</string>
     <string name="la_lock_mode">Modo Bloqueo SimpleX</string>
-    <string name="la_could_not_be_verified">No has podido ser autenticado. Inténtalo de nuevo.</string>
+    <string name="la_could_not_be_verified">No has podido ser verificado. Inténtelo de nuevo.</string>
     <string name="la_minutes">%d minutos</string>
-    <string name="la_enter_app_passcode">Introduce código</string>
+    <string name="la_enter_app_passcode">Introducir el código de acceso</string>
     <string name="la_immediately">Inmediatamente</string>
-    <string name="la_please_remember_to_store_password">Por favor, recuerda y guarda el código de acceso en un lugar seguro. ¡No hay ninguna manera de recuperar un código perdido!</string>
+    <string name="la_please_remember_to_store_password">Por favor, recuerda y guarda la contraseña en un lugar seguro. ¡No hay ninguna manera de recuperar una contraseña perdida!</string>
     <string name="lock_not_enabled">¡Bloqueo SimpleX no activado!</string>
     <string name="you_can_turn_on_lock">Puedes activar el Bloqueo SimpleX a través de Configuración.</string>
-    <string name="confirm_passcode">Confirma código</string>
+    <string name="confirm_passcode">Confirmar el código de acceso</string>
     <string name="enable_lock">Activar bloqueo</string>
     <string name="lock_after">Bloquear después de</string>
     <string name="lock_mode">Modo de bloqueo</string>
     <string name="submit_passcode">Enviar</string>
     <string name="incorrect_passcode">Código de acceso incorrecto</string>
-    <string name="new_passcode">Código nuevo</string>
+    <string name="new_passcode">Nuevo código de acceso</string>
     <string name="la_mode_passcode">Código de acceso</string>
     <string name="passcode_changed">¡Código de acceso cambiado!</string>
     <string name="passcode_set">¡Código de acceso guardado!</string>
@@ -1114,152 +1122,20 @@
     <string name="stop_file__confirm">Detener</string>
     <string name="stop_rcv_file__title">¿Dejar de recibir el archivo\?</string>
     <string name="stop_snd_file__title">¿Dejar de enviar el archivo\?</string>
-    <string name="allow_calls_only_if">Se permiten las llamadas pero sólo si tu contacto también las permite.</string>
+    <string name="allow_calls_only_if">Se permiten llamadas sólo si tu contacto también las permite.</string>
     <string name="allow_your_contacts_to_call">Permites que tus contactos puedan llamarte.</string>
-    <string name="audio_video_calls">Llamadas y videollamadas</string>
-    <string name="calls_prohibited_with_this_contact">Las llamadas y videollamadas no están permitidas.</string>
+    <string name="audio_video_calls">Llamadas/Videollamadas</string>
+    <string name="calls_prohibited_with_this_contact">Las llamadas/videollamadas no están permitidas.</string>
     <string name="available_in_v51">"
 \nDisponible en v5.1"</string>
     <string name="both_you_and_your_contact_can_make_calls">Tanto tú como tu contacto podéis realizar llamadas.</string>
-    <string name="only_you_can_make_calls">Sólo tú puedes realizar llamadas.</string>
+    <string name="only_you_can_make_calls">Solo tú puedes realizar llamadas.</string>
     <string name="only_your_contact_can_make_calls">Sólo tu contacto puede realizar llamadas.</string>
-    <string name="prohibit_calls">No se permiten llamadas y videollamadas.</string>
-    <string name="v5_0_app_passcode">Código de acceso de la aplicación</string>
-    <string name="v5_0_polish_interface">Interfaz en polaco</string>
+    <string name="prohibit_calls">Prohibir las llamadas/videollamadas.</string>
+    <string name="v5_0_app_passcode">Código de acceso a la aplicación</string>
+    <string name="v5_0_polish_interface">Interfaz polaco</string>
     <string name="v5_0_app_passcode_descr">Úsalo en lugar de la autenticación del sistema.</string>
-    <string name="v5_0_polish_interface_descr">¡Gracias a los colaboradores! Contribuye a través de Weblate.</string>
+    <string name="v5_0_polish_interface_descr">Agradecimientos a los usuarios. ¡Contribuye a través de Weblate!</string>
     <string name="v5_0_large_files_support">Vídeos y archivos de hasta 1Gb</string>
-    <string name="v5_0_large_files_support_descr">¡Rápido y sin necesidad de esperar a que el remitente esté en línea!</string>
-    <string name="auth_open_chat_profiles">Abrir perfiles de chat</string>
-    <string name="learn_more">Más información</string>
-    <string name="if_you_cant_meet_in_person">Si no puedes reunirte en persona, **muestra el código QR por videollamada**, o comparte el enlace.</string>
-    <string name="scan_qr_to_connect_to_contact">Para conectarse, tu contacto puede escanear el código QR o usar el enlace en la aplicación.</string>
-    <string name="create_simplex_address">Crear dirección SimpleX</string>
-    <string name="auto_accept_contact">Auto aceptar</string>
-    <string name="group_welcome_preview">Vista previa</string>
-    <string name="opening_database">Abriendo base de datos…</string>
-    <string name="error_setting_address">Error al introducir la dirección</string>
-    <string name="read_more_in_user_guide_with_link">Más información en la <font color="#0088ff">Guía de usuario</font>.</string>
-    <string name="one_time_link_short">Enlace un uso</string>
-    <string name="simplex_address">Dirección SimpleX</string>
-    <string name="you_can_accept_or_reject_connection">Cuando alguien solicite conectarse podrás aceptar o rechazar su solicitud.</string>
-    <string name="share_address">Compartir dirección</string>
-    <string name="enter_welcome_message">Introduce mensaje de bienvenida…</string>
-    <string name="theme_simplex">SimpleX</string>
-    <string name="color_primary_variant">Color adicional</string>
-    <string name="color_secondary_variant">Secundario adicional</string>
-    <string name="color_background">Fondo</string>
-    <string name="export_theme">Exportar tema</string>
-    <string name="color_surface">Menús y alertas</string>
-    <string name="add_address_to_your_profile">Añade la dirección a tu perfil para que tus contactos puedan compartirla con otros. La actualización del perfil se enviará a tus contactos.</string>
-    <string name="learn_more_about_address">Acerca de dirección SimpleX</string>
-    <string name="address_section_title">Dirección</string>
-    <string name="all_your_contacts_will_remain_connected_update_sent">Todos tus contactos permanecerán conectados. La actualización del perfil se enviará a tus contactos.</string>
-    <string name="continue_to_next_step">Continuar</string>
-    <string name="dark_theme">Tema oscuro</string>
-    <string name="customize_theme_title">Personalizar tema</string>
-    <string name="enter_welcome_message_optional">Introduce mensaje de bienvenida… (opcional)</string>
-    <string name="create_address_and_let_people_connect">Crear una dirección para que la gente se pueda conectar contigo.</string>
-    <string name="dont_create_address">No crear dirección</string>
-    <string name="email_invite_body">¡Hola!
-\nConecta conmigo a través de SimpleX Chat: %s</string>
-    <string name="import_theme">Importar tema</string>
-    <string name="import_theme_error">Error al importar tema</string>
-    <string name="invite_friends">Invitar amigos</string>
-    <string name="email_invite_subject">Hablemos en SimpleX Chat</string>
-    <string name="import_theme_error_desc">Asegúrate de que el archivo tiene la sintaxis YAML correcta. Exporta el tema para tener un ejemplo de la estructura del archivo de tema.</string>
-    <string name="profile_update_will_be_sent_to_contacts">La actualización del perfil se enviará a tus contactos.</string>
-    <string name="color_received_message">Mensaje recibido</string>
-    <string name="save_auto_accept_settings">Guardar configuración de auto aceptar</string>
-    <string name="you_can_share_your_address">Puedes compartir tu dirección como enlace o como código QR: cualquiera podrá conectarse contigo.</string>
-    <string name="save_settings_question">¿Guardar configuración\?</string>
-    <string name="color_secondary">Secundario</string>
-    <string name="color_sent_message">Mensaje enviado</string>
-    <string name="stop_sharing">Dejar de compartir</string>
-    <string name="stop_sharing_address">¿Dejar de compartir la dirección\?</string>
-    <string name="theme_colors_section_title">COLORES DEL TEMA</string>
-    <string name="you_can_create_it_later">Puedes crearlo más tarde</string>
-    <string name="share_address_with_contacts_question">¿Compartir la dirección con los contactos\?</string>
-    <string name="share_with_contacts">Compartir con contactos</string>
-    <string name="color_title">Título</string>
-    <string name="you_can_share_this_address_with_your_contacts">Puedes compartir esta dirección con tus contactos para que puedan conectar con %s.</string>
-    <string name="your_contacts_will_see_it">Tus contactos en SimpleX lo verán.
-\nPuedes cambiarlo en Configuración.</string>
-    <string name="your_contacts_will_remain_connected">Tus contactos permanecerán conectados.</string>
-    <string name="you_wont_lose_your_contacts_if_delete_address">Si más tarde decides borrar tu dirección los contactos no se perderán.</string>
-    <string name="all_app_data_will_be_cleared">Todos los datos de la aplicación se eliminarán.</string>
-    <string name="empty_chat_profile_is_created">Se creará un perfil vacío con el nombre proporcionado, y la aplicación se abrirá como de costumbre.</string>
-    <string name="self_destruct">Autodestrucción</string>
-    <string name="enabled_self_destruct_passcode">Activar código de autodestrucción</string>
-    <string name="app_passcode_replaced_with_self_destruct">El código de acceso será reemplazado por código de autodestrucción.</string>
-    <string name="change_self_destruct_mode">Cambiar el modo de autodestrucción</string>
-    <string name="change_self_destruct_passcode">Cambiar código autodestrucción</string>
-    <string name="if_you_enter_passcode_data_removed">¡Si introduces este código al abrir la aplicación, todos los datos de la misma se eliminarán de forma irreversible!</string>
-    <string name="if_you_enter_self_destruct_code">Si al abrir la aplicación introduces el código de autodestrucción:</string>
-    <string name="self_destruct_new_display_name">Nuevo nombre mostrado:</string>
-    <string name="self_destruct_passcode">Código de autodestrucción</string>
-    <string name="self_destruct_passcode_changed">¡Código de autodestrucción cambiado!</string>
-    <string name="self_destruct_passcode_enabled">¡Código de autodestrucción activado!</string>
-    <string name="enable_self_destruct">Activar autodestrucción</string>
-    <string name="set_passcode">Código autodestrucción</string>
-    <string name="both_you_and_your_contact_can_add_message_reactions">Tanto tú como tu contacto podéis añadir reacciones a los mensajes.</string>
-    <string name="custom_time_picker_select">Seleccionar</string>
-    <string name="custom_time_picker_custom">personalizado</string>
-    <string name="edit_history">Historial</string>
-    <string name="info_menu">Detalles</string>
-    <string name="received_message">Mensaje entrante</string>
-    <string name="sent_message">Mensaje saliente</string>
-    <string name="disappearing_message">Mensaje temporal</string>
-    <string name="send_disappearing_message">Enviar mensaje temporal</string>
-    <string name="send_disappearing_message_custom_time">Tiempo personalizado</string>
-    <string name="send_disappearing_message_send">Enviar</string>
-    <string name="info_row_moderated_at">Moderado el</string>
-    <string name="info_row_received_at">Recibido el</string>
-    <string name="info_row_sent_at">Enviado el</string>
-    <string name="item_info_current">(actual)</string>
-    <string name="share_text_database_id">ID de base de datos: %d</string>
-    <string name="share_text_deleted_at">Borrado el: %s</string>
-    <string name="share_text_disappears_at">Desaparecerá el: %s</string>
-    <string name="share_text_moderated_at">Moderado el: %s</string>
-    <string name="share_text_received_at">Recibido el: %s</string>
-    <string name="share_text_updated_at">Registro actualizado: %s</string>
-    <string name="current_version_timestamp">%s (actual)</string>
-    <string name="share_text_sent_at">Enviado el: %s</string>
-    <string name="info_row_disappears_at">Desaparecerá el</string>
-    <string name="message_reactions">Reacciones a los mensajes</string>
-    <string name="prohibit_message_reactions">No se permiten reacciones a los mensajes.</string>
-    <string name="allow_message_reactions">Permitir reacciones a los mensajes.</string>
-    <string name="message_reactions_prohibited_in_this_chat">Las reacciones a los mensajes no están permitidas en este chat.</string>
-    <string name="only_you_can_add_message_reactions">Sólo tú puedes añadir reacciones a los mensajes.</string>
-    <string name="prohibit_message_reactions_group">No se permiten reacciones a los mensajes</string>
-    <string name="custom_time_unit_days">días</string>
-    <string name="custom_time_unit_hours">horas</string>
-    <string name="custom_time_unit_minutes">minutos</string>
-    <string name="custom_time_unit_months">meses</string>
-    <string name="custom_time_unit_seconds">segundos</string>
-    <string name="custom_time_unit_weeks">semanas</string>
-    <string name="error_loading_details">Error al cargar detalles</string>
-    <string name="group_members_can_add_message_reactions">Los miembros pueden añadir reacciones a los mensajes.</string>
-    <string name="message_reactions_are_prohibited">Las reacciones a los mensajes no están permitidas en este grupo.</string>
-    <string name="only_your_contact_can_add_message_reactions">Sólo tu contacto puede añadir reacciones a los mensajes.</string>
-    <string name="send_disappearing_message_1_minute">1 minuto</string>
-    <string name="info_row_updated_at">Registro actualizado</string>
-    <string name="send_disappearing_message_30_seconds">30 segundos</string>
-    <string name="send_disappearing_message_5_minutes">5 minutos</string>
-    <string name="allow_your_contacts_adding_message_reactions">Permitir que tus contactos añadan reacciones a los mensajes.</string>
-    <string name="info_row_deleted_at">Eliminado el</string>
-    <string name="allow_message_reactions_only_if">Se permiten las reacciones a los mensajes pero sólo si tu contacto también las permite.</string>
-    <string name="v5_1_custom_themes">Temas personalizados</string>
-    <string name="v5_1_self_destruct_passcode">Código de autodestrucción</string>
-    <string name="v5_1_better_messages_descr">- mensajes de voz de hasta 5 minutos.
-\n- tiempo personalizado para mensajes temporales.
-\n- historial de edición.</string>
-    <string name="whats_new_thanks_to_users_contribute_weblate">¡Gracias a los colaboradores! Contribuye a través de Weblate.</string>
-    <string name="v5_1_better_messages">Mensajes mejorados</string>
-    <string name="v5_1_self_destruct_passcode_descr">Al introducirlo todos los datos son borrados.</string>
-    <string name="v5_1_custom_themes_descr">Personalizar y compartir temas de color.</string>
-    <string name="v5_1_message_reactions_descr">¡Por fin los tenemos! 🚀</string>
-    <string name="v5_1_message_reactions">Reacciones a los mensajes</string>
-    <string name="whats_new_read_more">Saber más</string>
-    <string name="v5_1_japanese_portuguese_interface">Interfaz en japonés y portugués</string>
+    <string name="v5_0_large_files_support_descr">¡Rápido y sin tener que esperar a que el remitente esté en línea!</string>
 </resources>

apps/android/app/src/main/res/values-fr/strings.xml

@@ -60,7 +60,7 @@
     <string name="invalid_connection_link">Lien de connection invalide</string>
     <string name="connection_timeout">Délai de connexion</string>
     <string name="error_sending_message">Erreur lors de l\'envoi du message</string>
-    <string name="you_are_already_connected_to_vName_via_this_link">Vous êtes déjà connecté à <xliff:g id="contactName" example="Alice">%1$s</xliff:g>.</string>
+    <string name="you_are_already_connected_to_vName_via_this_link">Vous êtes déjà connecté à <xliff:g id="contactName" example="Alice">%1$s!</xliff:g>.</string>
     <string name="connection_error_auth">Erreur de connexion (AUTH)</string>
     <string name="connection_error_auth_desc">A moins que votre contact ait supprimé la connexion ou que ce lien ait déjà été utilisé, il peut s\'agir d\'un bug - veuillez le signaler.
 \nPour vous connecter, veuillez demander à votre contact de créer un autre lien de connexion et vérifiez que vous disposez d\'une connexion réseau stable.</string>
@@ -240,9 +240,10 @@
     <string name="this_QR_code_is_not_a_link">Ce code QR n\'est pas un lien !</string>
     <string name="you_will_be_connected_when_your_connection_request_is_accepted">Vous serez connecté·e lorsque votre demande de connexion sera acceptée, veuillez attendre ou vérifier plus tard !</string>
     <string name="you_will_be_connected_when_your_contacts_device_is_online">Vous serez connecté·e lorsque l\'appareil de votre contact sera en ligne, veuillez attendre ou vérifier plus tard !</string>
+    <string name="show_QR_code_for_your_contact_to_scan_from_the_app__multiline">Votre contact peut scanner le code QR depuis l\'app.</string>
     <string name="your_chat_profile_will_be_sent_to_your_contact">Votre profil de chat sera envoyé
 \nà votre contact</string>
-    <string name="share_invitation_link">Partager un lien unique</string>
+    <string name="share_invitation_link">Partager le lien d\'invitation</string>
     <string name="your_profile_will_be_sent">Votre profil de chat sera envoyé à votre contact</string>
     <string name="paste_button">Coller</string>
     <string name="this_string_is_not_a_connection_link">Cette chaîne n\'est pas un lien de connexion !</string>
@@ -259,6 +260,7 @@
     <string name="connect_via_link">Se connecter via un lien</string>
     <string name="clear_verification">Retirer la vérification</string>
     <string name="one_time_link">Lien d\'invitation unique</string>
+    <string name="your_contact_address">Votre adresse de contact</string>
     <string name="scan_code">Scanner le code</string>
     <string name="incorrect_code">Code de sécurité incorrect !</string>
     <string name="security_code">Code de sécurité</string>
@@ -324,7 +326,7 @@
     <string name="use_simplex_chat_servers__question">Utiliser les serveurs <xliff:g id="appNameFull">SimpleX Chat</xliff:g> \?</string>
     <string name="smp_servers_delete_server">Supprimer le serveur</string>
     <string name="ensure_ICE_server_address_are_correct_format_and_unique">Assurez-vous que les adresses des serveurs WebRTC ICE sont au bon format et ne sont pas dupliquées, un par ligne.</string>
-    <string name="network_enable_socks_info">Accéder aux serveurs via un proxy SOCKS sur le port %d \? Le proxy doit être démarré avant d\'activer cette option.</string>
+    <string name="network_enable_socks_info">Accéder aux serveurs via un proxy SOCKS sur le port 9050 \? Le proxy doit être démarré avant d\'activer cette option.</string>
     <string name="network_use_onion_hosts">Utiliser les hôtes .onions</string>
     <string name="network_use_onion_hosts_prefer_desc_in_alert">Les hôtes .onion seront utilisés lorsqu\'ils sont disponibles.</string>
     <string name="network_use_onion_hosts_required_desc_in_alert">Les hôtes .onion seront nécessaires pour la connexion.</string>
@@ -350,6 +352,7 @@
     <string name="configure_ICE_servers">Configurer les serveurs ICE</string>
     <string name="network_settings">Paramètres réseau avancés</string>
     <string name="network_settings_title">Paramètres réseau</string>
+    <string name="network_socks_toggle">Utiliser un proxy SOCKS (port 9050)</string>
     <string name="network_enable_socks">Utiliser un proxy SOCKS \?</string>
     <string name="network_disable_socks">Utiliser une connexion Internet directe \?</string>
     <string name="network_disable_socks_info">Si vous confirmez, les serveurs de messagerie seront en mesure de voir votre adresse IP, votre fournisseur ainsi que les serveurs auxquels vous vous connectez.</string>
@@ -358,6 +361,7 @@
     <string name="network_use_onion_hosts_prefer_desc">Les hôtes .onion seront utilisés lorsqu\'ils sont disponibles.</string>
     <string name="appearance_settings">Apparence</string>
     <string name="create_address">Créer une adresse</string>
+    <string name="you_can_share_your_address_anybody_will_be_able_to_connect">Vous pouvez partager votre adresse sous forme de lien ou de code QR - n\'importe qui pourra se connecter à vous. Vous ne perdrez pas vos contacts si vous la supprimez par la suite.</string>
     <string name="your_current_profile">Votre profil de chat</string>
     <string name="edit_image">Modifier l\'image</string>
     <string name="save_and_notify_contacts">Sauvegarder et notifier les contacts</string>
@@ -388,7 +392,7 @@
     <string name="onboarding_notifications_mode_off">Quand l\'application fonctionne</string>
     <string name="onboarding_notifications_mode_periodic">Périodique</string>
     <string name="onboarding_notifications_mode_service">Instantanée</string>
-    <string name="onboarding_notifications_mode_off_desc"><b>Économie de batterie</b>. Vous recevrez des notifications uniquement lorsque l\'application est en cours d\'exécution (PAS de service d\'arrière-plan)</string>
+    <string name="onboarding_notifications_mode_off_desc"><b>Économie de batterie</b>. Vous recevrez des notifications uniquement lorsque l\'application est en cours d\'exécution, le service de fond ne sera PAS utilisé.</string>
     <string name="about_simplex_chat">À propos de <xliff:g id="appNameFull">SimpleX Chat</xliff:g></string>
     <string name="how_to_use_simplex_chat">Comment l\'utiliser</string>
     <string name="markdown_help">Aide Markdown</string>
@@ -402,7 +406,7 @@
     <string name="callstate_starting">lancement…</string>
     <string name="is_verified">%s est vérifié·e</string>
     <string name="is_not_verified">%s n\'est pas vérifié·e</string>
-    <string name="your_simplex_contact_address">Votre adresse SimpleX</string>
+    <string name="your_simplex_contact_address">Votre adresse de contact <xliff:g id="appName">SimpleX</xliff:g></string>
     <string name="database_passphrase_and_export">Phrase secrète et exportation de la base de données</string>
     <string name="chat_with_the_founder">Envoyez vos questions et idées</string>
     <string name="send_us_an_email">Envoyez nous un e-mail</string>
@@ -429,6 +433,10 @@
     <string name="all_your_contacts_will_remain_connected">Tous vos contacts resteront connectés.</string>
     <string name="share_link">Partager le lien</string>
     <string name="delete_address">Supprimer l\'adresse</string>
+    <string name="contact_requests">Demandes de contact</string>
+    <string name="accept_requests">Accepter les demandes</string>
+    <string name="accept_automatically">Automatiquement</string>
+    <string name="section_title_welcome_message">MESSAGE DE BIENVENUE</string>
     <string name="display_name__field">Nom affiché :</string>
     <string name="full_name__field">Nom complet :</string>
     <string name="your_profile_is_stored_on_device_and_shared_only_with_contacts_simplex_cannot_see_it">Votre profil est stocké sur votre appareil et partagé uniquement avec vos contacts. Les serveurs <xliff:g id="appName">SimpleX</xliff:g> ne peuvent pas voir votre profil.</string>
@@ -462,8 +470,8 @@
     <string name="many_people_asked_how_can_it_deliver">Beaucoup se demandent : <i>si <xliff:g id="appName">SimpleX</xliff:g> n\'a pas d\'identifiant d\'utilisateur, comment peut-il transmettre des messages \?</i></string>
     <string name="only_client_devices_store_contacts_groups_e2e_encrypted_messages">Seuls les appareils clients stockent les profils des utilisateurs, les contacts, les groupes et les messages envoyés avec un <b>chiffrement de bout en bout à deux couches</b>.</string>
     <string name="read_more_in_github_with_link">Pour en savoir plus, consultez notre <font color="#0088ff">GitHub repository</font>.</string>
-    <string name="onboarding_notifications_mode_periodic_desc"><b>Batterie peu utilisée</b>. Le service de fond vérifie les messages toutes les 10 minutes. Vous risquez de manquer des appels ou des messages urgents.</string>
-    <string name="onboarding_notifications_mode_service_desc"><b>Batterie plus utilisée </b> ! Le service de fond est toujours en cours d\'exécution - les notifications s\'affichent dès que les messages sont disponibles.</string>
+    <string name="onboarding_notifications_mode_periodic_desc"><b>Batterie peu utilisée</b>. Le service de fond vérifie les nouveaux messages toutes les 10 minutes. Vous risquez de manquer des appels et des messages urgents.</string>
+    <string name="onboarding_notifications_mode_service_desc"><b>Batterie plus utilisée </b> ! Le service de fond est toujours en cours d\'exécution - les notifications s\'afficheront dès que les messages seront disponibles.</string>
     <string name="integrity_msg_skipped"><xliff:g id="connection ID" example="1">%1$d</xliff:g> message⸱s manqué⸱s</string>
     <string name="integrity_msg_bad_id">ID de message incorrecte</string>
     <string name="settings_section_title_settings">PARAMÈTRES</string>
@@ -959,7 +967,7 @@
     <string name="moderated_description">modéré</string>
     <string name="moderated_item_description">modéré par %s</string>
     <string name="delete_member_message__question">Supprimer le message de ce membre \?</string>
-    <string name="moderate_verb">Modérer</string>
+    <string name="moderate_verb">Modéré</string>
     <string name="moderate_message_will_be_deleted_warning">Le message sera supprimé pour tous les membres.</string>
     <string name="moderate_message_will_be_marked_warning">Le message sera marqué comme modéré pour tous les membres.</string>
     <string name="you_are_observer">vous êtes observateur</string>
@@ -1129,136 +1137,4 @@
     <string name="v5_0_large_files_support_descr">Rapide et ne nécessitant pas d\'attendre que l\'expéditeur soit en ligne !</string>
     <string name="v5_0_polish_interface">Interface en polonais</string>
     <string name="v5_0_app_passcode_descr">Il permet de remplacer l\'authentification du système.</string>
-    <string name="opening_database">Ouverture de la base de données…</string>
-    <string name="learn_more_about_address">À propos de l\'adresse SimpleX</string>
-    <string name="learn_more">En savoir plus</string>
-    <string name="you_can_share_your_address">Vous pouvez partager votre adresse sous la forme d\'un lien ou d\'un code QR - tout le monde peut se connecter à vous.</string>
-    <string name="you_wont_lose_your_contacts_if_delete_address">Vous ne perdrez pas vos contacts si vous supprimez votre adresse ultérieurement.</string>
-    <string name="simplex_address">Adresse SimpleX</string>
-    <string name="you_can_accept_or_reject_connection">Lorsque des personnes demandent à se connecter, vous pouvez les accepter ou les refuser.</string>
-    <string name="theme_colors_section_title">COULEURS DU THÈME</string>
-    <string name="your_contacts_will_remain_connected">Vos contacts resteront connectés.</string>
-    <string name="share_address_with_contacts_question">Partager l\'adresse avec vos contacts \?</string>
-    <string name="share_with_contacts">Partager avec vos contacts</string>
-    <string name="enter_welcome_message_optional">Entrez un message de bienvenue… (facultatif)</string>
-    <string name="stop_sharing">Cesser le partage</string>
-    <string name="stop_sharing_address">Cesser le partage d\'adresse \?</string>
-    <string name="invite_friends">Inviter des amis</string>
-    <string name="email_invite_subject">Discutons sur SimpleX Chat</string>
-    <string name="save_settings_question">Sauvegarder les paramètres \?</string>
-    <string name="dont_create_address">Ne pas créer d\'adresse</string>
-    <string name="address_section_title">Adresse</string>
-    <string name="share_address">Partager l\'adresse</string>
-    <string name="you_can_share_this_address_with_your_contacts">Vous pouvez partager cette adresse avec vos contacts pour leur permettre de se connecter avec %s.</string>
-    <string name="group_welcome_preview">Aperçu</string>
-    <string name="color_background">Fond d\'écran</string>
-    <string name="dark_theme">Thème sombre</string>
-    <string name="export_theme">Exporter le thème</string>
-    <string name="import_theme">Importer un thème</string>
-    <string name="import_theme_error">Erreur lors de l\'importation d\'un thème</string>
-    <string name="color_secondary">Secondaire</string>
-    <string name="theme_simplex">SimpleX</string>
-    <string name="color_sent_message">Message envoyé</string>
-    <string name="color_title">Titre</string>
-    <string name="one_time_link_short">Lien à usage unique</string>
-    <string name="color_primary_variant">Accentuation supplémentaire</string>
-    <string name="add_address_to_your_profile">Ajoutez une adresse à votre profil, afin que vos contacts puissent la partager avec d\'autres personnes. La mise à jour du profil sera envoyée à vos contacts.</string>
-    <string name="color_secondary_variant">Secondaire supplémentaire</string>
-    <string name="all_your_contacts_will_remain_connected_update_sent">Tous vos contacts resteront connectés. La mise à jour du profil sera envoyée à vos contacts.</string>
-    <string name="auto_accept_contact">Auto-acceptation</string>
-    <string name="create_simplex_address">Créer une adresse SimpleX</string>
-    <string name="customize_theme_title">Personnaliser le thème</string>
-    <string name="continue_to_next_step">Continuer</string>
-    <string name="error_setting_address">Erreur lors du réglage de l\'adresse</string>
-    <string name="create_address_and_let_people_connect">Créez une adresse pour permettre aux gens de vous contacter.</string>
-    <string name="enter_welcome_message">Entrez un message de bienvenue…</string>
-    <string name="you_can_create_it_later">Vous pouvez la créer plus tard</string>
-    <string name="email_invite_body">Bonjour !
-\nContactez-moi via SimpleX Chat : %s</string>
-    <string name="if_you_cant_meet_in_person">Si vous ne pouvez pas vous rencontrer en personne, montrez le code QR lors d\'un appel vidéo ou partagez le lien.</string>
-    <string name="auth_open_chat_profiles">Ouvrir les profils de chat</string>
-    <string name="color_surface">Menus et alertes</string>
-    <string name="color_received_message">Message reçu</string>
-    <string name="import_theme_error_desc">Assurez-vous que le fichier a une syntaxe YAML correcte. Exporter le thème pour avoir un exemple de la structure du fichier du thème.</string>
-    <string name="profile_update_will_be_sent_to_contacts">La mise à jour du profil sera envoyée à vos contacts.</string>
-    <string name="read_more_in_user_guide_with_link">Pour en savoir plus, consultez le <font color="#0088ff">Guide de l\'utilisateur</font>.</string>
-    <string name="save_auto_accept_settings">Sauvegarder les paramètres d\'acceptation automatique</string>
-    <string name="scan_qr_to_connect_to_contact">Pour se connecter, votre contact peut scanner le code QR ou utiliser le lien dans l\'application.</string>
-    <string name="your_contacts_will_see_it">Vos contacts dans SimpleX la verront.
-\nVous pouvez modifier ce choix dans les Paramètres.</string>
-    <string name="app_passcode_replaced_with_self_destruct">Le code d\'accès de l\'application est remplacé par un code d\'autodestruction.</string>
-    <string name="enable_self_destruct">Activer l\'autodestruction</string>
-    <string name="empty_chat_profile_is_created">Un profil de chat vierge portant le nom fourni est créé et l\'application s\'ouvre normalement.</string>
-    <string name="change_self_destruct_passcode">Modifier le code d\'autodestruction</string>
-    <string name="enabled_self_destruct_passcode">Activer le code d\'autodestruction</string>
-    <string name="self_destruct">Autodestruction</string>
-    <string name="change_self_destruct_mode">Modifier le mode d\'autodestruction</string>
-    <string name="self_destruct_new_display_name">Nouveau nom affiché :</string>
-    <string name="self_destruct_passcode">Code d\'autodestruction</string>
-    <string name="self_destruct_passcode_changed">Le code d\'autodestruction a été modifié !</string>
-    <string name="self_destruct_passcode_enabled">Code d\'autodestruction activé !</string>
-    <string name="all_app_data_will_be_cleared">Toutes les données de l\'application sont supprimées.</string>
-    <string name="if_you_enter_self_destruct_code">Si vous entrez votre code d\'autodestruction à l\'ouverture de l\'application :</string>
-    <string name="if_you_enter_passcode_data_removed">Si vous saisissez ce code à l\'ouverture de l\'application, toutes les données de l\'application seront irréversiblement supprimées !</string>
-    <string name="set_passcode">Définir le code d\'accès</string>
-    <string name="send_disappearing_message_30_seconds">30 secondes</string>
-    <string name="send_disappearing_message_custom_time">Délai personnalisé</string>
-    <string name="disappearing_message">Message éphémère</string>
-    <string name="send_disappearing_message">Envoyer un message éphémère</string>
-    <string name="send_disappearing_message_send">Envoyer</string>
-    <string name="allow_message_reactions_only_if">Autoriser les réactions aux messages uniquement si votre contact les autorise.</string>
-    <string name="allow_your_contacts_adding_message_reactions">Autoriser vos contacts à ajouter des réactions aux messages.</string>
-    <string name="message_reactions">Réactions aux messages</string>
-    <string name="prohibit_message_reactions">Interdire les réactions aux messages.</string>
-    <string name="both_you_and_your_contact_can_add_message_reactions">Vous et votre contact pouvez ajouter des réactions aux messages.</string>
-    <string name="message_reactions_prohibited_in_this_chat">Les réactions aux messages sont interdites dans ce chat.</string>
-    <string name="only_you_can_add_message_reactions">Vous seul pouvez ajouter des réactions aux messages.</string>
-    <string name="allow_message_reactions">Autoriser les réactions aux messages.</string>
-    <string name="prohibit_message_reactions_group">Interdire les réactions aux messages.</string>
-    <string name="group_members_can_add_message_reactions">Les membres du groupe peuvent ajouter des réactions aux messages.</string>
-    <string name="message_reactions_are_prohibited">Les réactions aux messages sont interdites dans ce groupe.</string>
-    <string name="custom_time_unit_hours">heures</string>
-    <string name="custom_time_unit_minutes">minutes</string>
-    <string name="custom_time_unit_seconds">secondes</string>
-    <string name="custom_time_unit_weeks">semaines</string>
-    <string name="send_disappearing_message_1_minute">1 minute</string>
-    <string name="send_disappearing_message_5_minutes">5 minutes</string>
-    <string name="custom_time_unit_days">jours</string>
-    <string name="custom_time_unit_months">mois</string>
-    <string name="only_your_contact_can_add_message_reactions">Seul votre contact peut ajouter des réactions aux messages.</string>
-    <string name="error_loading_details">Erreur de chargement des détails</string>
-    <string name="edit_history">Historique</string>
-    <string name="info_menu">Info</string>
-    <string name="received_message">Message reçu</string>
-    <string name="custom_time_picker_custom">personnalisé</string>
-    <string name="custom_time_picker_select">Choisir</string>
-    <string name="whats_new_read_more">En savoir plus</string>
-    <string name="v5_1_better_messages_descr">- messages vocaux pouvant durer jusqu\'à 5 minutes.
-\n- délai personnalisé de disparition.
-\n- l\'historique de modification.</string>
-    <string name="share_text_received_at">Reçu le : %s</string>
-    <string name="v5_1_better_messages">Meilleurs messages</string>
-    <string name="v5_1_custom_themes">Thèmes personnalisés</string>
-    <string name="v5_1_self_destruct_passcode_descr">Toutes les données sont effacées lorsqu\'il est saisi.</string>
-    <string name="v5_1_custom_themes_descr">Personnalisez et partagez des thèmes de couleurs.</string>
-    <string name="item_info_current">(actuel)</string>
-    <string name="info_row_deleted_at">Supprimé à</string>
-    <string name="info_row_received_at">Reçu le</string>
-    <string name="info_row_sent_at">Envoyé le</string>
-    <string name="share_text_database_id">ID de base de données : %d</string>
-    <string name="share_text_deleted_at">Supprimé à : %s</string>
-    <string name="share_text_disappears_at">Disparaît à : %s</string>
-    <string name="info_row_disappears_at">Disparaît à</string>
-    <string name="v5_1_japanese_portuguese_interface">Interface en japonais et en portugais</string>
-    <string name="whats_new_thanks_to_users_contribute_weblate">Merci aux utilisateurs - contribuez via Weblate !</string>
-    <string name="v5_1_message_reactions_descr">Enfin, les voilà ! 🚀</string>
-    <string name="info_row_moderated_at">Modéré à</string>
-    <string name="share_text_updated_at">Enregistrement mis à jour le : %s</string>
-    <string name="v5_1_message_reactions">Réactions aux messages</string>
-    <string name="share_text_moderated_at">Modéré à : %s</string>
-    <string name="info_row_updated_at">Enregistrement mis à jour le</string>
-    <string name="current_version_timestamp">%s (actuel)</string>
-    <string name="v5_1_self_destruct_passcode">Code d\'autodestruction</string>
-    <string name="share_text_sent_at">Envoyé le : %s</string>
-    <string name="sent_message">Message envoyé</string>
 </resources>

apps/android/app/src/main/res/values-hi/strings.xml

@@ -10,6 +10,7 @@
     <string name="above_then_preposition_continuation">ऊपर,तब:</string>
     <string name="accept_contact_button">स्वीकार करना</string>
     <string name="connect_button">जुडिये</string>
+    <string name="your_contact_address">आपका संपर्क पता</string>
     <string name="smp_servers_add_to_another_device">दूसरे उपकरण में जोड़ें</string>
     <string name="bold">निडर</string>
     <string name="answer_call">कॉल का उत्तर दें</string>
@@ -34,6 +35,7 @@
     <string name="accept_connection_request__question">संबंध अनुरोध स्वीकार करें\?</string>
     <string name="callstatus_accepted">स्वीकृत कॉल</string>
     <string name="accept_contact_incognito_button">गुप्त स्वीकार करें</string>
+    <string name="accept_requests">निवेदन स्वीकार करो</string>
     <string name="smp_servers_preset_add">पूर्वनिर्धारित सर्वर जोड़ें</string>
     <string name="users_add">प्रोफ़ाइल जोड़ें</string>
     <string name="smp_servers_add">सर्वर जोड़े…</string>
@@ -65,6 +67,7 @@
     <string name="chat_preferences_you_allow">आप आज्ञा दें</string>
     <string name="welcome">स्वागत!</string>
     <string name="la_notice_turn_on">चालू करो</string>
+    <string name="section_title_welcome_message">स्वागत संदेश</string>
     <string name="unknown_message_format">अज्ञात संदेश प्रारूप</string>
     <string name="personal_welcome">स्वागत <xliff:g>%1$s</xliff:g>!</string>
     <string name="callstate_starting">शुरुआत</string>
@@ -232,6 +235,7 @@
     <string name="chat_console">चैट कंसोल</string>
     <string name="all_your_contacts_will_remain_connected">आपके सभी संपर्क जुड़े रहेंगे।</string>
     <string name="network_session_mode_user">चैट प्रोफ़ाइल</string>
+    <string name="contact_requests">संपर्क अनुरोध</string>
     <string name="create_profile_button">बनाएं</string>
     <string name="callstatus_error">कॉल त्रुटि</string>
     <string name="callstatus_in_progress">कॉल चल रहा है</string>

apps/android/app/src/main/res/values-it/strings.xml

@@ -207,7 +207,7 @@
     <string name="simplex_link_mode_description">Descrizione</string>
     <string name="simplex_link_connection">via <xliff:g id="serverHost" example="smp.simplex.im">%1$s</xliff:g></string>
     <string name="simplex_link_mode_browser_warning">Aprire il link nel browser può ridurre la privacy e la sicurezza della connessione. I link SimpleX non fidati saranno in rosso.</string>
-    <string name="you_are_already_connected_to_vName_via_this_link">Sei già connesso a <xliff:g id="contactName" example="Alice">%1$s</xliff:g>.</string>
+    <string name="you_are_already_connected_to_vName_via_this_link">Sei già connesso a <xliff:g id="contactName" example="Alice">%1$s!</xliff:g>.</string>
     <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>
@@ -239,7 +239,8 @@
     <string name="allow_disappearing_messages_only_if">Consenti i messaggi a tempo solo se il tuo contatto li consente.</string>
     <string name="allow_to_delete_messages">Permetti di eliminare irreversibilmente i messaggi inviati.</string>
     <string name="allow_your_contacts_to_send_disappearing_messages">Permetti ai tuoi contatti di inviare messaggi a tempo.</string>
-    <string name="network_enable_socks_info">Accedere ai server via proxy SOCKS sulla porta %d\? Il proxy deve essere avviato prima di attivare questa opzione.</string>
+    <string name="accept_requests">Accetta le richieste</string>
+    <string name="network_enable_socks_info">Accedere ai server via proxy SOCKS sulla porta 9050\? Il proxy deve essere avviato prima di attivare questa opzione.</string>
     <string name="v4_3_improved_server_configuration_desc">Aggiungi server scansionando codici QR.</string>
     <string name="all_group_members_will_remain_connected">Tutti i membri del gruppo resteranno connessi.</string>
     <string name="allow_irreversible_message_deletion_only_if">Consenti l\'eliminazione irreversibile dei messaggi solo se il contatto la consente a te.</string>
@@ -272,8 +273,8 @@
     <string name="settings_section_title_icon">ICONA APP</string>
     <string name="incognito_random_profile_from_contact_description">Verrà inviato un profilo casuale al contatto da cui hai ricevuto questo link</string>
     <string name="incognito_random_profile_description">Verrà inviato un profilo casuale al tuo contatto</string>
-    <string name="onboarding_notifications_mode_off_desc"><b>Ideale per la batteria</b>. Riceverai notifiche solo quando l\'app è in esecuzione (NO servizio in secondo piano).</string>
-    <string name="onboarding_notifications_mode_service_desc"><b>Consuma più batteria</b>! Servizio in secondo piano sempre attivo: le notifiche sono mostrate non appena i messaggi sono disponibili.</string>
+    <string name="onboarding_notifications_mode_off_desc"><b>Ideale per la batteria</b>. Riceverai notifiche solo quando l\'app è in esecuzione, il servizio in secondo piano NON verrà usato.</string>
+    <string name="onboarding_notifications_mode_service_desc"><b>Consuma più batteria</b>! Il servizio in secondo piano è sempre attivo: le notifiche verranno mostrate non appena i messaggi saranno disponibili.</string>
     <string name="callstatus_calling">chiamata…</string>
     <string name="icon_descr_cancel_link_preview">annulla anteprima link</string>
     <string name="cannot_access_keychain">Impossibile accedere al Keystore per salvare la password del database</string>
@@ -283,6 +284,7 @@
     <string name="snd_conn_event_switch_queue_phase_changing">cambio indirizzo…</string>
     <string name="chat_is_stopped">Chat fermata</string>
     <string name="group_member_status_introduced">connessione (presentato)</string>
+    <string name="contact_requests">Richieste del contatto</string>
     <string name="connection_request_sent">Richiesta di connessione inviata!</string>
     <string name="delete_link_question">Eliminare il link\?</string>
     <string name="delete_link">Elimina link</string>
@@ -337,6 +339,7 @@
     <string name="how_to">Come si fa</string>
     <string name="how_to_use_your_servers">Come usare i tuoi server</string>
     <string name="enter_one_ICE_server_per_line">Server ICE (uno per riga)</string>
+    <string name="accept_automatically">Automaticamente</string>
     <string name="bold">grassetto</string>
     <string name="callstatus_ended">chiamata terminata <xliff:g id="duration" example="01:15">%1$s</xliff:g></string>
     <string name="callstatus_error">errore di chiamata</string>
@@ -357,7 +360,7 @@
     <string name="how_to_use_markdown">Come usare il markdown</string>
     <string name="icon_descr_audio_call">chiamata audio</string>
     <string name="audio_call_no_encryption">chiamata audio (non crittografata e2e)</string>
-    <string name="onboarding_notifications_mode_periodic_desc"><b>Buono per la batteria</b>. Il servizio in secondo piano cerca messaggi ogni 10 minuti. Potresti perdere chiamate o messaggi urgenti.</string>
+    <string name="onboarding_notifications_mode_periodic_desc"><b>Buono per la batteria</b>. Il servizio in secondo piano controlla nuovi messaggi ogni 10 minuti. Potresti perdere chiamate e messaggi urgenti.</string>
     <string name="call_already_ended">Chiamata già terminata!</string>
     <string name="create_your_profile">Crea il tuo profilo</string>
     <string name="decentralized">Decentralizzato</string>
@@ -572,6 +575,7 @@
     <string name="you_invited_your_contact">Hai invitato il contatto</string>
     <string name="your_chat_profile_will_be_sent_to_your_contact">Il tuo profilo di chat verrà inviato
 \nal tuo contatto</string>
+    <string name="show_QR_code_for_your_contact_to_scan_from_the_app__multiline">Il tuo contatto può scansionare il codice QR dall\'app.</string>
     <string name="alert_text_connection_pending_they_need_to_be_online_can_delete_and_retry">Il tuo contatto deve essere in linea per completare la connessione.
 \nPuoi annullare questa connessione e rimuovere il contatto (e riprovare più tardi con un link nuovo).</string>
     <string name="you_will_be_connected_when_your_connection_request_is_accepted">Verrai connesso/a quando la tua richiesta di connessione verrà accettata, attendi o controlla più tardi!</string>
@@ -594,23 +598,24 @@
     <string name="chat_with_the_founder">Invia domande e idee</string>
     <string name="send_us_an_email">Inviaci un\'email</string>
     <string name="smp_servers_test_failed">Test del server fallito!</string>
-    <string name="share_invitation_link">Condividi link una tantum</string>
+    <string name="share_invitation_link">Condividi link di invito</string>
     <string name="chat_lock">SimpleX Lock</string>
     <string name="is_not_verified">%s non è verificato/a</string>
     <string name="is_verified">%s è verificato/a</string>
     <string name="smp_servers">Server SMP</string>
     <string name="smp_servers_test_some_failed">Alcuni server hanno fallito il test:</string>
-    <string name="smp_servers_test_server">Prova server</string>
-    <string name="smp_servers_test_servers">Prova i server</string>
+    <string name="smp_servers_test_server">Testa server</string>
+    <string name="smp_servers_test_servers">Testa i server</string>
     <string name="this_string_is_not_a_connection_link">Questa stringa non è un link di connessione!</string>
     <string name="to_verify_compare">Per verificare la crittografia end-to-end con il tuo contatto, confrontate (o scansionate) il codice sui vostri dispositivi.</string>
     <string name="smp_servers_use_server_for_new_conn">Usa per connessioni nuove</string>
     <string name="smp_servers_use_server">Usa il server</string>
     <string name="you_can_also_connect_by_clicking_the_link">Puoi anche connetterti cliccando il link. Se si apre nel browser, clicca il pulsante <b>Apri nell\'app mobile</b>.</string>
     <string name="your_profile_will_be_sent">Il tuo profilo di chat verrà inviato al tuo contatto</string>
+    <string name="your_contact_address">Il tuo indirizzo di contatto</string>
     <string name="smp_servers_your_server">Il tuo server</string>
     <string name="smp_servers_your_server_address">L\'indirizzo del tuo server</string>
-    <string name="your_simplex_contact_address">Il tuo indirizzo SimpleX</string>
+    <string name="your_simplex_contact_address">Il tuo indirizzo di contatto di <xliff:g id="appName">SimpleX</xliff:g></string>
     <string name="network_disable_socks_info">Se confermi, i server di messaggistica saranno in grado di vedere il tuo indirizzo IP e il tuo fornitore, a quali server ti stai connettendo.</string>
     <string name="install_simplex_chat_for_terminal">Installa <xliff:g id="appNameFull">SimpleX Chat</xliff:g> per terminale</string>
     <string name="ensure_ICE_server_address_are_correct_format_and_unique">Assicurati che gli indirizzi dei server WebRTC ICE siano nel formato corretto, uno per riga e non doppi.</string>
@@ -633,9 +638,11 @@
     <string name="network_disable_socks">Usare una connessione internet diretta\?</string>
     <string name="network_use_onion_hosts">Usa gli host .onion</string>
     <string name="network_enable_socks">Usare il proxy SOCKS\?</string>
+    <string name="network_socks_toggle">Usa il proxy SOCKS (porta 9050)</string>
     <string name="use_simplex_chat_servers__question">Usare i server di <xliff:g id="appNameFull">SimpleX Chat</xliff:g>\?</string>
     <string name="using_simplex_chat_servers">Stai usando i server di <xliff:g id="appNameFull">SimpleX Chat</xliff:g>.</string>
     <string name="network_use_onion_hosts_prefer">Quando disponibili</string>
+    <string name="you_can_share_your_address_anybody_will_be_able_to_connect">Puoi condividere il tuo indirizzo come link o come codice QR: chiunque potrà connettersi a te. Non perderai i tuoi contatti se in seguito lo elimini.</string>
     <string name="your_ICE_servers">I tuoi server ICE</string>
     <string name="your_SMP_servers">I tuoi server SMP</string>
     <string name="italic">corsivo</string>
@@ -655,6 +662,7 @@
     <string name="callstate_waiting_for_answer">in attesa di risposta…</string>
     <string name="callstate_waiting_for_confirmation">in attesa di conferma…</string>
     <string name="we_do_not_store_contacts_or_messages_on_servers">Non memorizziamo nessuno dei tuoi contatti o messaggi (una volta recapitati) sui server.</string>
+    <string name="section_title_welcome_message">MESSAGGIO DI BENVENUTO</string>
     <string name="you_can_use_markdown_to_format_messages__prompt">Puoi usare il markdown per formattare i messaggi:</string>
     <string name="you_control_your_chat">Sei tu a controllare la tua chat!</string>
     <string name="your_current_profile">Il tuo profilo attuale</string>
@@ -1113,7 +1121,7 @@
     <string name="stop_file__confirm">Ferma</string>
     <string name="stop_rcv_file__title">Fermare la ricezione del file\?</string>
     <string name="no_spaces">Niente spazi!</string>
-    <string name="allow_calls_only_if">Consenti le chiamate solo se il tuo contatto le consente.</string>
+    <string name="allow_calls_only_if">Consenti le chiamate solo se il contatto le consente.</string>
     <string name="calls_prohibited_with_this_contact">Le chiamate audio/video sono vietate.</string>
     <string name="both_you_and_your_contact_can_make_calls">Sia tu che il tuo contatto potete effettuare chiamate.</string>
     <string name="only_you_can_make_calls">Solo tu puoi effettuare chiamate.</string>
@@ -1126,139 +1134,7 @@
     <string name="v5_0_app_passcode">Codice di accesso dell\'app</string>
     <string name="v5_0_large_files_support_descr">Veloce e senza aspettare che il mittente sia in linea!</string>
     <string name="v5_0_polish_interface">Interfaccia polacca</string>
-    <string name="v5_0_app_passcode_descr">Impostalo al posto dell\'autenticazione di sistema.</string>
+    <string name="v5_0_app_passcode_descr">Impostala al posto dell\'autenticazione di sistema.</string>
     <string name="v5_0_polish_interface_descr">Grazie agli utenti – contribuite via Weblate!</string>
     <string name="v5_0_large_files_support">Video e file fino a 1 GB</string>
-    <string name="auto_accept_contact">Accetta automaticamente</string>
-    <string name="auth_open_chat_profiles">Apri i profili di chat</string>
-    <string name="learn_more">Maggiori informazioni</string>
-    <string name="scan_qr_to_connect_to_contact">Per connettervi, il tuo contatto può scansionare il codice QR o usare il link nell\'app.</string>
-    <string name="you_can_accept_or_reject_connection">Quando le persone chiedono di connettersi, puoi accettare o rifiutare.</string>
-    <string name="simplex_address">Indirizzo SimpleX</string>
-    <string name="theme_colors_section_title">COLORI DEL TEMA</string>
-    <string name="your_contacts_will_remain_connected">I tuoi contatti resteranno connessi.</string>
-    <string name="add_address_to_your_profile">Aggiungi l\'indirizzo al tuo profilo, in modo che i tuoi contatti possano condividerlo con altre persone. L\'aggiornamento del profilo verrà inviato ai tuoi contatti.</string>
-    <string name="create_address_and_let_people_connect">Crea un indirizzo per consentire alle persone di connettersi con te.</string>
-    <string name="create_simplex_address">Crea indirizzo SimpleX</string>
-    <string name="share_with_contacts">Condividi con i contatti</string>
-    <string name="share_address_with_contacts_question">Condividere l\'indirizzo con i contatti\?</string>
-    <string name="stop_sharing">Smetti di condividere</string>
-    <string name="enter_welcome_message_optional">Inserisci il messaggio di benvenuto… (facoltativo)</string>
-    <string name="email_invite_body">Ciao!
-\nConnettiti a me tramite SimpleX Chat: %s</string>
-    <string name="invite_friends">Invita amici</string>
-    <string name="save_auto_accept_settings">Salva le impostazioni di accettazione automatica</string>
-    <string name="you_can_create_it_later">Puoi crearlo più tardi</string>
-    <string name="your_contacts_will_see_it">I tuoi contatti in SimpleX lo vedranno.
-\nPuoi modificarlo nelle impostazioni.</string>
-    <string name="share_address">Condividi indirizzo</string>
-    <string name="enter_welcome_message">Inserisci il messaggio di benvenuto…</string>
-    <string name="group_welcome_preview">Anteprima</string>
-    <string name="you_can_share_this_address_with_your_contacts">Puoi condividere questo indirizzo con i contatti per consentire loro di connettersi con %s.</string>
-    <string name="import_theme">Importa tema</string>
-    <string name="theme_simplex">SimpleX</string>
-    <string name="color_primary_variant">Principale aggiuntivo</string>
-    <string name="color_secondary_variant">Secondario aggiuntivo</string>
-    <string name="export_theme">Esporta tema</string>
-    <string name="import_theme_error">Errore di importazione del tema</string>
-    <string name="import_theme_error_desc">Assicurati che il file abbia una sintassi YAML corretta. Esporta il tema per avere un esempio della struttura del file del tema.</string>
-    <string name="color_secondary">Secondario</string>
-    <string name="color_received_message">Messaggio ricevuto</string>
-    <string name="color_sent_message">Messaggio inviato</string>
-    <string name="color_title">Titolo</string>
-    <string name="one_time_link_short">Link una tantum</string>
-    <string name="learn_more_about_address">Info sull\'indirizzo SimpleX</string>
-    <string name="all_your_contacts_will_remain_connected_update_sent">Tutti i tuoi contatti resteranno connessi. L\'aggiornamento del profilo verrà inviato ai tuoi contatti.</string>
-    <string name="address_section_title">Indirizzo</string>
-    <string name="color_background">Sfondo</string>
-    <string name="continue_to_next_step">Continua</string>
-    <string name="error_setting_address">Errore di impostazione dell\'indirizzo</string>
-    <string name="dont_create_address">Non creare un indirizzo</string>
-    <string name="customize_theme_title">Personalizza il tema</string>
-    <string name="dark_theme">Tema scuro</string>
-    <string name="if_you_cant_meet_in_person">Se non potete incontrarvi di persona, mostra il codice QR in una videochiamata o condividi il link.</string>
-    <string name="email_invite_subject">Parliamo in SimpleX Chat</string>
-    <string name="profile_update_will_be_sent_to_contacts">L\'aggiornamento del profilo verrà inviato ai tuoi contatti.</string>
-    <string name="read_more_in_user_guide_with_link">Maggiori informazioni nella <font color="#0088ff">Guida per l\'utente</font>.</string>
-    <string name="color_surface">Menu e avvisi</string>
-    <string name="stop_sharing_address">Smettere di condividere l\'indirizzo\?</string>
-    <string name="save_settings_question">Salvare le impostazioni\?</string>
-    <string name="you_wont_lose_your_contacts_if_delete_address">Non perderai i contatti se in seguito elimini il tuo indirizzo.</string>
-    <string name="you_can_share_your_address">Puoi condividere il tuo indirizzo come link o codice QR: chiunque può connettersi a te.</string>
-    <string name="opening_database">Apertura del database…</string>
-    <string name="change_self_destruct_mode">Cambia modalità di autodistruzione</string>
-    <string name="enabled_self_destruct_passcode">Attiva il codice di autodistruzione</string>
-    <string name="self_destruct">Autodistruzione</string>
-    <string name="self_destruct_passcode_changed">Codice di autodistruzione modificato!</string>
-    <string name="self_destruct_passcode_enabled">Codice di autodistruzione attivato!</string>
-    <string name="all_app_data_will_be_cleared">Tutti i dati dell\'app vengono eliminati.</string>
-    <string name="app_passcode_replaced_with_self_destruct">Il codice di accesso dell\'app viene sostituito da un codice di autodistruzione.</string>
-    <string name="enable_self_destruct">Attiva l\'autodistruzione</string>
-    <string name="if_you_enter_self_destruct_code">Se inserisci il tuo codice di autodistruzione mentre apri l\'app:</string>
-    <string name="self_destruct_new_display_name">Nome da mostrare nuovo:</string>
-    <string name="self_destruct_passcode">Codice di autodistruzione</string>
-    <string name="empty_chat_profile_is_created">Viene creato un profilo di chat vuoto con il nome scelto e l\'app si apre come al solito.</string>
-    <string name="if_you_enter_passcode_data_removed">Se inserisci questo codice all\'apertura dell\'app, tutti i dati di essa verranno rimossi in modo irreversibile!</string>
-    <string name="set_passcode">Imposta codice</string>
-    <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="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>
-    <string name="allow_message_reactions">Consenti reazioni ai messaggi.</string>
-    <string name="both_you_and_your_contact_can_add_message_reactions">Sia tu che il tuo contatto potete aggiungere reazioni ai messaggi.</string>
-    <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="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>
-    <string name="custom_time_unit_days">giorni</string>
-    <string name="custom_time_unit_hours">ore</string>
-    <string name="custom_time_unit_minutes">minuti</string>
-    <string name="custom_time_unit_months">mesi</string>
-    <string name="custom_time_unit_seconds">secondi</string>
-    <string name="custom_time_unit_weeks">settimane</string>
-    <string name="custom_time_picker_select">Seleziona</string>
-    <string name="send_disappearing_message_1_minute">1 minuto</string>
-    <string name="send_disappearing_message_custom_time">Tempo personalizzato</string>
-    <string name="send_disappearing_message_5_minutes">5 minuti</string>
-    <string name="custom_time_picker_custom">personalizzato</string>
-    <string name="disappearing_message">Messaggio a tempo</string>
-    <string name="error_loading_details">Errore caricamento dettagli</string>
-    <string name="info_menu">Informazioni</string>
-    <string name="edit_history">Cronologia</string>
-    <string name="received_message">Messaggio ricevuto</string>
-    <string name="sent_message">Messaggio inviato</string>
-    <string name="share_text_database_id">ID database: %d</string>
-    <string name="info_row_moderated_at">Moderato il</string>
-    <string name="share_text_moderated_at">Moderato il: %s</string>
-    <string name="info_row_received_at">Ricevuto il</string>
-    <string name="share_text_received_at">Ricevuto il: %s</string>
-    <string name="info_row_updated_at">Registro aggiornato il</string>
-    <string name="share_text_updated_at">Registro aggiornato il: %s</string>
-    <string name="info_row_sent_at">Inviato il</string>
-    <string name="share_text_sent_at">Inviato il: %s</string>
-    <string name="current_version_timestamp">%s (attuale)</string>
-    <string name="whats_new_read_more">Leggi tutto</string>
-    <string name="v5_1_self_destruct_passcode_descr">Tutti i dati vengono cancellati quando inserito.</string>
-    <string name="v5_1_custom_themes_descr">Personalizza e condividi temi di colore.</string>
-    <string name="v5_1_custom_themes">Temi personalizzati</string>
-    <string name="v5_1_message_reactions_descr">Finalmente le abbiamo! 🚀</string>
-    <string name="v5_1_message_reactions">Reazioni ai messaggi</string>
-    <string name="v5_1_self_destruct_passcode">Codice di autodistruzione</string>
-    <string name="whats_new_thanks_to_users_contribute_weblate">Grazie agli utenti – contribuite via Weblate!</string>
-    <string name="v5_1_better_messages_descr">- messaggi vocali fino a 5 minuti.
-\n- tempo di scomparsa personalizzato.
-\n- cronologia delle modifiche.</string>
-    <string name="v5_1_better_messages">Messaggi migliorati</string>
-    <string name="v5_1_japanese_portuguese_interface">Interfaccia giapponese e portoghese</string>
-    <string name="item_info_current">(attuale)</string>
-    <string name="info_row_deleted_at">Eliminato il</string>
-    <string name="share_text_deleted_at">Eliminato il: %s</string>
-    <string name="info_row_disappears_at">Scompare il</string>
-    <string name="share_text_disappears_at">Scompare il: %s</string>
 </resources>

apps/android/app/src/main/res/values-iw/strings.xml

@@ -1,840 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="color_primary">הדגשה</string>
-    <string name="accept_contact_button">אשר</string>
-    <string name="accept_connection_request__question">לאשר בקשת חיבור\?</string>
-    <string name="about_simplex_chat">אודות <xliff:g id="appNameFull">SimpleX Chat</xliff:g></string>
-    <string name="accept_requests">אשר בקשות</string>
-    <string name="about_simplex">אודות SimpleX</string>
-    <string name="accept_call_on_lock_screen">ענה</string>
-    <string name="chat_item_ttl_week">שבוע</string>
-    <string name="accept_feature">קבל</string>
-    <string name="chat_item_ttl_day">יום</string>
-    <string name="chat_item_ttl_month">חודש</string>
-    <string name="a_plus_b">a + b</string>
-    <string name="above_then_preposition_continuation">למעלה, אז:</string>
-    <string name="accept">אשר</string>
-    <string name="callstatus_accepted">שיחה שהתקבלה</string>
-    <string name="allow_verb">אפשר</string>
-    <string name="clear_chat_warning">כל ההודעות יימחקו – לא ניתן לבטל זאת! ההודעות יימחקו רק עבורך.</string>
-    <string name="accept_contact_incognito_button">אשר זהות נסתרת</string>
-    <string name="smp_servers_preset_add">הוסף שרתים מוגדרים מראש</string>
-    <string name="smp_servers_add">הוסף שרת…</string>
-    <string name="network_enable_socks_info">לגשת לשרתים דרך פרוקסי SOCKS בפורט %d\? הפרוקסי חייב לפעול לפני הפעלת אפשרות זו.</string>
-    <string name="network_settings">הגדרות רשת מתקדמות</string>
-    <string name="appearance_settings">מראה</string>
-    <string name="app_version_name">גרסת האפליקציה: v%s</string>
-    <string name="app_version_code">גרסת אפליקציה: %s</string>
-    <string name="section_title_welcome_message">הודעת פתיחה</string>
-    <string name="all_your_contacts_will_remain_connected">כל אנשי הקשר יישארו מחוברים.</string>
-    <string name="always_use_relay">תמיד להשתמש בממסר</string>
-    <string name="answer_call">ענה לשיחה</string>
-    <string name="all_group_members_will_remain_connected">כל חברי הקבוצה יישארו מחוברים.</string>
-    <string name="button_add_welcome_message">הוסף הודעת פתיחה</string>
-    <string name="button_welcome_message">הודעת פתיחה</string>
-    <string name="group_welcome_title">הודעת פתיחה</string>
-    <string name="chat_preferences_always">תמיד</string>
-    <string name="allow_disappearing_messages_only_if">אפשר הודעות נעלמות רק אם איש הקשר מאפשר אותן.</string>
-    <string name="allow_your_contacts_irreversibly_delete">אפשר לאנשי קשר מחיקה בלתי הפיכה של הודעות שנשלחו.</string>
-    <string name="allow_your_contacts_to_send_disappearing_messages">אפשר לאנשי קשר לשלוח הודעות נעלמות.</string>
-    <string name="allow_voice_messages_only_if">אפשר הודעות קוליות רק אם איש הקשר מאפשר אותן.</string>
-    <string name="allow_your_contacts_to_call">אפשר לאנשי קשר להתקשר אליך.</string>
-    <string name="allow_to_delete_messages">אפשר מחיקה בלתי הפיכה של הודעות שנשלחו.</string>
-    <string name="allow_to_send_disappearing">אפשר שליחת הודעות נעלמות.</string>
-    <string name="allow_to_send_voice">אפשר שליחת הודעות קוליות.</string>
-    <string name="group_member_role_admin">מנהל</string>
-    <string name="v4_2_group_links_desc">מנהלים יכולים ליצור קישורי הצטרפות לקבוצות.</string>
-    <string name="users_delete_all_chats_deleted">כל הצ׳אטים וההודעות יימחקו – לא ניתן לבטל זאת!</string>
-    <string name="users_add">הוסף פרופיל</string>
-    <string name="v4_3_improved_server_configuration_desc">הוסף שרתים על ידי סריקת קוד QR.</string>
-    <string name="smp_servers_add_to_another_device">הוסף למכשיר אחר</string>
-    <string name="allow_calls_only_if">אפשר שיחות רק אם איש הקשר מאפשר אותן.</string>
-    <string name="allow_irreversible_message_deletion_only_if">אפשר לאנשי קשר מחיקת הודעות בלתי הפיכה רק אם הם מאפשרים לך לעשות זאת.</string>
-    <string name="allow_direct_messages">אפשר שליחת הודעות ישירות לחברי הקבוצה.</string>
-    <string name="allow_voice_messages_question">לאפשר הודעות קוליות\?</string>
-    <string name="allow_your_contacts_to_send_voice_messages">אפשר לאנשי קשר לשלוח הודעות קוליות.</string>
-    <string name="notifications_mode_service">תמיד פעיל</string>
-    <string name="keychain_is_storing_securely">ישנו שימוש ב־Android Keystore כדי לאחסן בבטחה את הסיסמה – דבר המאפשר לשירות ההתראות לעבוד.</string>
-    <string name="keychain_allows_to_receive_ntfs">Android Keystore יאחסן בבטחה את הסיסמה לאחר הפעלה מחדש של האפליקציה או שינוי הסיסמה – דבר המאפשר קבלת התראות.</string>
-    <string name="full_backup">גיבוי נתוני האפליקציה</string>
-    <string name="settings_section_title_icon">סמל האפליקציה</string>
-    <string name="notifications_mode_off_desc">האפליקציה יכולה לקבל התראות רק כאשר היא מופעלת, לא יופעל שירות ברקע.</string>
-    <string name="v5_0_app_passcode">קוד גישה לאפליקציה</string>
-    <string name="app_version_title">גרסת האפליקציה</string>
-    <string name="incognito_random_profile_description">פרופיל אקראי יישלח לאיש הקשר</string>
-    <string name="incognito_random_profile_from_contact_description">פרופיל אקראי יישלח לאיש הקשר שממנו קיבלת קישור זה</string>
-    <string name="network_session_mode_user_description">חיבור TCP נפרד (ואישור SOCKS) ייווצר <b>לכל פרופיל צ׳אט שיש ברשותך באפליקציה</b>.</string>
-    <string name="network_session_mode_entity_description">חיבור TCP נפרד (ואישור SOCKS) ייווצר <b>לכל איש קשר וחבר קבוצה</b>.
-\n<b>שימו לב</b>: אם ברשותכם חיבורים רבים, צריכת הסוללה ותעבורת האינטרנט עשויה להיות גבוהה משמעותית וחלק מהחיבורים עלולים להיכשל.</string>
-    <string name="icon_descr_video_asked_to_receive">הנמען התבקש לקבל את הסרטון</string>
-    <string name="icon_descr_asked_to_receive">הנמען התבקש לקבל את התמונה</string>
-    <string name="attach">צרף</string>
-    <string name="icon_descr_audio_call">שיחת שמע</string>
-    <string name="icon_descr_audio_off">שמע כבוי</string>
-    <string name="icon_descr_audio_on">שמע פעיל</string>
-    <string name="calls_prohibited_with_this_contact">שיחות שמע/וידאו אסורות.</string>
-    <string name="v4_6_audio_video_calls">שיחות שמע ווידאו</string>
-    <string name="audio_call_no_encryption">שיחת שמע (לא מוצפנת מקצה־לקצה)</string>
-    <string name="audio_video_calls">שיחות שמע/וידאו</string>
-    <string name="settings_audio_video_calls">שיחות שמע ווידאו</string>
-    <string name="turning_off_service_and_periodic">מיטוב הסוללה פעיל, מכבה את שירות הרקע ובקשות תקופתיות לקבלת הודעות חדשות. ניתן להפעיל אותם מחדש בהגדרות.</string>
-    <string name="it_can_disabled_via_settings_notifications_still_shown"><b>ניתן להשבית זאת בהגדרות</b> – התראות עדיין יוצגו בזמן שהאפליקציה פועלת.</string>
-    <string name="notifications_mode_service_desc">שירות רקע תמיד מופעל – התראות יוצגו מיד כאשר הודעות מגיעות.</string>
-    <string name="la_authenticate">אימות</string>
-    <string name="la_auth_failed">אימות נכשל</string>
-    <string name="back">חזרה</string>
-    <string name="accept_automatically">אוטומטית</string>
-    <string name="bold">מודגש</string>
-    <string name="integrity_msg_bad_hash">גיבוב הודעה שגוי</string>
-    <string name="integrity_msg_bad_id">מזהה הודעה שגוי</string>
-    <string name="alert_title_msg_bad_hash">גיבוב הודעה שגוי</string>
-    <string name="alert_title_msg_bad_id">מזהה הודעה שגוי</string>
-    <string name="auto_accept_images">קבל אוטומטית תמונות</string>
-    <string name="impossible_to_recover_passphrase"><b>שימו לב</b>: לא ניתן יהיה לשחזר או לשנות את הסיסמה אם תאבדו אותה.</string>
-    <string name="available_in_v51">"
-\nזמין מ־v5.1"</string>
-    <string name="both_you_and_your_contact_can_send_voice">גם אתם וגם איש הקשר יכולים לשלוח הודעות קוליות.</string>
-    <string name="both_you_and_your_contact_can_make_calls">גם אתם וגם איש הקשר יכולים לבצע שיחות.</string>
-    <string name="v4_2_auto_accept_contact_requests">אשר אוטומטית בקשות ליצירת קשר.</string>
-    <string name="authentication_cancelled">אימות בוטל</string>
-    <string name="auth_unavailable">אימות לא זמין</string>
-    <string name="add_new_contact_to_create_one_time_QR_code"><b>הוסף איש קשר חדש</b>: ליצירת קוד QR חד פעמי עבור איש הקשר שלך.</string>
-    <string name="onboarding_notifications_mode_off_desc"><b>הטוב ביותר לסוללה</b>. התראות יוצגו רק כאשר האפליקציה מופעלת (ללא שירות רקע).</string>
-    <string name="onboarding_notifications_mode_periodic_desc"><b>טוב לסוללה</b>. שירות הרקע ייבדוק הודעות כל 10 דקות. שיחות או הודעות דחופות עלולות להתפספס.</string>
-    <string name="both_you_and_your_contacts_can_delete">גם אתם וגם איש הקשר יכולים למחוק באופן בלתי הפיך הודעות שנשלחו.</string>
-    <string name="both_you_and_your_contact_can_send_disappearing">גם אתם וגם איש הקשר יכולים לשלוח הודעות נעלמות.</string>
-    <string name="cannot_receive_file">לא ניתן לקבל את הקובץ</string>
-    <string name="icon_descr_cancel_image_preview">בטל תצוגה מקדימה של תמונות</string>
-    <string name="cancel_verb">ביטול</string>
-    <string name="icon_descr_cancel_live_message">בטל הודעה חיה</string>
-    <string name="use_camera_button">מצלמה</string>
-    <string name="scan_QR_code_to_connect_to_contact_who_shows_QR_code"><b>סריקת קוד QR</b>: כדי להתחבר לאיש קשר המציג לכם קוד QR.</string>
-    <string name="icon_descr_cancel_link_preview">בטל תצוגה מקדימה של קישורים</string>
-    <string name="callstatus_error">שגיאת שיחה</string>
-    <string name="callstatus_in_progress">שיחה מתמשכת</string>
-    <string name="onboarding_notifications_mode_service_desc"><b>צורך יותר סוללה</b>! שירות רקע תמיד מופעל – התראות יוצגו מיד כאשר הודעות מגיעות.</string>
-    <string name="call_already_ended">השיחה כבר הסתיימה!</string>
-    <string name="call_on_lock_screen">שיחות במסך הנעילה:</string>
-    <string name="icon_descr_call_ended">השיחה הסתיימה</string>
-    <string name="icon_descr_call_progress">שיחה מתמשכת</string>
-    <string name="settings_section_title_calls">שיחות</string>
-    <string name="cannot_access_keychain">לא ניתן לגשת ל־Keystore כדי לאחסן את סיסמת מסד הנתונים</string>
-    <string name="cant_delete_user_profile">לא ניתן למחוק פרופיל משתמש!</string>
-    <string name="feature_cancelled_item">בוטל %s</string>
-    <string name="v4_5_transport_isolation_descr">לפי פרופיל צ׳אט (ברירת מחדל) או לפי חיבור (בביטא).</string>
-    <string name="callstatus_calling">מתקשר…</string>
-    <string name="callstatus_ended">השיחה הסתיימה <xliff:g id="duration" example="01:15">%1$s</xliff:g></string>
-    <string name="icon_descr_cancel_file_preview">בטל תצוגה מקדימה של קבצים</string>
-    <string name="connect_via_contact_link">להתחבר באמצעות קישור ליצירת קשר\?</string>
-    <string name="connect_via_link_verb">התחבר</string>
-    <string name="connect_via_group_link">להתחבר באמצעות קישור קבוצה\?</string>
-    <string name="server_connected">מחובר</string>
-    <string name="server_connecting">מתחבר</string>
-    <string name="display_name_connecting">מתחבר…</string>
-    <string name="connection_error">שגיאת חיבור</string>
-    <string name="connection_timeout">תם זמן ניסיון החיבור</string>
-    <string name="connection_error_auth">שגיאת חיבור (אימות)</string>
-    <string name="smp_server_test_connect">התחבר</string>
-    <string name="smp_server_test_compare_file">השווה קובץ</string>
-    <string name="database_initialization_error_title">לא ניתן לאתחל את מסד הנתונים</string>
-    <string name="notifications_mode_periodic_desc">בודק הודעות חדשות כל 10 דקות למשך עד דקה אחת.</string>
-    <string name="notification_contact_connected">מחובר</string>
-    <string name="la_change_app_passcode">שנה קוד גישה</string>
-    <string name="auth_confirm_credential">אימות אישורך</string>
-    <string name="chat_with_developers">צ׳אט עם המפתחים</string>
-    <string name="contact_connection_pending">מתחבר…</string>
-    <string name="group_connection_pending">מתחבר…</string>
-    <string name="confirm_verb">אשר</string>
-    <string name="clear_verb">נקה</string>
-    <string name="clear_chat_menu_action">נקה</string>
-    <string name="clear_chat_button">נקה צ׳אט</string>
-    <string name="clear_chat_question">לנקות צ׳אט\?</string>
-    <string name="icon_descr_close_button">לחצן סגירה</string>
-    <string name="connection_request_sent">בקשת חיבור נשלחה!</string>
-    <string name="clear_verification">נקה אימות</string>
-    <string name="connect_button">התחבר</string>
-    <string name="chat_console">מסוף צ׳אט</string>
-    <string name="smp_servers_check_address">בידקו את כתובת השרת ונסו שוב.</string>
-    <string name="configure_ICE_servers">הגדר שרתי ICE</string>
-    <string name="network_session_mode_user">פרופיל צ׳אט</string>
-    <string name="network_session_mode_entity">חיבור</string>
-    <string name="confirm_password">אימות סיסמה</string>
-    <string name="colored">צבעוני</string>
-    <string name="callstatus_connecting">מתחבר לשיחה…</string>
-    <string name="callstate_connected">מחובר</string>
-    <string name="callstate_connecting">מתחבר…</string>
-    <string name="icon_descr_call_connecting">מתחבר לשיחה</string>
-    <string name="confirm_passcode">אימות קוד גישה</string>
-    <string name="change_lock_mode">שנה מצב נעילה</string>
-    <string name="settings_section_title_chats">צ׳אטים</string>
-    <string name="chat_database_section">מסד נתונים</string>
-    <string name="chat_is_running">צ׳אט פעיל</string>
-    <string name="chat_is_stopped">צ׳אט מופסק</string>
-    <string name="chat_database_deleted">מסד הנתונים של הצ׳אט נמחק</string>
-    <string name="chat_database_imported">‬מסד הנתונים של הצ׳אט יובא</string>
-    <string name="confirm_database_upgrades">אשר שדרוגי מסד נתונים</string>
-    <string name="chat_archive_header">ארכיון צ׳אט</string>
-    <string name="chat_archive_section">ארכיון צ׳אט</string>
-    <string name="chat_is_stopped_indication">צ׳אט מופסק</string>
-    <string name="alert_title_cant_invite_contacts">לא ניתן להזמין את אנשי הקשר!</string>
-    <string name="rcv_group_event_changed_your_role">שונה תפקידך ל%s</string>
-    <string name="rcv_group_event_member_connected">מחובר</string>
-    <string name="rcv_conn_event_switch_queue_phase_completed">כתובתך שונתה</string>
-    <string name="rcv_conn_event_switch_queue_phase_changing">משנה כתובת…</string>
-    <string name="snd_conn_event_switch_queue_phase_changing">משנה כתובת…</string>
-    <string name="snd_conn_event_switch_queue_phase_changing_for_member">משנה כתובת עבור %s…</string>
-    <string name="group_member_status_connected">מחובר</string>
-    <string name="group_member_status_accepted">מתחבר (הזמנה אושרה)</string>
-    <string name="group_member_status_announced">מתחבר (הוכרז)</string>
-    <string name="group_member_status_intro_invitation">מתחבר (הזמנת היכרות)</string>
-    <string name="group_member_status_introduced">מתחבר (בוצעה היכרות)</string>
-    <string name="invite_prohibited">לא ניתן להזמין את איש הקשר!</string>
-    <string name="clear_contacts_selection_button">נקה</string>
-    <string name="group_member_status_complete">חיבור הושלם</string>
-    <string name="group_member_status_connecting">מתחבר</string>
-    <string name="change_verb">שנה</string>
-    <string name="change_member_role_question">לשנות תפקיד בקבוצה\?</string>
-    <string name="change_role">שנה תפקיד</string>
-    <string name="info_row_connection">חיבור</string>
-    <string name="chat_preferences">העדפות צ׳אט</string>
-    <string name="v4_6_chinese_spanish_interface">ממשק סינית וספרדית</string>
-    <string name="v4_4_verify_connection_security_desc">השוואת קודי אבטחה עם אנשי הקשר שלך.</string>
-    <string name="change_database_passphrase_question">לשנות את סיסמת מסד הנתונים\?</string>
-    <string name="rcv_group_event_changed_member_role">שונה התפקיד של %s ל%s</string>
-    <string name="confirm_new_passphrase">אימות סיסמה חדשה…</string>
-    <string name="icon_descr_server_status_connected">מחובר</string>
-    <string name="display_name_connection_established">חיבור נוצר</string>
-    <string name="connection_local_display_name">חיבור <xliff:g id="connection ID" example="1">%1$d</xliff:g></string>
-    <string name="connect_via_invitation_link">להתחבר באמצעות קישור הזמנה\?</string>
-    <string name="contact_already_exists">איש הקשר כבר קיים</string>
-    <string name="delete_contact_all_messages_deleted_cannot_undo_warning">איש הקשר וכל ההודעות יימחקו – לא ניתן לבטל זאת!</string>
-    <string name="connect_via_link_or_qr">התחברות באמצעות קישור / קוד QR</string>
-    <string name="connect_via_link">התחברות באמצעות קישור</string>
-    <string name="chat_preferences_contact_allows">איש הקשר מאפשר</string>
-    <string name="notification_preview_somebody">איש קשר מוסתר:</string>
-    <string name="notification_preview_mode_contact">שם איש קשר</string>
-    <string name="alert_title_contact_connection_pending">איש הקשר עוד לא מחובר!</string>
-    <string name="status_contact_has_e2e_encryption">לאיש הקשר יש הצפנה מקצה־לקצה</string>
-    <string name="icon_descr_contact_checked">איש קשר נבדק</string>
-    <string name="status_contact_has_no_e2e_encryption">לאיש הקשר אין הצפנה מקצה־לקצה</string>
-    <string name="smp_server_test_create_queue">צור תור</string>
-    <string name="smp_server_test_create_file">צור קובץ</string>
-    <string name="copy_verb">העתק</string>
-    <string name="icon_descr_context">סמל מידע נוסף</string>
-    <string name="copied">הועתק ללוח</string>
-    <string name="share_one_time_link">צור קישור הזמנה חד־פעמי</string>
-    <string name="create_group">צור קבוצה סודית</string>
-    <string name="create_one_time_link">צור קישור הזמנה חד־פעמי</string>
-    <string name="contribute">תרומה</string>
-    <string name="core_version">גרסת ליבה: v%s</string>
-    <string name="create_address">צור כתובת</string>
-    <string name="contact_requests">בקשות ליצירת קשר</string>
-    <string name="create_profile_button">צור</string>
-    <string name="create_profile">צור פרופיל</string>
-    <string name="create_your_profile">יצירת הפרופיל שלך</string>
-    <string name="archive_created_on_ts">נוצר ב־<xliff:g id="archive_ts">%1$s</xliff:g></string>
-    <string name="create_group_link">צור קישור קבוצה</string>
-    <string name="button_create_group_link">צור קישור</string>
-    <string name="group_member_status_creator">יוצר הקבוצה</string>
-    <string name="create_secret_group_title">צור קבוצה סודית</string>
-    <string name="contact_preferences">העדפות איש קשר</string>
-    <string name="contacts_can_mark_messages_for_deletion">אנשי קשר יכולים לסמן הודעות למחיקה; ניתן יהיה לראות אותן.</string>
-    <string name="smp_server_test_delete_queue">מחק תור</string>
-    <string name="la_current_app_passcode">קוד גישה נוכחי</string>
-    <string name="delete_verb">מחק</string>
-    <string name="button_delete_contact">מחק איש קשר</string>
-    <string name="scan_QR_code">סריקת קוד QR</string>
-    <string name="developer_options">מזהי מסד נתונים ואפשרות בידוד תעבורה.</string>
-    <string name="delete_address">מחק כתובת</string>
-    <string name="settings_developer_tools">כלי מפתחים</string>
-    <string name="database_passphrase">סיסמת מסד הנתונים</string>
-    <string name="delete_messages_after">מחק הודעות אחרי</string>
-    <string name="encrypted_with_random_passphrase">מסד הנתונים מוצפן באמצעות סיסמה אקראית, באפשרותך לשנות אותה.</string>
-    <string name="database_passphrase_will_be_updated">סיסמת הצפנת מסד הנתונים תעודכן.</string>
-    <string name="database_encryption_will_be_updated">סיסמת הצפנת מסד הנתונים תעודכן ותאוחסן ב־Keystore.</string>
-    <string name="passphrase_is_different">סיסמת מסד הנתונים שונה מזו המאוחסנת ב־Keystore.</string>
-    <string name="mtr_error_no_down_migration">גרסת מסד הנתונים חדשה יותר מהאפליקציה, אך אין העברת נתונים עבור: %s</string>
-    <string name="users_delete_profile_for">מחיקת פרופיל צ׳אט עבור</string>
-    <string name="delete_profile">מחק פרופיל</string>
-    <string name="delete_contact_question">למחוק איש קשר\?</string>
-    <string name="delete_contact_menu_action">מחק</string>
-    <string name="delete_group_menu_action">מחק</string>
-    <string name="smp_servers_delete_server">מחק שרת</string>
-    <string name="create_address_and_let_people_connect">צרו כתובת כדי לאפשר לאנשים להתחבר אליכם.</string>
-    <string name="decentralized">מבוזר</string>
-    <string name="set_password_to_export_desc">מסד הנתונים מוצפן באמצעות סיסמה אקראית. אנא שנו אותה לפני הייצוא.</string>
-    <string name="delete_chat_archive_question">למחוק ארכיון צ׳אט\?</string>
-    <string name="delete_chat_profile">מחק פרופיל צ׳אט</string>
-    <string name="chat_preferences_default">ברירת מחדל (%s)</string>
-    <string name="ttl_day">%d יום</string>
-    <string name="ttl_h">%d שעות</string>
-    <string name="ttl_hour">%d שעה</string>
-    <string name="ttl_d">%d ימים</string>
-    <string name="ttl_days">%d ימים</string>
-    <string name="ttl_hours">%d שעות</string>
-    <string name="decryption_error">שגיאת פענוח הצפנה</string>
-    <string name="deleted_description">נמחק</string>
-    <string name="simplex_link_mode_description">תיאור</string>
-    <string name="delete_member_message__question">למחוק הודעת חבר קבוצה\?</string>
-    <string name="delete_message__question">למחוק הודעה\?</string>
-    <string name="image_decoding_exception_title">שגיאת פענוח קידוד</string>
-    <string name="delete_pending_connection__question">למחוק חיבור ממתין\?</string>
-    <string name="one_time_link_short">קישור חד־פעמי</string>
-    <string name="network_session_mode_transport_isolation">בידוד תעבורה</string>
-    <string name="all_your_contacts_will_remain_connected_update_sent">כל אנשי הקשר יישארו מחוברים. עדכון הפרופיל יישלח לאנשי הקשר.</string>
-    <string name="create_simplex_address">צור כתובת SimpleX</string>
-    <string name="delete_address__question">למחוק כתובת\?</string>
-    <string name="auto_accept_contact">אשר אוטומטית</string>
-    <string name="continue_to_next_step">המשך</string>
-    <string name="delete_image">מחק תמונה</string>
-    <string name="delete_chat_profile_question">למחוק פרופיל צ׳אט\?</string>
-    <string name="delete_files_and_media_question">למחוק קבצים ומדיה\?</string>
-    <string name="delete_files_and_media_for_all_users">מחק קבצים עבור כל פרופילי הצ׳אט</string>
-    <string name="current_passphrase">סיסמה נוכחית…</string>
-    <string name="database_encrypted">מסד הנתונים מוצפן!</string>
-    <string name="delete_messages">מחק הודעות</string>
-    <string name="database_will_be_encrypted">מסד הנתונים יוצפן.</string>
-    <string name="database_will_be_encrypted_and_passphrase_stored">מסד הנתונים יוצפן והסיסמה תאוחסן ב־Keystore.</string>
-    <string name="database_error">שגיאת מסד נתונים</string>
-    <string name="database_passphrase_is_required">סיסמת מסד הנתונים נדרשת כדי לפתוח את הצ׳אט.</string>
-    <string name="database_downgrade">שדרוג לאחור של מסד הנתונים</string>
-    <string name="database_upgrade">שדרוג מסד הנתונים</string>
-    <string name="num_contacts_selected">%d אנשי קשר נבחרו</string>
-    <string name="delete_link_question">למחוק קישור\?</string>
-    <string name="theme_dark">כהה</string>
-    <string name="color_secondary">משני</string>
-    <string name="color_secondary_variant">משני נוסף</string>
-    <string name="color_background">רקע</string>
-    <string name="learn_more_about_address">אודות כתובת SimpleX</string>
-    <string name="add_address_to_your_profile">הוסיפו את הכתובת לפרופיל שלכם, כך שאנשי קשר יוכלו לשתף אותה עם אנשים אחרים. עדכון הפרופיל יישלח לאנשי הקשר.</string>
-    <string name="color_primary_variant">הדגשה נוספת</string>
-    <string name="address_section_title">כתובת</string>
-    <string name="maximum_supported_file_size">גודל הקובץ המרבי הנתמך כרגע הוא <xliff:g id="maxFileSize">%1$s</xliff:g></string>
-    <string name="customize_theme_title">התאמה אישית</string>
-    <string name="dark_theme">מצב כהה</string>
-    <string name="info_row_database_id">מזהה מסד נתונים</string>
-    <string name="v4_5_transport_isolation">בידוד תעבורה</string>
-    <string name="database_passphrase_and_export">סיסמה וייצוא של מסד הנתונים</string>
-    <string name="delete_after">מחק אחרי</string>
-    <string name="delete_files_and_media_all">מחק את כל הקבצים</string>
-    <string name="delete_archive">מחק ארכיון</string>
-    <string name="for_me_only">מחק עבורי</string>
-    <string name="delete_link">מחק קישור</string>
-    <string name="users_delete_question">למחוק פרופיל צ׳אט\?</string>
-    <string name="delete_database">מחק מסד נתונים</string>
-    <string name="rcv_group_event_group_deleted">קבוצה נמחקה</string>
-    <string name="smp_server_test_delete_file">מחק קובץ</string>
-    <string name="full_deletion">מחק לכולם</string>
-    <string name="button_delete_group">מחק קבוצה</string>
-    <string name="delete_group_question">למחוק קבוצה\?</string>
-    <string name="desktop_scan_QR_code_from_app_via_scan_QR_code">💻 שולחן עבודה: סירקו את קוד ה־QR המוצג באפליקציה, באמצעות <b>סריקת קוד QR</b>.</string>
-    <string name="settings_section_title_develop">פיתוח</string>
-    <string name="settings_section_title_device">מכשיר</string>
-    <string name="auth_device_authentication_is_disabled_turning_off">נעילת המכשיר מושבתת. מכבה נעילת SimpleX.</string>
-    <string name="auth_device_authentication_is_not_enabled_you_can_turn_on_in_settings_once_enabled">נעילת המכשיר אינה מופעלת. ניתן להפעיל את נעילת SimpleX, לאחר שתפעילו את נעילת המכשיר.</string>
-    <string name="total_files_count_and_size">%d קבצים בגודל כולל של %s</string>
-    <string name="server_error">שגיאה</string>
-    <string name="error_loading_smp_servers">שגיאה בטעינת שרתי SMP</string>
-    <string name="failed_to_create_user_title">שגיאה ביצירת פרופיל!</string>
-    <string name="failed_to_create_user_duplicate_title">שם תצוגה כבר קיים!</string>
-    <string name="error_creating_address">שגיאה ביצירת כתובת</string>
-    <string name="error_accepting_contact_request">שגיאה באישור בקשה ליצירת קשר</string>
-    <string name="la_minutes">%d דקות</string>
-    <string name="la_seconds">%d שניות</string>
-    <string name="la_enter_app_passcode">הזינו קוד גישה</string>
-    <string name="auth_enable_simplex_lock">הפעלת נעילת SimpleX</string>
-    <string name="edit_verb">ערוך</string>
-    <string name="display_name__field">שם תצוגה:</string>
-    <string name="edit_image">ערוך תמונה</string>
-    <string name="enter_correct_passphrase">הזינו סיסמה נכונה.</string>
-    <string name="mtr_error_different">העברת נתונים שונה באפליקציה/מסד נתונים: %s / %s</string>
-    <string name="downgrade_and_open_chat">שדרג לאחור ופתח צ׳אט</string>
-    <string name="error_changing_role">שגיאה בשינוי תפקיד</string>
-    <string name="network_option_enable_tcp_keep_alive">הפעל TCP keep-alive</string>
-    <string name="disappearing_prohibited_in_this_chat">הודעות נעלמות אסורות בצ׳אט זה.</string>
-    <string name="icon_descr_server_status_disconnected">מנותק</string>
-    <string name="icon_descr_server_status_error">שגיאה</string>
-    <string name="smp_servers_enter_manually">הזנת שרת ידנית</string>
-    <string name="callstate_ended">הסתיימה</string>
-    <string name="enable_lock">הפעל נעילה</string>
-    <string name="error_exporting_chat_database">שגיאה בייצוא מסד הנתונים של הצ׳אט</string>
-    <string name="enable_automatic_deletion_question">לאפשר מחיקת הודעות אוטומטית\?</string>
-    <string name="error_encrypting_database">שגיאה בהצפנת מסד הנתונים</string>
-    <string name="enter_password_to_show">הזינו סיסמה בחיפוש</string>
-    <string name="error_adding_members">שגיאה בהוספת חברי קבוצה</string>
-    <string name="error_deleting_contact_request">שגיאה במחיקת בקשה ליצירת קשר</string>
-    <string name="error_deleting_group">שגיאה במחיקת קבוצה</string>
-    <string name="error_joining_group">שגיאה בהצטרפות לקבוצה</string>
-    <string name="smp_server_test_disconnect">התנתק</string>
-    <string name="smp_server_test_download_file">הורד קובץ</string>
-    <string name="error_changing_address">שגיאה בשינוי כתובת</string>
-    <string name="error_deleting_user">שגיאה במחיקת פרופיל משתמש</string>
-    <string name="auth_disable_simplex_lock">השבתת נעילת SimpleX</string>
-    <string name="dont_create_address">לא ליצור כתובת</string>
-    <string name="no_call_on_lock_screen">מושבת</string>
-    <string name="integrity_msg_duplicate">הודעה כפולה</string>
-    <string name="error_deleting_database">שגיאה במחיקת מסד הנתונים של הצ׳אט</string>
-    <string name="error_importing_database">שגיאה בייבוא מסד הנתונים של הצ׳אט</string>
-    <string name="encrypt_database">הצפן</string>
-    <string name="error_changing_message_deletion">שגיאה בשינוי הגדרה</string>
-    <string name="encrypt_database_question">להצפין מסד נתונים\?</string>
-    <string name="encrypted_database">מסד נתונים מוצפן</string>
-    <string name="button_edit_group_profile">ערוך פרופיל קבוצה</string>
-    <string name="error_creating_link_for_group">שגיאה ביצירת קישור קבוצה</string>
-    <string name="error_deleting_link_for_group">שגיאה במחיקת קישור קבוצה</string>
-    <string name="dont_show_again">אל תציג שוב</string>
-    <string name="direct_messages">הודעות ישירות</string>
-    <string name="timed_messages">הודעות נעלמות</string>
-    <string name="feature_enabled">מופעל</string>
-    <string name="feature_enabled_for_contact">מופעל עבור איש הקשר</string>
-    <string name="feature_enabled_for_you">מופעל עבורך</string>
-    <string name="disappearing_messages_are_prohibited">הודעות נעלמות אסורות בקבוצה זו.</string>
-    <string name="ttl_min">%d דקה</string>
-    <string name="ttl_s">%d שניות</string>
-    <string name="v4_4_disappearing_messages">הודעות נעלמות</string>
-    <string name="ttl_m">%d דקות</string>
-    <string name="ttl_month">%d חודש</string>
-    <string name="ttl_w">%d שבועות</string>
-    <string name="ttl_week">%d שבוע</string>
-    <string name="ttl_weeks">%d שבועות</string>
-    <string name="v4_5_multiple_chat_profiles_descr">שמות שונים, אווטארים ובידוד תעבורה.</string>
-    <string name="conn_level_desc_direct">ישיר</string>
-    <string name="direct_messages_are_prohibited_in_chat">הודעות ישירות בין חברי קבוצה אסורות בקבוצה זו.</string>
-    <string name="display_name">שם תצוגה</string>
-    <string name="display_name_cannot_contain_whitespace">שם תצוגה אינו יכול להכיל רווחים.</string>
-    <string name="ttl_months">%d חודשים</string>
-    <string name="ttl_mth">%d חודשים</string>
-    <string name="ttl_sec">%d שנייה</string>
-    <string name="status_e2e_encrypted">הצפנה מקצה־לקצה</string>
-    <string name="encrypted_video_call">שיחת וידאו מוצפנת מקצה־לקצה</string>
-    <string name="icon_descr_edited">הודעה נערכה</string>
-    <string name="encrypted_audio_call">שיחת שמע מוצפנת מקצה־לקצה</string>
-    <string name="icon_descr_email">אימייל</string>
-    <string name="allow_accepting_calls_from_lock_screen">אפשרו שיחות ממסך הנעילה דרך ההגדרות.</string>
-    <string name="enter_passphrase">הזינו סיסמה…</string>
-    <string name="enter_welcome_message_optional">הזינו הודעת פתיחה (אופציונלי)</string>
-    <string name="enter_welcome_message">הזינו הודעת פתיחה…</string>
-    <string name="error_deleting_contact">שגיאה במחיקת איש קשר</string>
-    <string name="error_deleting_pending_contact_connection">שגיאה במחיקת חיבור איש קשר ממתין</string>
-    <string name="error_loading_xftp_servers">שגיאה בטעינת שרתי XFTP</string>
-    <string name="error_sending_message">שגיאה בשליחת הודעה</string>
-    <string name="error_receiving_file">שגיאה בקבלת קובץ</string>
-    <string name="error_saving_ICE_servers">שגיאה בשמירת שרתי ICE</string>
-    <string name="settings_experimental_features">תכונות ניסיוניות</string>
-    <string name="export_database">ייצא מסד נתונים</string>
-    <string name="error_removing_member">שגיאה בהסרת חבר קבוצה</string>
-    <string name="error_saving_group_profile">שגיאה בשמירת פרופיל קבוצה</string>
-    <string name="error_saving_file">שגיאה בשמירת קובץ</string>
-    <string name="exit_without_saving">יציאה ללא שמירה</string>
-    <string name="error_stopping_chat">שגיאה בעצירת צ׳אט</string>
-    <string name="error_saving_smp_servers">שגיאה בשמירת שרתי SMP</string>
-    <string name="error_saving_xftp_servers">שגיאה בשמירת שרתי XFTP</string>
-    <string name="failed_to_active_user_title">שגיאה בהחלפת פרופיל!</string>
-    <string name="error_setting_network_config">שגיאה בעדכון תצורת הרשת</string>
-    <string name="failed_to_parse_chat_title">טעינת הצ׳אט נכשלה</string>
-    <string name="failed_to_parse_chats_title">טעינת הצ׳אטים נכשלה</string>
-    <string name="error_setting_address">שגיאה בהגדרת כתובת</string>
-    <string name="error_updating_user_privacy">שגיאה בעדכון פרטיות משתמש</string>
-    <string name="error_saving_user_password">שגיאה בשמירת סיסמת משתמש</string>
-    <string name="settings_section_title_experimenta">ניסיוני</string>
-    <string name="error_starting_chat">שגיאה בהפעלת צ׳אט</string>
-    <string name="error_with_info">שגיאה: %s</string>
-    <string name="error_updating_link_for_group">שגיאה בעדכון קישור קבוצה</string>
-    <string name="export_theme">ייצא ערכת צבעים</string>
-    <string name="icon_descr_expand_role">הרחב בחירת תפקיד</string>
-    <string name="file_will_be_received_when_contact_is_online">הקובץ ייתקבל כאשר איש הקשר יהיה מקוון, אנא חכו או בידקו מאוחר יותר!</string>
-    <string name="full_name__field">שם מלא:</string>
-    <string name="file_with_path">קובץ: %s</string>
-    <string name="icon_descr_group_inactive">קבוצה לא פעילה</string>
-    <string name="group_invitation_expired">פג תוקפה של ההזמנה לקבוצה</string>
-    <string name="group_display_name_field">שם תצוגה של הקבוצה:</string>
-    <string name="group_full_name_field">שם מלא של הקבוצה:</string>
-    <string name="v4_2_group_links">קישורי קבוצה</string>
-    <string name="icon_descr_file">קובץ</string>
-    <string name="file_will_be_received_when_contact_completes_uploading">הקובץ ייתקבל כאשר איש הקשר יסיים להעלות אותו.</string>
-    <string name="file_not_found">קובץ לא נמצא</string>
-    <string name="file_saved">קובץ נשמר</string>
-    <string name="alert_message_group_invitation_expired">ההזמנה לקבוצה כבר לא תקפה, היא הוסרה על ידי השולח.</string>
-    <string name="group_link">קישור קבוצה</string>
-    <string name="info_row_group">קבוצה</string>
-    <string name="simplex_link_mode_full">קישור מלא</string>
-    <string name="for_everybody">עבור כולם</string>
-    <string name="choose_file">קובץ</string>
-    <string name="from_gallery_button">מתוך גלריה</string>
-    <string name="full_name_optional__prompt">שם מלא (אופציונלי)</string>
-    <string name="files_and_media_section">קבצים ומדיה</string>
-    <string name="group_member_status_group_deleted">קבוצה נמחקה</string>
-    <string name="section_title_for_console">עבור מסוף הצ׳אט</string>
-    <string name="v5_0_large_files_support_descr">מהיר וללא המתנה עד שהשולח יהיה מקוון!</string>
-    <string name="v4_4_french_interface">ממשק צרפתית</string>
-    <string name="v4_6_reduced_battery_usage">הפחתה נוספת בשימוש בסוללה</string>
-    <string name="revoke_file__message">הקובץ יימחק מהשרתים.</string>
-    <string name="icon_descr_flip_camera">הפוך מצלמה</string>
-    <string name="icon_descr_help">עזרה</string>
-    <string name="if_you_cannot_meet_in_person_show_QR_in_video_call_or_via_another_channel">אם לא ניתן להיפגש פנים אל פנים, <b>הציגו את קוד ה־QR בשיחת וידאו</b>, או שתפו את הקישור.</string>
-    <string name="how_to">איך</string>
-    <string name="how_to_use_your_servers">איך להשתמש בשרתים שלך</string>
-    <string name="enter_one_ICE_server_per_line">שרתי ICE (אחד בכל שורה)</string>
-    <string name="host_verb">לארח</string>
-    <string name="hide_dev_options">מוסתר:</string>
-    <string name="snd_group_event_group_profile_updated">פרופיל הקבוצה עודכן</string>
-    <string name="group_profile_is_stored_on_members_devices">פרופיל הקבוצה מאוחסן במכשירי חברי הקבוצה, לא על השרתים.</string>
-    <string name="all_app_data_will_be_cleared">כל נתוני האפליקציה יימחקו.</string>
-    <string name="empty_chat_profile_is_created">פרופיל צ׳אט ריק עם השם שסופק ייווצר, והאפליקציה תיפתח כרגיל.</string>
-    <string name="app_passcode_replaced_with_self_destruct">קוד הגישה לאפליקציה יוחלף עם קוד הגישה להשמדה עצמית.</string>
-    <string name="v4_3_improved_privacy_and_security_desc">ניתן להסתיר את מסך האפליקציה במסך האפליקציות האחרונות.</string>
-    <string name="v4_6_hidden_chat_profiles">פרופילי צ׳אט מוסתרים</string>
-    <string name="v4_6_group_moderation">ניהול קבוצה</string>
-    <string name="v4_6_group_welcome_message">הודעת פתיחה בקבוצה</string>
-    <string name="alert_title_no_group">קבוצה לא נמצאה!</string>
-    <string name="hide_notification">הסתר</string>
-    <string name="notification_preview_mode_hidden">מוסתר</string>
-    <string name="notification_display_mode_hidden_desc">הסתר איש קשר והודעה</string>
-    <string name="hide_verb">הסתר</string>
-    <string name="if_you_cannot_meet_in_person_scan_QR_in_video_call_or_ask_for_invitation_link">אם לא ניתן להיפגש פנים אל פנים, ניתן <b>לסרוק את קוד ה־QR בשיחת וידאו</b>, או שאיש הקשר שלך ישתף קישור הזמנה.</string>
-    <string name="if_you_cant_meet_in_person">אם לא ניתן להיפגש פנים אל פנים, הציגו את קוד ה־QR בשיחת וידאו, או שתפו את הקישור.</string>
-    <string name="how_to_use_simplex_chat">איך להשתמש בזה</string>
-    <string name="email_invite_body">היי!
-\nאפשר להתחבר אליי דרך SimpleX Chat: %s</string>
-    <string name="hidden_profile_password">סיסמת פרופיל מוסתרת</string>
-    <string name="hide_profile">הסתר פרופיל</string>
-    <string name="how_to_use_markdown">איך להשתמש במרקדאון</string>
-    <string name="how_it_works">איך זה עובד</string>
-    <string name="how_simplex_works">איך <xliff:g id="appName">SimpleX</xliff:g> עובדת</string>
-    <string name="icon_descr_hang_up">נתק</string>
-    <string name="settings_section_title_help">עזרה</string>
-    <string name="delete_group_for_all_members_cannot_undo_warning">הקבוצה תימחק עבור כל חברי הקבוצה – לא ניתן לבטל זאת!</string>
-    <string name="delete_group_for_self_cannot_undo_warning">הקבוצה תימחק עבורך – לא ניתן לבטל זאת!</string>
-    <string name="user_hide">הסתר</string>
-    <string name="group_preferences">העדפות קבוצה</string>
-    <string name="group_members_can_delete">חברי הקבוצה יכולים למחוק באופן בלתי הפיך הודעות שנשלחו.</string>
-    <string name="group_members_can_send_disappearing">חברי הקבוצה יכולים לשלוח הודעות נעלמות.</string>
-    <string name="group_members_can_send_dms">חברי הקבוצה יכולים לשלוח הודעות ישירות.</string>
-    <string name="group_members_can_send_voice">חברי הקבוצה יכולים לשלוח הודעות קוליות.</string>
-    <string name="enable_self_destruct">אפשר השמדה עצמית</string>
-    <string name="if_you_choose_to_reject_the_sender_will_not_be_notified">אם תבחרו לדחות השולח לא יקבל התראה על כך.</string>
-    <string name="network_disable_socks_info">אם תאשרו, שרתי העברת ההודעות יוכלו לראות את ה־IP שלכם, וספק האינטרנט שלכם – את השרתים אליהם אתם מחוברים.</string>
-    <string name="image_descr">תמונה</string>
-    <string name="if_you_received_simplex_invitation_link_you_can_open_in_browser">אם קיבלתם קישור הזמנה ל־<xliff:g id="appName">SimpleX Chat</xliff:g>, תוכלו לפתוח אותו בדפדפן.</string>
-    <string name="if_you_enter_self_destruct_code">אם תזינו את קוד הגישה להשמדה עצמית בעת פתיחת האפליקציה:</string>
-    <string name="if_you_enter_passcode_data_removed">אם תזינו קוד גישה זה בעת פתיחת האפליקציה, כל נתוני האפליקציה יימחקו באופן בלתי הפיך!</string>
-    <string name="image_saved">תמונה נשמרה בגלריה</string>
-    <string name="gallery_image_button">תמונה</string>
-    <string name="ignore">התעלם</string>
-    <string name="la_immediately">מיד</string>
-    <string name="import_database">ייבא מסד נתונים</string>
-    <string name="immune_to_spam_and_abuse">חסין מפני ספאם ושימוש לרעה</string>
-    <string name="import_database_question">לייבא מסד נתונים של צ׳אט\?</string>
-    <string name="icon_descr_image_snd_complete">תמונה נשלחה</string>
-    <string name="image_will_be_received_when_contact_completes_uploading">התמונה תתקבל כאשר איש הקשר יסיים להעלות אותה.</string>
-    <string name="image_will_be_received_when_contact_is_online">התמונה תתקבל כאשר איש הקשר יהיה מקוון, אנא המתינו או בידקו מאוחר יותר!</string>
-    <string name="import_database_confirmation">ייבא</string>
-    <string name="import_theme">ייבא ערכת צבעים</string>
-    <string name="import_theme_error">שגיאה בייבוא ערכת צבעים</string>
-    <string name="group_unsupported_incognito_main_profile_sent">מצב זהות נסתרת אינו נתמך כאן – הפרופיל הראשי שלך יישלח לחברי הקבוצה</string>
-    <string name="v4_3_improved_server_configuration">תצורת שרתים משופרת</string>
-    <string name="v4_3_improved_privacy_and_security">פרטיות ואבטחה משופרים</string>
-    <string name="settings_section_title_incognito">מצב זהות נסתרת</string>
-    <string name="incognito">זהות נסתרת</string>
-    <string name="description_via_contact_address_link_incognito">זהות נסתרת באמצעות קישור כתובת איש קשר</string>
-    <string name="description_via_group_link_incognito">זהות נסתרת באמצעות קישור קבוצה</string>
-    <string name="description_via_one_time_link_incognito">זהות נסתרת באמצעות קישור חד־פעמי</string>
-    <string name="invalid_connection_link">קישור חיבור לא תקין</string>
-    <string name="turn_off_battery_optimization">על מנת להשתמש בזה, אנא <b>השביתו מיטוב סוללה</b> עבור <xliff:g id="appName">SimpleX</xliff:g> בתיבת הדו־שיח הבאה. אחרת, ההתראות יושבתו.</string>
-    <string name="service_notifications_disabled">התראות מיידיות מושבתות!</string>
-    <string name="icon_descr_add_members">הזמן חברי קבוצה</string>
-    <string name="group_member_status_invited">הוזמן</string>
-    <string name="conn_level_desc_indirect">עקיף (<xliff:g id="conn_level">%1$s</xliff:g>)</string>
-    <string name="incognito_info_protects">מצב זהות נסתרת מגן על התמונה והפרטיות של שם הפרופיל הראשי שלך – עבור כל איש קשר חדש נוצר פרופיל חדש אקראי.</string>
-    <string name="incompatible_database_version">גרסת מסד נתונים לא תואמת</string>
-    <string name="invalid_migration_confirmation">אישור העברת נתונים לא תקין</string>
-    <string name="v4_3_irreversible_message_deletion">מחיקה בלתי הפיכה של הודעות</string>
-    <string name="v4_5_italian_interface">ממשק איטלקית</string>
-    <string name="smp_servers_invalid_address">כתובת שרת לא תקינה!</string>
-    <string name="install_simplex_chat_for_terminal">התקנת <xliff:g id="appNameFull">SimpleX Chat</xliff:g> עבור מסוף הפקודה</string>
-    <string name="invite_friends">הזמן חברים</string>
-    <string name="italic">נטוי</string>
-    <string name="invalid_chat">צ׳אט לא תקין</string>
-    <string name="invalid_data">נתונים לא תקינים</string>
-    <string name="invalid_message_format">פורמט הודעה לא תקין</string>
-    <string name="display_name_invited_to_connect">הוזמן להתחבר</string>
-    <string name="icon_descr_instant_notifications">התראות מיידיות</string>
-    <string name="service_notifications">התראות מיידיות!</string>
-    <string name="invalid_contact_link">קישור לא תקין!</string>
-    <string name="invalid_QR_code">קוד QR לא תקין</string>
-    <string name="incorrect_code">קוד אבטחה שגוי!</string>
-    <string name="onboarding_notifications_mode_service">מיידית</string>
-    <string name="incoming_audio_call">שיחת שמע נכנסת</string>
-    <string name="incoming_video_call">שיחת וידאו נכנסת</string>
-    <string name="incorrect_passcode">קוד גישה שגוי</string>
-    <string name="group_invitation_item_description">הזמנה לקבוצה <xliff:g id="group_name">%1$s</xliff:g></string>
-    <string name="alert_title_group_invitation_expired">פג תוקף ההזמנה!</string>
-    <string name="rcv_group_event_member_added">הוזמן <xliff:g id="member profile" example="alice (Alice)">%1$s</xliff:g></string>
-    <string name="rcv_group_event_invited_via_your_group_link">הוזמן באמצעות קישור הקבוצה שלך</string>
-    <string name="initial_member_role">תפקיד ראשוני</string>
-    <string name="invite_to_group_button">הזמן לקבוצה</string>
-    <string name="button_add_members">הזמן חברי קבוצה</string>
-    <string name="message_deletion_prohibited">מחיקה בלתי הפיכה של הודעות אסורה בצ׳אט זה.</string>
-    <string name="message_deletion_prohibited_in_chat">מחיקה בלתי הפיכה של הודעות אסורה בקבוצה זו.</string>
-    <string name="group_preview_join_as">להצטרף בתור %s</string>
-    <string name="incognito_info_allows">זה מאפשר חיבורים אנונימיים רבים ללא שום נתונים משותפים ביניהם בפרופיל צ׳אט יחיד.</string>
-    <string name="alert_text_skipped_messages_it_can_happen_when">זה יכול לקרות כאשר:
-\n1. פג תוקפן של ההודעות בלקוח השולח לאחר 2 ימים או בשרת לאחר 30 ימים.
-\n2. פיענוח הצפנת הודעה נכשל, מכיוון שאתם או איש הקשר שלכם השתמשתם בגיבוי ישן של מסד הנתונים.
-\n3. החיבור נפגע.</string>
-    <string name="onboarding_notifications_mode_subtitle">ניתן לשנות זאת מאוחר יותר באמצעות ההגדרות.</string>
-    <string name="alert_text_fragment_encryption_out_of_sync_old_database">זה יכול לקרות כאשר אתם או איש הקשר שלכם השתמשתם בגיבוי ישן של מסד הנתונים.</string>
-    <string name="join_group_question">להצטרף לקבוצה\?</string>
-    <string name="join_group_button">הצטרף</string>
-    <string name="large_file">קובץ גדול!</string>
-    <string name="thousand_abbreviation">אלף</string>
-    <string name="ensure_ICE_server_address_are_correct_format_and_unique">ודאו שכתובות שרתי ה־WebRTC ICE הן בפורמט הנכון, מופרדות בשורה ולא משוכפלות.</string>
-    <string name="v4_4_live_messages">הודעות חיות</string>
-    <string name="live_message">הודעה חיה!</string>
-    <string name="image_descr_link_preview">תצוגה מקדימה של קישור</string>
-    <string name="make_private_connection">צור חיבור פרטי</string>
-    <string name="lock_after">נעל אחרי</string>
-    <string name="lock_mode">מצב נעילה</string>
-    <string name="joining_group">מצטרף לקבוצה</string>
-    <string name="leave_group_button">עזוב</string>
-    <string name="make_profile_private">הפוך את הפרופיל לפרטי!</string>
-    <string name="live">הודעה חיה</string>
-    <string name="ensure_smp_server_address_are_correct_format_and_unique">ודאו שכתובות שרתי ה־SMP הן בפורמט הנכון, מופרדות בשורה ולא משוכפלות.</string>
-    <string name="ensure_xftp_server_address_are_correct_format_and_unique">ודאו שכתובות שרתי ה־XFTP הן בפורמט הנכון, מופרדות בשורה ולא משוכפלות.</string>
-    <string name="auth_log_in_using_credential">התחבר באמצעות האישור שלך</string>
-    <string name="learn_more">למדו עוד</string>
-    <string name="markdown_help">עזרה במרקדאון</string>
-    <string name="email_invite_subject">בואו נדבר ב־Simplex Chat</string>
-    <string name="many_people_asked_how_can_it_deliver">אנשים רבים שאלו: <i>אם ל־<xliff:g id="appName">SimpleX</xliff:g> אין מזהי משתמש, איך ניתן להעביר הודעות\?</i></string>
-    <string name="keychain_error">שגיאת Keychain</string>
-    <string name="join_group_incognito_button">הצטרף עם זהות נסתרת</string>
-    <string name="leave_group_question">לעזוב קבוצה\?</string>
-    <string name="rcv_group_event_member_left">עזב</string>
-    <string name="group_member_status_left">עזב</string>
-    <string name="button_leave_group">עזוב קבוצה</string>
-    <string name="info_row_local_name">שם מקומי</string>
-    <string name="users_delete_data_only">נתוני פרופיל מקומיים בלבד</string>
-    <string name="theme_light">בהיר</string>
-    <string name="import_theme_error_desc">ודאו שלקובץ יש תחביר YAML תקין. ייצאו ערכת צבעים כדי לקבל דוגמה למבנה תקין של קובץ ערכת צבעים.</string>
-    <string name="message_delivery_error_desc">ככל הנראה איש קשר זה מחק את החיבור איתך.</string>
-    <string name="network_use_onion_hosts_prefer_desc_in_alert">ייעשה שימוש במארחי Onion כאשר יהיו זמינים.</string>
-    <string name="network_use_onion_hosts_required_desc_in_alert">מארחי Onion יידרשו לחיבור.</string>
-    <string name="moderated_item_description">מנוהל על ידי %s</string>
-    <string name="la_no_app_password">אין קוד גישה לאפליקציה</string>
-    <string name="videos_limit_desc">ניתן לשלוח רק 10 סרטונים בו־זמנית</string>
-    <string name="images_limit_desc">ניתן לשלוח רק 10 תמונות בו־זמנית</string>
-    <string name="notifications">התראות</string>
-    <string name="only_group_owners_can_enable_voice">רק בעלי הקבוצות יכולים לאפשר הודעות קוליות.</string>
-    <string name="no_details">ללא פרטים</string>
-    <string name="ok">אישור</string>
-    <string name="add_contact">קישור הזמנה חד־פעמי</string>
-    <string name="markdown_in_messages">מרקדאון בהודעות</string>
-    <string name="network_and_servers">רשת ושרתים</string>
-    <string name="network_settings_title">הגדרות רשת</string>
-    <string name="no_spaces">בלי רווחים!</string>
-    <string name="new_database_archive">ארכיון מסד נתונים חדש</string>
-    <string name="messages_section_title">הודעות</string>
-    <string name="group_member_role_member">חבר קבוצה</string>
-    <string name="group_member_role_observer">צופה</string>
-    <string name="only_group_owners_can_change_prefs">רק בעלי הקבוצות יכולים לשנות העדפות קבוצה.</string>
-    <string name="network_status">מצב רשת</string>
-    <string name="chat_preferences_on">פעיל</string>
-    <string name="chat_preferences_no">לא</string>
-    <string name="chat_preferences_off">כבוי</string>
-    <string name="only_you_can_delete_messages">רק אתם יכולים למחוק הודעות באופן בלתי הפיך (איש הקשר שלכם יכול לסמן אותן למחיקה).</string>
-    <string name="only_you_can_send_voice">רק אתם יכולים לשלוח הודעות קוליות.</string>
-    <string name="only_your_contact_can_send_voice">רק איש הקשר שלכם יכול לשלוח הודעות קוליות.</string>
-    <string name="only_you_can_make_calls">רק אתם יכולים לבצע שיחות.</string>
-    <string name="only_your_contact_can_make_calls">רק איש הקשר שלכם יכול לבצע שיחות.</string>
-    <string name="new_in_version">חדש ב־%s</string>
-    <string name="self_destruct_new_display_name">שם תצוגה חדש:</string>
-    <string name="notifications_will_be_hidden">התראות יוצגו רק עד שהאפליקציה תופסק!</string>
-    <string name="new_passphrase">סיסמה חדשה…</string>
-    <string name="database_migrations">העברות נתונים: %s</string>
-    <string name="no_contacts_to_add">אין אנשי קשר להוסיף</string>
-    <string name="only_you_can_send_disappearing">רק אתם יכולים לשלוח הודעות נעלמות.</string>
-    <string name="only_your_contact_can_send_disappearing">רק איש הקשר שלכם יכול לשלוח הודעות נעלמות.</string>
-    <string name="only_your_contact_can_delete">רק איש הקשר שלכם יכול למחוק הודעות באופן בלתי הפיך (אתם יכולים לסמן אותן למחיקה).</string>
-    <string name="v4_5_message_draft">טיוטת הודעה</string>
-    <string name="v4_5_multiple_chat_profiles">פרופילי צ׳אט מרובים</string>
-    <string name="v4_5_reduced_battery_usage_descr">שיפורים נוספים יגיעו בקרוב!</string>
-    <string name="v4_6_reduced_battery_usage_descr">שיפורים נוספים יגיעו בקרוב!</string>
-    <string name="v4_6_group_moderation_descr">כעת מנהלים יכולים:
-\n- למחוק הודעות של חברי קבוצה.
-\n- להשבית חברי קבוצה (תפקיד ”צופה”)</string>
-    <string name="notification_new_contact_request">בקשה חדשה ליצירת קשר</string>
-    <string name="notification_preview_new_message">הודעה חדשה</string>
-    <string name="mark_read">סמן כנקרא</string>
-    <string name="mark_unread">סמן כלא נקרא</string>
-    <string name="one_time_link">קישור הזמנה חד־פעמי</string>
-    <string name="muted_when_inactive">מושתק כאשר אין פעילות!</string>
-    <string name="feature_offered_item_with_param">הוצע %s: %2s</string>
-    <string name="marked_deleted_description">מסומן כנמחק</string>
-    <string name="moderated_description">מנוהל</string>
-    <string name="settings_notifications_mode_title">שירות התראות</string>
-    <string name="settings_notification_preview_title">תצוגה מקדימה של התראות</string>
-    <string name="notification_preview_mode_message">טקסט הודעה</string>
-    <string name="message_delivery_error_title">שגיאת מסירת הודעה</string>
-    <string name="moderate_verb">נהל</string>
-    <string name="delete_message_cannot_be_undone_warning">ההודעה תימחק – לא ניתן לבטל זאת!</string>
-    <string name="delete_message_mark_deleted_warning">ההודעה תסומן למחיקה. הנמענים יוכלו לחשוף הודעה זו.</string>
-    <string name="mobile_tap_open_in_mobile_app_then_tap_connect_in_app">📱 נייד: הקישו <b>פתח באפליקציה</b>, ואז הקישו <b>התחבר</b> באפליקציה.</string>
-    <string name="only_stored_on_members_devices">(מאוחסן רק על ידי חברי הקבוצה)</string>
-    <string name="mute_chat">השתק</string>
-    <string name="icon_descr_more_button">עוד</string>
-    <string name="mark_code_verified">סמן מאומת</string>
-    <string name="network_use_onion_hosts_no">לא</string>
-    <string name="network_use_onion_hosts_prefer_desc">ייעשה שימוש במארחי Onion כאשר יהיו זמינים.</string>
-    <string name="network_use_onion_hosts_required_desc">מארחי Onion יידרשו לחיבור.</string>
-    <string name="network_use_onion_hosts_no_desc">לא ייעשה שימוש במארחי Onion.</string>
-    <string name="network_use_onion_hosts_no_desc_in_alert">לא ייעשה שימוש במארחי Onion.</string>
-    <string name="callstatus_missed">שיחה שלא נענתה</string>
-    <string name="only_client_devices_store_contacts_groups_e2e_encrypted_messages">רק מכשירי לקוח מאחסנים פרופילי משתמש, אנשי קשר, קבוצות, והודעות שנשלחו עם <b>הצפנה מקצה־לקצה דו־שכבתית</b>.</string>
-    <string name="status_no_e2e_encryption">ללא הצפנה מקצה־לקצה</string>
-    <string name="icon_descr_call_missed">שיחה שלא נענתה</string>
-    <string name="new_passcode">קוד גישה חדש</string>
-    <string name="settings_section_title_messages">הודעות וקבצים</string>
-    <string name="old_database_archive">ארכיון מסד נתונים ישן</string>
-    <string name="chat_item_ttl_none">לעולם לא</string>
-    <string name="no_received_app_files">לא התקבלו או נשלחו קבצים</string>
-    <string name="new_member_role">תפקיד חבר קבוצה</string>
-    <string name="no_contacts_selected">לא נבחרו אנשי קשר</string>
-    <string name="member_info_section_title_member">חבר קבוצה</string>
-    <string name="member_will_be_removed_from_group_cannot_be_undone">חבר הקבוצה יוסר מהקבוצה – לא ניתן לבטל זאת!</string>
-    <string name="user_mute">השתק</string>
-    <string name="color_surface">תפריטים והתראות</string>
-    <string name="feature_off">כבוי</string>
-    <string name="v4_3_voice_messages_desc">מקסימום 40 שניות, מתקבל מיידית.</string>
-    <string name="feature_offered_item">הוצע %s</string>
-    <string name="both_you_and_your_contact_can_add_message_reactions">גם אתם וגם איש הקשר יכולים להוסיף תגובות אמוג׳י להודעות.</string>
-    <string name="message_reactions">תגובות אמוג׳י להודעות</string>
-    <string name="allow_message_reactions">אפשר תגובות אמוג׳י להודעות.</string>
-    <string name="message_reactions_prohibited_in_this_chat">תגובות אמוג׳י להודעות אסורות בצ׳אט זה.</string>
-    <string name="message_reactions_are_prohibited">תגובות אמוג׳י להודעות אסורות בקבוצה זו.</string>
-    <string name="allow_your_contacts_adding_message_reactions">אפשר לאנשי הקשר להוסיף תגובות אמוג׳י להודעות.</string>
-    <string name="allow_message_reactions_only_if">אפשר תגובות אמוג׳י להודעות רק אם איש הקשר מאפשר אותן.</string>
-    <string name="group_members_can_add_message_reactions">חברי הקבוצה יכולים להוסיף תגובות אמוג׳י להודעות.</string>
-    <string name="only_you_can_add_message_reactions">רק אתם יכולים להוסיף תגובות אמוג׳י להודעות.</string>
-    <string name="only_your_contact_can_add_message_reactions">רק איש הקשר שלכם יכול להוסיף תגובות אמוג׳י להודעות.</string>
-    <string name="open_verb">פתח</string>
-    <string name="prohibit_message_reactions">לאסור תגובות אמוג׳י להודעות.</string>
-    <string name="send_disappearing_message_1_minute">דקה</string>
-    <string name="send_disappearing_message_30_seconds">30 שניות</string>
-    <string name="send_disappearing_message_5_minutes">5 דקות</string>
-    <string name="send_disappearing_message_custom_time">זמן מותאם אישית</string>
-    <string name="disappearing_message">הודעה נעלמת</string>
-    <string name="toast_permission_denied">ההרשאה נדחתה!</string>
-    <string name="image_descr_profile_image">תמונת פרופיל</string>
-    <string name="profile_update_will_be_sent_to_contacts">עדכון הפרופיל יישלח לאנשי הקשר שלך.</string>
-    <string name="open_simplex_chat_to_accept_call">פיתחו את <xliff:g id="appNameFull">Simplex Chat</xliff:g> כדי לענות לשיחה.</string>
-    <string name="v4_5_message_draft_descr">שמירת טיוטת ההודעה האחרונה, עם קבצים מצורפים.</string>
-    <string name="prohibit_message_reactions_group">לאסור תגובות אמוג׳י להודעות.</string>
-    <string name="v4_5_private_filenames">שמות קבצים פרטיים</string>
-    <string name="custom_time_unit_hours">שעות</string>
-    <string name="custom_time_unit_minutes">דקות</string>
-    <string name="custom_time_unit_days">ימים</string>
-    <string name="custom_time_unit_months">חודשים</string>
-    <string name="restore_passphrase_not_found_desc">סיסמת מסד הנתונים לא נמצאה ב־Keystore, יש להזין אותה ידנית. זה יכול לקרות אם נתוני האפליקציה שוחזרו על ידי כלי גיבוי. אם זה לא המקרה, אנא, תיצרו קשר עם המפתחים.</string>
-    <string name="contact_developers">אנא עדכנו את האפליקציה וצרו קשר עם המפתחים.</string>
-    <string name="please_check_correct_link_and_maybe_ask_for_a_new_one">אנא ודאו שהשתמשתם בקישור הנכון או בקשו מאיש הקשר שלכם לשלוח קישור נוסף.</string>
-    <string name="periodic_notifications">התראות תקופתיות</string>
-    <string name="enter_passphrase_notification_title">נדרשת סיסמה</string>
-    <string name="la_lock_mode_passcode">הזנת קוד גישה</string>
-    <string name="paste_button">הדבק</string>
-    <string name="port_verb">פורט</string>
-    <string name="network_proxy_port">פורט %d</string>
-    <string name="privacy_and_security">פרטיות ואבטחה</string>
-    <string name="passcode_set">קוד גישה הוגדר!</string>
-    <string name="passcode_not_changed">קוד גישה לא השתנה!</string>
-    <string name="passcode_changed">קוד גישה השתנה!</string>
-    <string name="network_option_ping_count">ספירת PING</string>
-    <string name="prohibit_sending_disappearing_messages">לאסור שליחת הודעות נעלמות.</string>
-    <string name="prohibit_calls">לאסור שיחות שמע/וידאו.</string>
-    <string name="enter_correct_current_passphrase">נא להזין את הסיסמה הנכונה הנוכחית.</string>
-    <string name="periodic_notifications_disabled">התראות תקופתיות מושבתות!</string>
-    <string name="network_option_ping_interval">מרווח PING</string>
-    <string name="la_please_remember_to_store_password">אנא זיכרו או שימרו את הסיסמה בצורה מאובטחת – אין דרך לשחזר סיסמה אבודה!</string>
-    <string name="observer_cant_send_message_desc">אנא צרו קשר עם מנהל הקבוצה.</string>
-    <string name="ask_your_contact_to_enable_voice">אנא בקשו מאיש הקשר שלכם לאפשר שליחת הודעות קוליות.</string>
-    <string name="icon_descr_profile_image_placeholder">שומר מקום לתמונת פרופיל</string>
-    <string name="smp_servers_preset_server">שרת מוגדר מראש</string>
-    <string name="privacy_redefined">פרטיות מוגדרת מחדש</string>
-    <string name="people_can_connect_only_via_links_you_share">אנשים יכולים להתחבר אליכם רק דרך הקישורים שאתם משתפים.</string>
-    <string name="opensource_protocol_and_code_anybody_can_run_servers">פרוטוקול וקוד פתוחים – כל אחד יכול להריץ את השרתים.</string>
-    <string name="onboarding_notifications_mode_periodic">תקופתי</string>
-    <string name="restore_database_alert_desc">נא להזין את הסיסמה הקודמת לאחר שחזור גיבוי מסד הנתונים, לא ניתן לבטל פעולה זו.</string>
-    <string name="prohibit_message_deletion">לאסור מחיקה בלתי הפיכה של הודעות.</string>
-    <string name="opening_database">פותח מסד נתונים…</string>
-    <string name="simplex_link_mode_browser_warning">פתיחת הקישור בדפדפן עלולה להפחית את פרטיות ואבטחת החיבור. קישורי SimpleX לא מהימנים יהיו אדומים.</string>
-    <string name="network_error_desc">אנא בידקו את חיבור האינטרנט שלכם עם <xliff:g id="serverHost" example="smp.simplex.im">%1$s</xliff:g> ונסו שוב.</string>
-    <string name="error_smp_test_certificate">ייתכן שטביעת האצבע של התעודה בכתובת השרת שגויה</string>
-    <string name="auth_open_chat_console">פתיחת מסוף צ׳אט</string>
-    <string name="auth_open_chat_profiles">פתיחת פרופילי צ׳אט</string>
-    <string name="icon_descr_server_status_pending">ממתין</string>
-    <string name="paste_connection_link_below_to_connect">הדביקו את הקישור שקיבלתם בתיבה למטה כדי להתחבר לאיש הקשר שלכם.</string>
-    <string name="smp_servers_preset_address">כתובת שרת מוגדר מראש</string>
-    <string name="password_to_show">סיסמה להצגה</string>
-    <string name="onboarding_notifications_mode_title">התראות פרטיות</string>
-    <string name="paste_the_link_you_received">הדבק קישור שהתקבל</string>
-    <string name="call_connection_peer_to_peer">עמית־לעמית</string>
-    <string name="icon_descr_call_pending_sent">שיחה ממתינה</string>
-    <string name="alert_text_fragment_please_report_to_developers">אנא דווחו על כך למפתחים.</string>
-    <string name="la_mode_passcode">קוד גישה</string>
-    <string name="store_passphrase_securely_without_recover">אנא שימרו את הסיסמה בצורה מאובטחת, לא תוכלו לגשת לצ׳אט אם תאבדו אותה.</string>
-    <string name="store_passphrase_securely">אנא שימרו את הסיסמה בצורה מאובטחת, לא תוכלו לשנות אותה אם תאבדו אותה.</string>
-    <string name="open_chat">פתח צ׳אט</string>
-    <string name="group_member_role_owner">בעלים</string>
-    <string name="group_welcome_preview">תצוגה מקדימה</string>
-    <string name="users_delete_with_connections">פרופיל וחיבורי שרתים</string>
-    <string name="profile_password">סיסמת פרופיל</string>
-    <string name="prohibit_direct_messages">לאסור שליחת הודעות ישירות לחברי הקבוצה.</string>
-    <string name="v5_0_polish_interface">ממשק פולנית</string>
-    <string name="v4_6_hidden_chat_profiles_descr">הגנו על פרופילי הצ׳אט שלכם באמצעות סיסמה!</string>
-    <string name="protect_app_screen">הגנה על מסך האפליקציה</string>
-    <string name="prohibit_sending_voice">לאסור שליחת הודעות קוליות.</string>
-    <string name="prohibit_sending_voice_messages">לאסור שליחת הודעות קוליות.</string>
-    <string name="prohibit_sending_disappearing">לאסור שליחת הודעות נעלמות.</string>
-    <string name="receiving_files_not_yet_supported">קבלת קבצים אינה נתמכת עדיין</string>
-    <string name="image_descr_qr_code">קוד QR</string>
-    <string name="callstatus_rejected">שיחה נדחתה</string>
-    <string name="callstate_received_answer">התקבלה תשובה…</string>
-    <string name="callstate_received_confirmation">התקבל אישור…</string>
-    <string name="reject">דחיה</string>
-    <string name="remove_passphrase">הסר</string>
-    <string name="receiving_via">מקבל באמצעות</string>
-    <string name="network_option_protocol_timeout">תום זמן הפרוטוקול</string>
-    <string name="rcv_group_event_member_deleted"><xliff:g id="member profile" example="alice (Alice)">%1$s</xliff:g> הוסר/ה</string>
-    <string name="color_received_message">הודעה שהתקבלה</string>
-    <string name="v4_4_live_messages_desc">נמענים רואים הודעות תוך כדי הקלדתן.</string>
-    <string name="v4_5_reduced_battery_usage">שימוש מופחת בסוללה</string>
-    <string name="custom_time_picker_custom">מותאם אישית</string>
-    <string name="simplex_service_notification_text">מקבל הודעות…</string>
-    <string name="stop_rcv_file__message">קבלת הקובץ תופסק.</string>
-    <string name="icon_descr_record_voice_message">הקלט הודעה קולית</string>
-    <string name="reject_contact_button">דחיה</string>
-    <string name="read_more_in_user_guide_with_link">קראו עוד ב<font color="#0088ff">מדריך למשתמש</font>.</string>
-    <string name="rate_the_app">דרגו את האפליקציה</string>
-    <string name="read_more_in_github">קראו עוד ב־GitHub repository שלנו.</string>
-    <string name="read_more_in_github_with_link">קראו עוד ב־<font color="#0088ff">GitHub repository</font> שלנו.</string>
-    <string name="relay_server_if_necessary">יבוצע שימוש בשרת ממסר רק במידת הצורך. גורם אחר יכול לצפות בכתובת ה־IP שלך.</string>
-    <string name="relay_server_protects_ip">שרת ממסר מגן על כתובת ה־IP שלך, אך הוא יכול לראות את משך השיחה.</string>
-    <string name="icon_descr_call_rejected">שיחה נדחתה</string>
-    <string name="rcv_group_event_user_deleted">הסירו אותך</string>
-    <string name="group_member_status_removed">הוסר</string>
-    <string name="button_remove_member">הסר חבר קבוצה</string>
-    <string name="remove_member_confirmation">הסר</string>
-    <string name="feature_received_prohibited">התקבל, לא מאופשר</string>
-    <string name="enabled_self_destruct_passcode">יצירת קוד גישה להשמדה עצמית</string>
-    <string name="change_self_destruct_mode">שינוי מצב השמדה עצמית</string>
-    <string name="change_self_destruct_passcode">שנה קוד גישה להשמדה עצמית</string>
-    <string name="share_text_database_id">מזהה מסד נתונים: %d</string>
-    <string name="share_text_deleted_at">נמחק ב: %s</string>
-    <string name="share_text_disappears_at">ייעלם ב: %s</string>
-    <string name="v5_1_self_destruct_passcode_descr">כל הנתונים נמחקים בהזנת הקוד.</string>
-    <string name="v5_1_better_messages">הודעות משופרות</string>
-    <string name="v5_1_custom_themes_descr">התאימו אישית ושתפו ערכות צבעים.</string>
-    <string name="v5_1_custom_themes">ערכות צבעים מותאמות אישית</string>
-    <string name="item_info_current">(נוכחי)</string>
-    <string name="info_row_deleted_at">נמחק</string>
-    <string name="info_row_disappears_at">ייעלם</string>
-</resources>

apps/android/app/src/main/res/values-ja/strings.xml

@@ -11,9 +11,9 @@
     <string name="about_simplex">SimpleXについて</string>
     <string name="a_plus_b">a + b</string>
     <string name="about_simplex_chat"><xliff:g id="appNameFull">SimpleX Chat</xliff:g>について</string>
-    <string name="color_primary">アクセントカラー</string>
+    <string name="color_primary">アクセント色</string>
     <string name="accept_contact_button">承諾</string>
-    <string name="accept_connection_request__question">接続リクエストを承認しますか？</string>
+    <string name="accept_connection_request__question">繋がりを承諾しますか？</string>
     <string name="accept">承諾</string>
     <string name="accept_feature">承諾</string>
     <string name="accept_call_on_lock_screen">承諾</string>
@@ -22,7 +22,7 @@
     <string name="smp_servers_add_to_another_device">別の端末に追加</string>
     <string name="users_add">プロフィールを追加</string>
     <string name="smp_servers_add">サーバを追加…</string>
-    <string name="network_enable_socks_info">SOCKSプロキシ(ポート%d)経由で接続しますか？(※設定する前にプロキシ起動が必要※)</string>
+    <string name="network_enable_socks_info">SOCKSプロキシ(ポート9050)経由で接続しますか？(※設定する前にプロキシ起動が必要※)</string>
     <string name="users_delete_all_chats_deleted">全チャットとメッセージが削除されます(※元に戻せません※)！</string>
     <string name="allow_your_contacts_to_send_voice_messages">送信相手からの音声メッセージを許可する。</string>
     <string name="both_you_and_your_contact_can_send_voice">あなたと連絡相手が音声メッセージを送信できます。</string>
@@ -31,6 +31,8 @@
     <string name="attach">添付する</string>
     <string name="app_version_code">アプリ・ビルド番号： %s</string>
     <string name="all_your_contacts_will_remain_connected">あなたの連絡先が繋がったまま継続します。</string>
+    <string name="accept_requests">リクエストを承諾</string>
+    <string name="accept_automatically">自動的に</string>
     <string name="icon_descr_audio_on">音声オン</string>
     <string name="integrity_msg_bad_hash">メッセージのハッシュ値問題</string>
     <string name="integrity_msg_bad_id">メッセージIDの問題</string>
@@ -77,7 +79,7 @@
     <string name="notifications_mode_service_desc">バックグラウンド機能が常にオンで、メッセージが到着次第に通知が出ます。</string>
     <string name="add_new_contact_to_create_one_time_QR_code"><b>新しい連絡先を追加</b>：使い捨てのQRコードを発行</string>
     <string name="turning_off_service_and_periodic">電池省エネをオンに、バックグラウンド機能と定期的な受信依頼をオフにします。設定メニューにて変更できます。</string>
-    <string name="onboarding_notifications_mode_off_desc"><b>電池消費が最少</b>：アプリがアクティブ時のみに通知が出ます（バックグラウンドサービス無し）。</string>
+    <string name="onboarding_notifications_mode_off_desc"><b>電池消費が最少</b>：アプリがアクティブ時のみに通知が出ます。</string>
     <string name="it_can_disabled_via_settings_notifications_still_shown"><b>設定メニューにてオフにできます。</b> アプリがアクティブ時に通知が出ます。</string>
     <string name="both_you_and_your_contacts_can_delete">あなたと連絡相手が送信済みメッセージを永久削除できます。</string>
     <string name="scan_QR_code_to_connect_to_contact_who_shows_QR_code"><b>QRコードを読み込み</b>：連絡相手のQRコードをスキャンすると繋がります。</string>
@@ -188,7 +190,7 @@
     <string name="icon_descr_close_button">閉じるボタン</string>
     <string name="clear_verification">検証を消す</string>
     <string name="image_saved">画像をギャラリーに保存しました。</string>
-    <string name="choose_file">ファイル</string>
+    <string name="choose_file">ファイルを選ぶ</string>
     <string name="clear_chat_menu_action">消す</string>
     <string name="image_will_be_received_when_contact_is_online">連絡先がオンラインになったら受信されます。しばらくお待ちください。</string>
     <string name="v4_4_verify_connection_security_desc">連絡先とセキュリティコードを確認</string>
@@ -225,6 +227,7 @@
     <string name="contact_preferences">連絡先の設定</string>
     <string name="status_contact_has_no_e2e_encryption">連絡先はエンドツーエンド暗号化がありません。</string>
     <string name="alert_title_contact_connection_pending">連絡先がまだ繋がってません！</string>
+    <string name="contact_requests">連絡先のリクエスト</string>
     <string name="icon_descr_context">追加情報アイコン</string>
     <string name="network_use_onion_hosts_prefer_desc">オニオンのホストが利用可能時に使われます。</string>
     <string name="network_use_onion_hosts_no_desc">オニオンのホストが使われません。</string>
@@ -239,7 +242,7 @@
     <string name="only_your_contact_can_delete">メッセージを完全削除できるのはあなたの連絡相手だけです (あなたは削除対象とすることができます)。</string>
     <string name="open_chat">チャットを開く</string>
     <string name="only_your_contact_can_send_voice">音声メッセージを送れるのはあなたの連絡相手だけです。</string>
-    <string name="database_encryption_will_be_updated">データベース暗号化のパスフレーズが更新され、キーストア (暗証キー保管庫)に保存されます。</string>
+    <string name="database_encryption_will_be_updated">データベース暗号化の暗号フレーズが更新され、キーストア (暗証キー保管庫)に保存されます。</string>
     <string name="database_error">データベースエラー</string>
     <string name="set_password_to_export_desc">データベースはランダムな暗証フレーズで暗号化済みです。エキスポートする前に更新してください。</string>
     <string name="passphrase_is_different">データベース暗証フレーズはキーストア (暗証キー保管庫) に保存された暗証フレーズと異なります。</string>
@@ -356,7 +359,7 @@
     <string name="settings_section_title_chats">チャット</string>
     <string name="settings_developer_tools">開発ツール</string>
     <string name="settings_experimental_features">β機能</string>
-    <string name="settings_section_title_messages">メッセージとファイル</string>
+    <string name="settings_section_title_messages">メッセージ</string>
     <string name="settings_section_title_calls">通話</string>
     <string name="chat_is_running">チャットは稼働中</string>
     <string name="chat_is_stopped">チャットが停止してます。</string>
@@ -372,15 +375,15 @@
     <string name="encrypt_database">暗号化する</string>
     <string name="remove_passphrase">削除</string>
     <string name="current_passphrase">現在の暗証フレーズ</string>
-    <string name="encrypted_with_random_passphrase">データベースはランダムなパスフレーズで暗号化済みで、変更可能です。</string>
+    <string name="encrypted_with_random_passphrase">データベースはランダムな暗証フレーズで暗号化済みで、変更可能です。</string>
     <string name="change_database_passphrase_question">データベースの暗証フレーズを更新しますか？</string>
     <string name="database_will_be_encrypted">データベースが暗号化されます。</string>
-    <string name="database_will_be_encrypted_and_passphrase_stored">データベースが暗号化され、パスフレーズがキーストア (暗証キー保管庫) にほぞんされます。</string>
+    <string name="database_will_be_encrypted_and_passphrase_stored">データベースが暗号化され、暗証フレーズがキーストア (暗証キー保管庫) にほぞんされます。</string>
     <string name="cannot_access_keychain">キーストア (暗証キーの保管庫) にアクセスできないため、データベースのパスワードが保存できません。</string>
-    <string name="database_passphrase_will_be_updated">データベース暗号化のパスフレーズが更新されます。</string>
+    <string name="database_passphrase_will_be_updated">データベース暗号化の暗号フレーズが更新されます。</string>
     <string name="database_passphrase_is_required">チャットを開くにはデータベース暗証フレーズが必要です。</string>
     <string name="file_with_path">ファイル： %s</string>
-    <string name="archive_created_on_ts">作成日時 <xliff:g id="archive_ts">%1$s</xliff:g></string>
+    <string name="archive_created_on_ts">作成日時 \u0020<xliff:g id="archive_ts">%1$s</xliff:g></string>
     <string name="delete_archive">アーカイブを削除</string>
     <string name="join_group_button">参加</string>
     <string name="join_group_question">グループに参加しますか？</string>
@@ -397,7 +400,7 @@
     <string name="group_member_status_connected">接続中</string>
     <string name="group_member_status_announced">接続待ち (アナウンス済み)</string>
     <string name="icon_descr_contact_checked">連絡先が確認済み</string>
-    <string name="delete_group_question">グループを削除しますか？</string>
+    <string name="delete_group_question">グループを削除をしますか？</string>
     <string name="delete_link">リンクを削除</string>
     <string name="group_member_status_group_deleted">グループ削除済み</string>
     <string name="delete_group_for_all_members_cannot_undo_warning">全員にとってグループが削除されます (※元に戻せません※)！</string>
@@ -464,7 +467,7 @@
     <string name="remove_passphrase_from_keychain">キーストア (暗証キー保管庫) を削除しますか？</string>
     <string name="database_encrypted">データベースは暗号化済み！</string>
     <string name="error_encrypting_database">データベース暗号化ににエラー発生</string>
-    <string name="confirm_new_passphrase">新しいパスフレーズを確認…</string>
+    <string name="confirm_new_passphrase">新しい暗証フレーズを確認…</string>
     <string name="encrypt_database_question">データベースを暗号化しますか？</string>
     <string name="store_passphrase_securely_without_recover">暗証フレーズを失くさないように保管してください。失くすとチャットにアクセスできなくなります。</string>
     <string name="enter_correct_passphrase">正しい暗証フレーズを入力</string>
@@ -556,10 +559,12 @@
     <string name="reject">拒否</string>
     <string name="call_connection_peer_to_peer">P2P</string>
     <string name="privacy_and_security">プライバシーとセキュリティ</string>
-    <string name="alert_text_skipped_messages_it_can_happen_when">次の場合に起こる場合があります：
-\n① メッセージの有効期限（送信側のクライアントでは2日後、サーバーでは30日後）が切れた
-\n②あなたや 連絡相手が古いデータベースのバックアップを使用したため、メッセージの復号化に失敗した
-\n③ 接続に問題があった</string>
+    <string name="alert_text_skipped_messages_it_can_happen_when">次の場合に起こりうる：
+\n① メッセージが受信せずにサーバに溜まって30日が経つ場合
+\n② 連絡相手からメッセージが送信中に、ご利用の受信サーバが更新・再起動する場合
+\n③ 接続が不安定の場合
+\nサーバの更新情報をご希望でしたら、設定にて開発者とお繋ぎください。
+\nメッセージの喪失を防ぐために、サーバ冗長性を向上してまいります。</string>
     <string name="settings_section_title_device">端末</string>
     <string name="no_received_app_files">送受信済みのファイルがありません</string>
     <string name="delete_messages">メッセージを削除</string>
@@ -637,7 +642,7 @@
     <string name="new_member_role">新しいメンバー役割</string>
     <string name="no_contacts_to_add">追加できる連絡先がありません</string>
     <string name="button_delete_group">グループを削除</string>
-    <string name="create_group_link">グループのリンクを生成する</string>
+    <string name="create_group_link">グループのリンクを発行する</string>
     <string name="button_edit_group_profile">グループのプロフィールを編集</string>
     <string name="delete_group_for_self_cannot_undo_warning">あなたにとってグループが削除されます (※元に戻せません※)！</string>
     <string name="button_leave_group">グループを脱退</string>
@@ -714,7 +719,7 @@
     <string name="to_share_with_your_contact">(連絡先に共有)</string>
     <string name="connect_via_link_or_qr_from_clipboard_or_in_person">(クリップボードから読み込むか、貼り付ける)</string>
     <string name="thank_you_for_installing_simplex"><xliff:g id="appNameFull">SimpleX Chat</xliff:g>をご利用いただきありがとうございます！</string>
-    <string name="use_camera_button">カメラ</string>
+    <string name="use_camera_button">カメラ起動</string>
     <string name="you_accepted_connection">繋がりを承認しました</string>
     <string name="you_invited_your_contact">連絡先に招待を送りました</string>
     <string name="connection_you_accepted_will_be_cancelled">承認ずみの接続がキャンセルされます！</string>
@@ -724,15 +729,17 @@
     <string name="this_link_is_not_a_valid_connection_link">このリンクは有効な接続リンクではありません！</string>
     <string name="this_QR_code_is_not_a_link">このQRコードはリンクではありません！</string>
     <string name="you_will_be_connected_when_group_host_device_is_online">グループのホスト端末がオンラインになったら、接続されます。後でチェックするか、しばらくお待ちください。</string>
+    <string name="show_QR_code_for_your_contact_to_scan_from_the_app__multiline">連絡相手がアプリからQRコードを読み込めます。</string>
     <string name="you_will_be_connected_when_your_contacts_device_is_online">連絡先がオンラインになったら、接続されます。後でチェックするか、しばらくお待ちください。</string>
     <string name="your_chat_profile_will_be_sent_to_your_contact">あなたのチャットプロフィールが
 \n連絡相手に送られます。</string>
-    <string name="share_invitation_link">ワンタイムリンクを送る</string>
+    <string name="share_invitation_link">招待リンクを送る</string>
     <string name="your_profile_will_be_sent">あなたのチャットプロフィールが連絡相手に送られます。</string>
     <string name="scan_code">コードを読み込む</string>
     <string name="scan_code_from_contacts_app">連絡相手のアプリからセキュリティコードを読み込む</string>
     <string name="chat_lock">SimpleXロック</string>
-    <string name="is_not_verified">%s は未検証</string>
+    <string name="is_not_verified">%s は未認証</string>
+    <string name="your_contact_address">あなたのチャットアドレス</string>
     <string name="your_settings">あなたの設定</string>
     <string name="smp_servers_test_server">テストサーバ</string>
     <string name="smp_servers_save">サーバを保存</string>
@@ -746,6 +753,7 @@
     <string name="your_ICE_servers">あなたのICEサーバ</string>
     <string name="network_disable_socks">直接にインタネットに繋がりますか？</string>
     <string name="network_enable_socks">SOCKSプロキシを使いますか？</string>
+    <string name="network_socks_toggle">SOCKSプロキシ (ポート9050) を使う</string>
     <string name="update_onion_hosts_settings_question">.onionのホスト設定を更新しますか？</string>
     <string name="network_use_onion_hosts">.onionホストを使う</string>
     <string name="network_use_onion_hosts_prefer">利用可能時に</string>
@@ -882,6 +890,8 @@
     <string name="using_simplex_chat_servers"><xliff:g id="appNameFull">SimpleX Chat</xliff:g>を使っています。</string>
     <string name="share_link">リンクを送る</string>
     <string name="core_simplexmq_version">simplexmq: バージョン%s (%2s)</string>
+    <string name="you_can_share_your_address_anybody_will_be_able_to_connect">あなたと繋がるリンク、またはQRコードを共有できます。誰でも接続できます。後で削除しても、連絡先がそのままのこります。</string>
+    <string name="section_title_welcome_message">歓迎メッセージ</string>
     <string name="callstate_waiting_for_answer">応答待ち…</string>
     <string name="callstate_waiting_for_confirmation">確認待ち…</string>
     <string name="first_platform_without_user_ids">世界初のユーザーIDのないプラットフォーム｜設計も元からプライベート</string>
@@ -906,7 +916,7 @@
     <string name="restore_database_alert_title">データベースを復元しますか？</string>
     <string name="save_and_notify_group_members">保存して、グループのメンバーにに知らせる</string>
     <string name="send_us_an_email">メールを送る</string>
-    <string name="share_image">メディア共有…</string>
+    <string name="share_image">画像共有…</string>
     <string name="simplex_link_mode">SimpleXリンク</string>
     <string name="settings_section_title_support">SIMPLEX CHATを支援</string>
     <string name="smp_servers_test_servers">テストサーバ</string>
@@ -925,12 +935,12 @@
     <string name="image_descr_simplex_logo"><xliff:g id="appName">SimpleX</xliff:g>ロゴ</string>
     <string name="you_need_to_allow_to_send_voice">音声メッセージを送るには、連絡相手からの音声メッセージを許可しなければなりません。</string>
     <string name="you_must_use_the_most_recent_version_of_database">あなたの最新データベースを1つの端末にしか使わなければ、一部の連絡先からメッセージが届きかねます。</string>
-    <string name="you_are_already_connected_to_vName_via_this_link">既に繋がってます： <xliff:g id="contactName" example="Alice">%1$s</xliff:g></string>
+    <string name="you_are_already_connected_to_vName_via_this_link">既に繋がってます： <xliff:g id="contactName" example="Alice">%1$s!</xliff:g></string>
     <string name="alert_title_cant_invite_contacts_descr">シークレットモードのプロフィールでこのグループに参加しています。メインのプロフィールを守るために、招待することができません。</string>
     <string name="description_you_shared_one_time_link">使い捨てリンクを送りました</string>
     <string name="profile_will_be_sent_to_contact_sending_link">リンクを送ってくれた連絡先にあなたのプロフィールを送ります。</string>
     <string name="your_SMP_servers">あなたのSMPサーバ</string>
-    <string name="your_simplex_contact_address">あなたのSimpleXアドレス</string>
+    <string name="your_simplex_contact_address">あなたの<xliff:g id="appName">SimpleX</xliff:g>アドレス</string>
     <string name="you_will_be_connected_when_your_connection_request_is_accepted">連絡先が繋がりリクエストを承認したら、接続されます。後でチェックするか、しばらくお待ちください。</string>
     <string name="switch_receiving_address">受信アドレスを変える</string>
     <string name="incognito_random_profile">あなたのランダム・プロフィール</string>
@@ -947,318 +957,4 @@
     <string name="select_contacts">連絡先を選択</string>
     <string name="skip_inviting_button">今はメンバーを招待しません</string>
     <string name="group_info_section_title_num_members"><xliff:g id="num_members">%1$s</xliff:g>メンバー</string>
-    <string name="xftp_servers">XFTPサーバ</string>
-    <string name="save_welcome_message_question">ウェルカムメッセージを保存しますか？</string>
-    <string name="dont_show_again">次から表示しない</string>
-    <string name="la_change_app_passcode">パスコードを変更</string>
-    <string name="la_current_app_passcode">現在のパスコード</string>
-    <string name="la_lock_mode">SimpleXロックモード</string>
-    <string name="la_lock_mode_system">システム認証</string>
-    <string name="la_lock_mode_passcode">パスコード入力</string>
-    <string name="la_auth_failed">認証失敗</string>
-    <string name="la_enter_app_passcode">パスコードを入力</string>
-    <string name="cant_delete_user_profile">ユーザープロフィールが削除できません。</string>
-    <string name="la_mode_system">システム</string>
-    <string name="change_lock_mode">ロックモードを変更</string>
-    <string name="v4_6_chinese_spanish_interface">中国語とスペイン語UI</string>
-    <string name="learn_more">さらに詳しく</string>
-    <string name="new_passcode">新しいパスコード</string>
-    <string name="lock_mode">ロックモード</string>
-    <string name="submit_passcode">送信</string>
-    <string name="passcode_changed">パスコードが変更されました</string>
-    <string name="passcode_set">パスコードを設定しました！</string>
-    <string name="passcode_not_changed">パスコードが変更されていません</string>
-    <string name="dark_theme">ダークテーマ</string>
-    <string name="gallery_image_button">画像</string>
-    <string name="learn_more_about_address">SimpleXアドレスについて</string>
-    <string name="read_more_in_user_guide_with_link"><font color="#0088ff">ユーザーガイド</font>で詳細を見る</string>
-    <string name="simplex_address">SimpleXアドレス</string>
-    <string name="network_proxy_port">ポート %d</string>
-    <string name="enter_welcome_message_optional">ウェルカムメッセージを入力…（オプション）</string>
-    <string name="save_settings_question">設定を保存しますか？</string>
-    <string name="confirm_passcode">パスコードを確認</string>
-    <string name="la_mode_passcode">パスコード</string>
-    <string name="group_welcome_preview">プレビュー</string>
-    <string name="smp_save_servers_question">サーバを保存しますか？</string>
-    <string name="incompatible_database_version">データベースのバージョンと互換性がない</string>
-    <string name="database_downgrade">データーベースダウングレード</string>
-    <string name="scan_qr_to_connect_to_contact">接続するにはQRコードを読み込むか、アプリ内のリンクを使用する必要があります。</string>
-    <string name="one_time_link_short">使い捨てのリンク</string>
-    <string name="address_section_title">アドレス</string>
-    <string name="color_background">背景色</string>
-    <string name="confirm_password">パスワードを確認</string>
-    <string name="settings_section_title_experimenta">β機能</string>
-    <string name="decryption_error">復号化エラー</string>
-    <string name="button_add_welcome_message">ウェルカムメッセージを追加</string>
-    <string name="la_authenticate">認証</string>
-    <string name="la_minutes">%d 分</string>
-    <string name="database_upgrade">データベースアップグレード</string>
-    <string name="audio_video_calls">音声/ビデオ通話</string>
-    <string name="calls_prohibited_with_this_contact">音声/ビデオ通話は禁止されています。</string>
-    <string name="feature_received_prohibited">禁帯出</string>
-    <string name="ensure_xftp_server_address_are_correct_format_and_unique">XFTPサーバーのアドレスが正しい形式で、行で区切られており、重複していないことを確認してください。</string>
-    <string name="smp_server_test_delete_file">ファイルの削除</string>
-    <string name="icon_descr_waiting_for_video">ビデオ待機中</string>
-    <string name="waiting_for_video">Waiting for video</string>
-    <string name="group_welcome_title">ウェルカムメッセージ</string>
-    <string name="host_verb">ホスト</string>
-    <string name="lock_after">自動ロックまでの時間</string>
-    <string name="opening_database">データベースを開いています…</string>
-    <string name="observer_cant_send_message_title">メッセージを送信できませんでした！</string>
-    <string name="gallery_video_button">ビデオ</string>
-    <string name="above_then_preposition_continuation">← から：</string>
-    <string name="network_socks_proxy_settings">SOCKSプロキシー設定</string>
-    <string name="your_XFTP_servers">あなたのXFTPサーバ</string>
-    <string name="add_address_to_your_profile">プロフィールにアドレスを追加し、連絡先があなたのアドレスを他の人と共有できるようにします。プロフィールの更新は連絡先に送信されます。</string>
-    <string name="auto_accept_contact">自動承認</string>
-    <string name="enable_lock">ロックモード</string>
-    <string name="enter_welcome_message">ウェルカムメッセージを入力してください…</string>
-    <string name="only_you_can_make_calls">自分からのみ通話ができます。</string>
-    <string name="video_will_be_received_when_contact_is_online">動画は相手がオンラインになったら受信されます。しばらくお待ちください。</string>
-    <string name="color_primary_variant">追加のアクセント</string>
-    <string name="customize_theme_title">カスタムテーマ</string>
-    <string name="videos_limit_desc">動画を1回で最大10個送信できます。</string>
-    <string name="videos_limit_title">動画数の上限を超えています！</string>
-    <string name="image_will_be_received_when_contact_completes_uploading">画像は相手がアップロードを完了した時点で受信するができます。</string>
-    <string name="video_descr">ビデオ</string>
-    <string name="alert_title_msg_bad_hash">メッセージのハッシュ値問題</string>
-    <string name="you_are_observer">あなたはオブザーバーです</string>
-    <string name="observer_cant_send_message_desc">グループの管理者に連絡してください。</string>
-    <string name="video_will_be_received_when_contact_completes_uploading">動画は相手がアップロードを完了した時点で受信するができます。</string>
-    <string name="disable_onion_hosts_when_not_supported">SOCKSプロキシがサポートしていない場合、<i>.onion hostを使用する</i>、は「いいえ」に設定します。</string>
-    <string name="network_socks_toggle_use_socks_proxy">SOCKSプロキシーを使用</string>
-    <string name="auth_open_chat_profiles">チャットのプロフィールを開く</string>
-    <string name="file_will_be_received_when_contact_completes_uploading">連絡先がアップロードを完了した時点で、ファイルを受信します。</string>
-    <string name="button_welcome_message">ウェルカムメッセージ</string>
-    <string name="prohibit_calls">音声/ビデオ通話を禁止する 。</string>
-    <string name="allow_your_contacts_to_call">連絡先からの通話を許可する。</string>
-    <string name="allow_calls_only_if">連絡先が通話を許可している場合のみ通話を許可する。</string>
-    <string name="available_in_v51">"
-\nv5.1 で利用可能"</string>
-    <string name="only_your_contact_can_make_calls">連絡先からのみ通話ができます。</string>
-    <string name="both_you_and_your_contact_can_make_calls">あなたからも連絡先からも通話ができます。</string>
-    <string name="language_system">システム</string>
-    <string name="error_saving_xftp_servers">XFTP サーバーの保存中にエラーが発生しました</string>
-    <string name="smp_server_test_create_file">ファイルを作成</string>
-    <string name="moderate_message_will_be_deleted_warning">メッセージはすべてのメンバーに対して削除されます。</string>
-    <string name="la_could_not_be_verified">確認できませんでした。 もう一度お試しください。</string>
-    <string name="user_mute">ミュート</string>
-    <string name="user_unmute">ミュート解除</string>
-    <string name="v4_6_audio_video_calls">音声通話とビデオ通話</string>
-    <string name="upgrade_and_open_chat">アップグレードしてチャットを開く</string>
-    <string name="delete_member_message__question">メンバーのメッセージを削除しますか？</string>
-    <string name="import_theme">テーマのインポート</string>
-    <string name="port_verb">ポート</string>
-    <string name="theme_colors_section_title">テーマカラー</string>
-    <string name="stop_sharing">共有を停止</string>
-    <string name="invite_friends">友人を招待する</string>
-    <string name="you_can_create_it_later">後からでも作成できます</string>
-    <string name="password_to_show">パスワードを表示する</string>
-    <string name="authentication_cancelled">認証がキャンセルされました</string>
-    <string name="share_address">アドレスを共有する</string>
-    <string name="theme_simplex">SimpleX</string>
-    <string name="color_title">タイトル</string>
-    <string name="v4_6_reduced_battery_usage_descr">まだまだ改善してまいります！</string>
-    <string name="show_developer_options">開発者向けオプションを表示</string>
-    <string name="v4_6_group_welcome_message_descr">新しいメンバーに表示されるメッセージを設定してください!</string>
-    <string name="lock_not_enabled">SimpleXは ロックされていません!</string>
-    <string name="smp_server_test_upload_file">ファイルをアップロードする</string>
-    <string name="smp_server_test_compare_file">ファイルを比較</string>
-    <string name="you_can_turn_on_lock">設定からSimpleXのロックをオンにすることができます。</string>
-    <string name="la_seconds">%d 秒</string>
-    <string name="database_downgrade_warning">警告: 一部のデータが失われる可能性があります!</string>
-    <string name="revoke_file__confirm">取り消す</string>
-    <string name="stop_file__confirm">停止</string>
-    <string name="stop_snd_file__title">ファイルの送信を停止しますか？</string>
-    <string name="alert_text_fragment_please_report_to_developers">開発者に報告してください。</string>
-    <string name="alert_text_fragment_permanent_error_reconnect">このエラーはこの接続では永続的なものです。再接続してください。</string>
-    <string name="v5_0_large_files_support">1GBまでのビデオとファイル</string>
-    <string name="alert_text_decryption_error_header"><xliff:g id="message count" example="1">%1$d</xliff:g> メッセージの復号化に失敗しました。</string>
-    <string name="alert_text_decryption_error_too_many_skipped"><xliff:g id="message count" example="1">%1$d</xliff:g> メッセージをスキップしました</string>
-    <string name="error_loading_smp_servers">SMP サーバーのロード中にエラーが発生しました</string>
-    <string name="error_saving_user_password">ユーザーパスワード保存エラー</string>
-    <string name="error_loading_xftp_servers">XFTP サーバーのロード中にエラーが発生しました</string>
-    <string name="export_theme">テーマのエクスポート</string>
-    <string name="revoke_file__message">ファイルはサーバーから削除されます。</string>
-    <string name="if_you_cant_meet_in_person">直接会えない場合は、ビデオ通話で QR コードを表示するか、リンクを共有してください。</string>
-    <string name="v4_6_reduced_battery_usage">バッテリー使用量をさらに削減</string>
-    <string name="la_no_app_password">アプリのパスコードがありません</string>
-    <string name="muted_when_inactive">非アクティブ時はミュート！</string>
-    <string name="continue_to_next_step">続ける</string>
-    <string name="incorrect_passcode">パスコードが正しくありません</string>
-    <string name="import_theme_error">テーマのインポートエラー</string>
-    <string name="color_surface">メニュー &amp; アラート</string>
-    <string name="confirm_database_upgrades">データベースのアップグレードを確認</string>
-    <string name="import_theme_error_desc">ファイルの YAML 構文が正しいことを確認してください。テーマをエクスポートすることでテーマ ファイル構造の例を確認できます。</string>
-    <string name="la_immediately">即座に</string>
-    <string name="alert_title_msg_bad_id">メッセージ ID が正しくありません</string>
-    <string name="database_migrations">移行: %s</string>
-    <string name="mtr_error_no_down_migration">アプリのバージョンよりも新しいデータベースが使用されていますが、データベースのバージョンダウンはできません: %s</string>
-    <string name="initial_member_role">初期の役割</string>
-    <string name="alert_text_fragment_encryption_out_of_sync_old_database">古いデータベースのバックアップを使用した場合に発生する可能性があります。</string>
-    <string name="v4_6_chinese_spanish_interface_descr">ユーザーに感謝します – Weblate 経由で貢献してください!</string>
-    <string name="v4_6_audio_video_calls_descr">Bluetooth およびその他の改善をサポートします。</string>
-    <string name="relay_server_if_necessary">中継サーバーは必要な場合にのみ使用されます。 別の当事者があなたの IP アドレスを監視できます。</string>
-    <string name="stop_sharing_address">アドレスの共有を停止しますか？</string>
-    <string name="color_sent_message">送信</string>
-    <string name="color_received_message">受信したメッセージ</string>
-    <string name="alert_text_msg_bad_hash">以前のメッセージとハッシュ値が異なります。</string>
-    <string name="alert_text_msg_bad_id">次のメッセージの ID が正しくありません (前のメッセージより小さいか等しい)。
-\n何らかのバグが原因で、または接続に問題があった場合に発生する可能性があります。</string>
-    <string name="v5_0_polish_interface_descr">ユーザーに感謝します – Weblate 経由で貢献してください!</string>
-    <string name="you_can_accept_or_reject_connection">接続が要求されたら、それを受け入れるか拒否するかを選択できます。</string>
-    <string name="your_contacts_will_see_it">SimpleX の連絡先に表示されます。
-\n設定で変更できます。</string>
-    <string name="icon_descr_video_snd_complete">ビデオが送信されました</string>
-    <string name="v4_6_group_moderation_descr">管理者は次のことができます。
-\n- メンバーのメッセージを削除します。
-\n- メンバーを無効にする (メッセージの送信不可)</string>
-    <string name="v5_0_polish_interface">ポーランド語UI</string>
-    <string name="downgrade_and_open_chat">ダウングレードしてチャットを開く</string>
-    <string name="la_please_remember_to_store_password">パスワードを覚えるか、安全に保管してください。失われたパスワードを回復する方法はありません。</string>
-    <string name="smp_server_test_download_file">ファイルをダウンロード</string>
-    <string name="no_spaces">空き容量がありません</string>
-    <string name="you_can_hide_or_mute_user_profile">ユーザープロフィールを非表示またはミュートすることができます（メニューを長押し）。</string>
-    <string name="v4_6_group_moderation">グループのモデレーション</string>
-    <string name="email_invite_body">こんにちは！
-\nSimpleX Chatの招待が届いています: %s</string>
-    <string name="v4_6_group_welcome_message">グループのウェルカムメッセージ</string>
-    <string name="tap_to_activate_profile">タップしてプロフィールを有効化する。</string>
-    <string name="profile_password">プロフィールのパスワード</string>
-    <string name="v4_6_hidden_chat_profiles_descr">チャットのプロフィールをパスワードで保護します！</string>
-    <string name="group_member_role_observer">オブザーバー</string>
-    <string name="v5_0_large_files_support_descr">送信者がオンラインになるまでの待ち時間がなく、速い！</string>
-    <string name="v5_0_app_passcode">アプリのパスコード</string>
-    <string name="v5_0_app_passcode_descr">システム認証の代わりに設定します。</string>
-    <string name="should_be_at_least_one_visible_profile">少なくとも1つのユーザープロフィールが表示されている必要があります。</string>
-    <string name="should_be_at_least_one_profile">少なくとも1つのユーザープロファイルが必要です。</string>
-    <string name="make_profile_private">プロフィールを非表示にできます！</string>
-    <string name="relay_server_protects_ip">リレー サーバーは IP アドレスを保護しますが、通話時間は監視されます。</string>
-    <string name="share_address_with_contacts_question">アドレスを連絡先と共有しますか\?</string>
-    <string name="icon_descr_call_pending_sent">保留中の通話</string>
-    <string name="invalid_migration_confirmation">データ移行の確認が正しくない</string>
-    <string name="feature_offered_item">%s を提供しました</string>
-    <string name="callstate_received_confirmation">確認を受け取りました…</string>
-    <string name="feature_offered_item_with_param">提供された %s: %2s</string>
-    <string name="error_xftp_test_server_auth">アップロードにはサーバーの認証が必要です。パスワードを確認してください</string>
-    <string name="moderate_verb">モデレート</string>
-    <string name="icon_descr_video_asked_to_receive">ビデオの受信を要求されました</string>
-    <string name="moderated_item_description">モデレートされた %s</string>
-    <string name="error_updating_user_privacy">ユーザーのプライバシーの更新エラー</string>
-    <string name="moderate_message_will_be_marked_warning">メッセージはすべてのメンバーに対してモデレート済みとしてマークされます。</string>
-    <string name="hide_profile">非表示のプロフィール</string>
-    <string name="error_updating_link_for_group">グループ リンクの更新中にエラーが発生しました</string>
-    <string name="v4_6_hidden_chat_profiles">非表示のチャットプロフィール</string>
-    <string name="self_destruct">自己破壊</string>
-    <string name="self_destruct_passcode_changed">自己破壊パスコードが変更されました！</string>
-    <string name="self_destruct_passcode_enabled">自己破壊パスコードが有効になりました！</string>
-    <string name="change_self_destruct_mode">自己破壊モードの変更</string>
-    <string name="change_self_destruct_passcode">自己破壊パスコードを変更する</string>
-    <string name="enabled_self_destruct_passcode">自己破壊パスコードを有効にする</string>
-    <string name="all_app_data_will_be_cleared">すべてのアプリデータが削除されます。</string>
-    <string name="empty_chat_profile_is_created">指定された名前の空のチャット プロファイルが作成され、アプリが通常どおり開きます。</string>
-    <string name="app_passcode_replaced_with_self_destruct">アプリのパスコードは自己破壊パスコードに置き換えられます。</string>
-    <string name="if_you_enter_passcode_data_removed">アプリを開くときにこのパスコードを入力すると、アプリのすべてのデータが元に戻せないように削除されます。</string>
-    <string name="self_destruct_new_display_name">新たな表示名：</string>
-    <string name="self_destruct_passcode">自己破壊パスコード</string>
-    <string name="enable_self_destruct">自己破壊モードを有効にする</string>
-    <string name="if_you_enter_self_destruct_code">アプリを開いているときに自己破壊パスコードを入力した場合:</string>
-    <string name="set_passcode">パスコードを設定する</string>
-    <string name="you_will_still_receive_calls_and_ntfs">ミュートされたプロファイルがアクティブな場合でも、そのプロファイルからの通話や通知は引き続き受信します。</string>
-    <string name="color_secondary_variant">追加セカンダリ</string>
-    <string name="color_secondary">副次的</string>
-    <string name="mtr_error_different">アプリ/データベースの異なる移行: %s / %s</string>
-    <string name="user_hide">非表示</string>
-    <string name="user_unhide">表示にする</string>
-    <string name="hidden_profile_password">非表示のプロフィール パスワード</string>
-    <string name="show_dev_options">表示する：</string>
-    <string name="create_address_and_let_people_connect">人々があなたとつながるためのアドレスを作成します。</string>
-    <string name="error_setting_address">アドレス設定エラー</string>
-    <string name="you_can_share_your_address">アドレスをリンクまたは QR コードとして共有すると、誰でもあなたに接続できます。</string>
-    <string name="you_wont_lose_your_contacts_if_delete_address">後でアドレスを削除しても、連絡先が失われることはありません。</string>
-    <string name="your_contacts_will_remain_connected">連絡先は接続されたままになります。</string>
-    <string name="all_your_contacts_will_remain_connected_update_sent">すべての連絡先は接続されたままになります。 プロフィールの更新が連絡先に送信されます。</string>
-    <string name="create_simplex_address">SimpleX のアドレスを作成</string>
-    <string name="share_with_contacts">連絡先と共有する</string>
-    <string name="profile_update_will_be_sent_to_contacts">プロフィールの更新は連絡先に送信されます。</string>
-    <string name="dont_create_address">アドレスを作成しない</string>
-    <string name="email_invite_subject">SimpleXチャットで会話しよう</string>
-    <string name="save_auto_accept_settings">自動受け入れ設定を保存する</string>
-    <string name="save_profile_password">プロフィールのパスワードを保存する</string>
-    <string name="you_can_share_this_address_with_your_contacts">このアドレスを連絡先と共有して、%s に接続できるようにすることができます。</string>
-    <string name="save_and_update_group_profile">グループプロフィールの保存と更新</string>
-    <string name="to_reveal_profile_enter_password">非表示のプロフィールを表示するには、チャット プロフィール ページの検索フィールドに完全なパスワードを入力します。</string>
-    <string name="hide_dev_options">非表示 :</string>
-    <string name="delete_chat_profile">チャット プロフィールを削除する</string>
-    <string name="delete_profile">プロフィールの削除</string>
-    <string name="unhide_chat_profile">チャットのプロフィールを表示する</string>
-    <string name="unhide_profile">プロフィールを表示する</string>
-    <string name="developer_options">データベース ID とトランスポート分離オプション。</string>
-    <string name="revoke_file__action">ファイルを取り消す</string>
-    <string name="revoke_file__title">ファイルを取り消しますか？</string>
-    <string name="stop_snd_file__message">ファイルの送信を停止します。</string>
-    <string name="stop_file__action">ファイルを停止する</string>
-    <string name="stop_rcv_file__message">ファイルの受信を停止します。</string>
-    <string name="stop_rcv_file__title">ファイルの受信を停止しますか？</string>
-    <string name="enter_password_to_show">検索にパスワードを入力してください</string>
-    <string name="send_disappearing_message_send">送信</string>
-    <string name="allow_message_reactions">メッセージへのリアクションを許可します。</string>
-    <string name="message_reactions_prohibited_in_this_chat">このチャットではメッセージへのリアクションは禁止されています。</string>
-    <string name="only_you_can_add_message_reactions">メッセージへのリアクションを追加できるのは、あなただけです。</string>
-    <string name="only_your_contact_can_add_message_reactions">メッセージへのリアクションを追加できるのは連絡先だけです。</string>
-    <string name="prohibit_message_reactions_group">メッセージへのリアクションは禁止されています。</string>
-    <string name="custom_time_picker_select">選択</string>
-    <string name="custom_time_picker_custom">カスタム</string>
-    <string name="error_loading_details">詳細読み込みエラー</string>
-    <string name="edit_history">履歴</string>
-    <string name="info_menu">情報</string>
-    <string name="received_message">受信したメッセージ</string>
-    <string name="sent_message">送信済みメッセージ</string>
-    <string name="send_disappearing_message_custom_time">カスタム時間</string>
-    <string name="send_disappearing_message">消えるメッセージを送信</string>
-    <string name="info_row_received_at">受信</string>
-    <string name="info_row_sent_at">送信日時</string>
-    <string name="share_text_database_id">データベースID: %d</string>
-    <string name="share_text_deleted_at">削除されました: %s</string>
-    <string name="info_row_disappears_at">に消えます</string>
-    <string name="info_row_moderated_at">モデレーターによって介入済み</string>
-    <string name="share_text_received_at">受信: %s</string>
-    <string name="share_text_updated_at">レコード更新日時: %s</string>
-    <string name="share_text_sent_at">送信日時: %s</string>
-    <string name="item_info_current">（現在）</string>
-    <string name="share_text_disappears_at">%s :に消えます</string>
-    <string name="share_text_moderated_at">モデレーターによって介入済み: %s</string>
-    <string name="current_version_timestamp">%s (現在)</string>
-    <string name="both_you_and_your_contact_can_add_message_reactions">自分も相手もメッセージへのリアクションを追加できます。</string>
-    <string name="message_reactions">メッセージへのリアクション</string>
-    <string name="prohibit_message_reactions">メッセージへのリアクションは禁止されています。</string>
-    <string name="custom_time_unit_minutes">分</string>
-    <string name="custom_time_unit_seconds">秒</string>
-    <string name="custom_time_unit_days">日</string>
-    <string name="custom_time_unit_hours">時間</string>
-    <string name="custom_time_unit_months">月</string>
-    <string name="custom_time_unit_weeks">週</string>
-    <string name="send_disappearing_message_1_minute">1分</string>
-    <string name="send_disappearing_message_30_seconds">30秒</string>
-    <string name="send_disappearing_message_5_minutes">5分</string>
-    <string name="allow_message_reactions_only_if">連絡先が許可している場合にのみ、メッセージへのリアクションを許可します。</string>
-    <string name="allow_your_contacts_adding_message_reactions">連絡先がメッセージへのリアクションを追加できるようにします。</string>
-    <string name="info_row_deleted_at">削除完了</string>
-    <string name="disappearing_message">消えるメッセージ</string>
-    <string name="group_members_can_add_message_reactions">グループメンバーはメッセージへのリアクションを追加できます。</string>
-    <string name="message_reactions_are_prohibited">このグループではメッセージへのリアクションは禁止されています。</string>
-    <string name="info_row_updated_at">レコード更新日時</string>
-    <string name="v5_1_message_reactions">メッセージへのリアクション</string>
-    <string name="v5_1_self_destruct_passcode">自己破壊パスコード</string>
-    <string name="v5_1_custom_themes">カスタムテーマ</string>
-    <string name="v5_1_japanese_portuguese_interface">日本語とポルトガル語UI</string>
-    <string name="v5_1_better_messages_descr">- 最長 5 分間の音声メッセージ。
-\n- 消えるまでのカスタム時間。
-\n- 編集履歴。</string>
-    <string name="whats_new_read_more">続きを読む</string>
-    <string name="v5_1_self_destruct_passcode_descr">入力するとすべてのデータが消去されます。</string>
-    <string name="v5_1_custom_themes_descr">カラーテーマをカスタマイズして共有することができます。</string>
-    <string name="whats_new_thanks_to_users_contribute_weblate">ユーザーに感謝します – Weblate 経由で貢献してください!</string>
-    <string name="v5_1_message_reactions_descr">ついに、私たちはそれらを手に入れました! 🚀</string>
-    <string name="v5_1_better_messages">より良いメッセージ</string>
 </resources>

apps/android/app/src/main/res/values-ko/strings.xml

@@ -52,10 +52,13 @@
     <string name="network_settings">고급 네트워크 설정</string>
     <string name="network_session_mode_user">채팅 프로필</string>
     <string name="network_session_mode_entity">연결</string>
+    <string name="accept_requests">요청 수락</string>
     <string name="app_version_code">앱 빌드 : %s</string>
     <string name="appearance_settings">외관</string>
     <string name="app_version_title">앱 버전</string>
     <string name="app_version_name">앱 버전 : v%s</string>
+    <string name="accept_automatically">자동</string>
+    <string name="contact_requests">대화 상대의 요청</string>
     <string name="core_version">코어 버전 : v%s</string>
     <string name="callstatus_accepted">전화 받음</string>
     <string name="bold">굵게</string>
@@ -140,7 +143,7 @@
     <string name="accept_call_on_lock_screen">응답</string>
     <string name="accept_connection_request__question">연결 요청을 수락할까요\?</string>
     <string name="accept_feature">수락</string>
-    <string name="network_enable_socks_info">SOCKS 프록시(포트 %d)를 통해 서버에 액세스할까요\? 이 설정을 활성화하기 전에 프록시를 시작해야 해요.</string>
+    <string name="network_enable_socks_info">SOCKS 프록시(포트 9050)를 통해 서버에 액세스할까요\? 이 설정을 활성화하기 전에 프록시를 시작해야 해요.</string>
     <string name="smp_servers_add_to_another_device">다른 기기에 추가</string>
     <string name="v4_3_improved_server_configuration_desc">QR 코드 스캔으로 서버 추가</string>
     <string name="button_add_welcome_message">환영 메시지 추가</string>
@@ -667,6 +670,7 @@
     <string name="mark_unread">읽지 않음으로 표시</string>
     <string name="mute_chat">음소거</string>
     <string name="markdown_in_messages">메시지에 사용된 마크다운</string>
+    <string name="network_socks_toggle">SOCKS 프록시 사용 (포트 9050)</string>
     <string name="network_disable_socks">직접적인 인터넷 연결을 사용할까요\?</string>
     <string name="network_enable_socks">SOCKS 프록시를 사용할까요\?</string>
     <string name="network_disable_socks_info">설정하면 메시징 서버에서 내 IP 주소와 내가 연결하려는 서버를 볼 수 있어요.</string>
@@ -824,10 +828,12 @@
     <string name="send_live_message_desc">라이브 메시지 보내기 - 입력 과정을 실시간으로 상대에게 보여줘요.</string>
     <string name="send_verb">보내기</string>
     <string name="share_invitation_link">초대 링크 공유</string>
+    <string name="show_QR_code_for_your_contact_to_scan_from_the_app__multiline">연락하고자 하는 사람이 앱에서 QR 코드를 스캔할 수 있어요.</string>
     <string name="security_code">보안 코드</string>
     <string name="smp_servers_scan_qr">서버 QR코드 스캔</string>
     <string name="smp_servers_test_some_failed">일부 서버가 테스트에 통과하지 못했습니다 :</string>
     <string name="smp_servers_test_failed">서버 테스트 실패!</string>
+    <string name="section_title_welcome_message">환영 메시지</string>
     <string name="share_link">링크 공유</string>
     <string name="show_call_on_lock_screen">표시하기</string>
     <string name="select_contacts">연락처 선택</string>

apps/android/app/src/main/res/values-lt/strings.xml

@@ -12,6 +12,7 @@
     <string name="app_version_title">Programėlės versija</string>
     <string name="app_version_name">Programėlės versija: v%s</string>
     <string name="app_version_code">Programėlės darinys: %s</string>
+    <string name="accept_automatically">Automatiškai</string>
     <string name="callstatus_calling">skambinama…</string>
     <string name="callstatus_error">skambučio klaida</string>
     <string name="call_already_ended">Skambutis jau baigtas!</string>
@@ -275,9 +276,10 @@
     <string name="notification_preview_mode_contact_desc">Rodyti tik adresatą</string>
     <string name="auth_stop_chat">Stabdyti pokalbį</string>
     <string name="share_message">Bendrinti žinutę…</string>
-    <string name="use_camera_button">Kamera</string>
+    <string name="use_camera_button">Naudoti kamerą</string>
     <string name="thank_you_for_installing_simplex">Dėkojame, kad įdiegėte <xliff:g id="appNameFull">SimpleX Chat</xliff:g>!</string>
     <string name="smp_servers_use_server">Naudoti serverį</string>
+    <string name="network_socks_toggle">Naudoti SOCKS įgaliotąjį serverį (prievadas 9050)</string>
     <string name="network_enable_socks">Naudoti SOCKS įgaliotąjį serverį\?</string>
     <string name="core_simplexmq_version">simplexmq: v%s (%2s)</string>
     <string name="share_link">Bendrinti nuorodą</string>
@@ -353,179 +355,4 @@
     <string name="voice_message">Balso žinutė</string>
     <string name="icon_descr_simplex_team"><xliff:g id="appName">SimpleX</xliff:g> komanda</string>
     <string name="whats_new">Kas naujo</string>
-    <string name="save_and_notify_group_members">Įrašyti ir pranešti grupės nariams</string>
-    <string name="callstate_received_confirmation">gautas patvirtinimas…</string>
-    <string name="read_more_in_github">Išsamiau skaitykite mūsų „GitHub“ saugykloje</string>
-    <string name="icon_descr_call_missed">Praleistas skambutis</string>
-    <string name="settings_section_title_chats">POKALBIAI</string>
-    <string name="settings_section_title_themes">APIPAVIDALINIMAI</string>
-    <string name="settings_section_title_incognito">Inkognito veiksena</string>
-    <string name="settings_section_title_messages">ŽINUTĖS IR FAILAI</string>
-    <string name="restart_the_app_to_use_imported_chat_database">Norėdami naudoti importuotą pokalbio duomenų bazę, paleiskite programėlę iš naujo.</string>
-    <string name="button_add_members">Pakviesti narius</string>
-    <string name="disappearing_prohibited_in_this_chat">Išnykstančios žinutės šiame pokalbyje yra uždraustos.</string>
-    <string name="voice_messages_are_prohibited">Balso žinutės šioje grupėje yra uždraustos.</string>
-    <string name="connect_via_group_link">Prisijungti per grupės nuorodą\?</string>
-    <string name="connect_via_contact_link">Prisijungti per adresato nuorodą\?</string>
-    <string name="sending_files_not_yet_supported">failų siuntimas kol kas nepalaikomas</string>
-    <string name="invalid_message_format">neteisingas žinutės formatas</string>
-    <string name="receiving_files_not_yet_supported">failų gavimas kol kas nepalaikomas</string>
-    <string name="invalid_chat">neteisingas pokalbis</string>
-    <string name="invalid_data">neteisingi duomenys</string>
-    <string name="description_via_one_time_link_incognito">inkognito per vienkartinę nuorodą</string>
-    <string name="contact_already_exists">Adresatas jau yra</string>
-    <string name="database_initialization_error_title">Nepavyksta inicijuoti duomenų bazės</string>
-    <string name="notification_preview_mode_message">Žinutės tekstas</string>
-    <string name="notification_preview_somebody">Paslėptas adresatas:</string>
-    <string name="share_image">Bendrinti mediją…</string>
-    <string name="large_file">Didelis failas!</string>
-    <string name="voice_messages_prohibited">Balso žinutės uždraustos!</string>
-    <string name="send_verb">Siųsti</string>
-    <string name="error_loading_smp_servers">Klaida įkeliant SMP serverius</string>
-    <string name="error_saving_xftp_servers">Klaida įrašant XFTP serverius</string>
-    <string name="error_loading_xftp_servers">Klaida įkeliant XFTP serverius</string>
-    <string name="cannot_receive_file">Nepavyksta gauti failo</string>
-    <string name="smp_server_test_create_queue">Sukurti eilę</string>
-    <string name="error_smp_test_certificate">Gali būti, kad liudijimo kontrolinis kodas serverio adrese yra neteisingas</string>
-    <string name="smp_server_test_delete_file">Ištrinti failą</string>
-    <string name="image_decoding_exception_title">Dekodavimo klaida</string>
-    <string name="add_new_contact_to_create_one_time_QR_code"><b>Pridėti naują adresatą</b>: norėdami sukurti adresatui vienkartinį QR kodą.</string>
-    <string name="scan_QR_code_to_connect_to_contact_who_shows_QR_code"><b>Skenuoti QR kodą</b>: norėdami prisijungti prie adresato, kuris jums rodo QR kodą.</string>
-    <string name="clear_chat_button">Išvalyti pokalbį</string>
-    <string name="unmute_chat">Įjungti pranešimus</string>
-    <string name="invalid_QR_code">Neteisingas QR kodas</string>
-    <string name="this_QR_code_is_not_a_link">Šis QR kodas nėra nuoroda!</string>
-    <string name="connect_via_link">Prisijungti per nuorodą</string>
-    <string name="security_code">Saugumo kodas</string>
-    <string name="mark_code_verified">Žymėti kaip patvirtintą</string>
-    <string name="chat_lock">SimpleX užraktas</string>
-    <string name="saved_ICE_servers_will_be_removed">Įrašyti WebRTC ICE serveriai bus pašalinti.</string>
-    <string name="save_archive">Įrašyti archyvą</string>
-    <string name="button_send_direct_message">Siųsti tiesioginę žinutę</string>
-    <string name="button_remove_member">Šalinti narį</string>
-    <string name="group_unsupported_incognito_main_profile_sent">Inkognito veiksena čia nepalaikoma – grupės nariams bus išsiųstas jūsų pagrindinis profilis</string>
-    <string name="theme_light">Šviesus</string>
-    <string name="feature_enabled_for_you">įjungta jums</string>
-    <string name="both_you_and_your_contact_can_send_disappearing">Tiek jūs, tiek ir jūsų adresatas gali siųsti išnykstančias žinutes.</string>
-    <string name="group_members_can_send_voice">Grupės nariai gali siųsti balso žinutes.</string>
-    <string name="v4_2_security_assessment_desc">SimpleX Chat saugumo auditą atliko „Trail of Bits“.</string>
-    <string name="v4_2_security_assessment">Saugumo įvertinimas</string>
-    <string name="save_group_profile">Įrašyti grupės profilį</string>
-    <string name="both_you_and_your_contacts_can_delete">Tiek jūs, tiek ir jūsų adresatas gali negrįžtamai ištrinti išsiųstas žinutes.</string>
-    <string name="both_you_and_your_contact_can_send_voice">Tiek jūs, tiek ir jūsų adresatas gali siųsti balso žinutes.</string>
-    <string name="enter_passphrase_notification_desc">Norėdami gauti pranešimus, įveskite duomenų bazės slaptafrazę</string>
-    <string name="notification_preview_mode_contact">Adresato vardas</string>
-    <string name="la_notice_title_simplex_lock">SimpleX užraktas</string>
-    <string name="la_notice_turn_on">Įjungti</string>
-    <string name="auth_simplex_lock_turned_on">SimpleX užraktas įjungtas</string>
-    <string name="auth_enable_simplex_lock">Įjungti SimpleX užraktą</string>
-    <string name="message_delivery_error_title">Žinutės pristatymo klaida</string>
-    <string name="moderate_message_will_be_deleted_warning">Žinutė bus ištrinta visiems nariams.</string>
-    <string name="icon_descr_sent_msg_status_sent">išsiųsta</string>
-    <string name="copied">Nukopijuota į iškarpinę</string>
-    <string name="choose_file">Failas</string>
-    <string name="above_then_preposition_continuation">aukščiau, o tuomet:</string>
-    <string name="clear_chat_question">Išvalyti pokalbį\?</string>
-    <string name="mark_unread">Žymėti kaip neskaitytą</string>
-    <string name="invalid_contact_link">Neteisinga nuoroda!</string>
-    <string name="smp_servers_check_address">Patikrinkite serverio adresą ir bandykite dar kartą.</string>
-    <string name="smp_servers_invalid_address">Neteisingas serverio adresas!</string>
-    <string name="network_session_mode_user">Pokalbio profilis</string>
-    <string name="profile_is_only_shared_with_your_contacts">Profilis yra bendrinamas tik su jūsų adresatais.</string>
-    <string name="read_more_in_github_with_link">Išsamiau skaitykite mūsų <font color="#0088ff">„GitHub“ saugykloje</font>.</string>
-    <string name="settings_section_title_socks">SOCKS ĮGALIOTASIS SERVERIS</string>
-    <string name="save_passphrase_and_open_chat">Įrašyti slaptafrazę ir atverti pokalbį</string>
-    <string name="restore_database">Atkurti atsarginę duomenų bazės kopiją</string>
-    <string name="restore_database_alert_title">Atkurti atsarginę duomenų bazės kopiją\?</string>
-    <string name="group_invitation_item_description">pakvietimas į <xliff:g id="group_name">%1$s</xliff:g> grupę</string>
-    <string name="leave_group_button">Išeiti</string>
-    <string name="rcv_conn_event_switch_queue_phase_changing">keičiamas adresas…</string>
-    <string name="snd_conn_event_switch_queue_phase_changing_for_member">keičiamas %s adresas…</string>
-    <string name="snd_conn_event_switch_queue_phase_changing">keičiamas adresas…</string>
-    <string name="invite_to_group_button">Pakviesti į grupę</string>
-    <string name="clear_contacts_selection_button">Išvalyti</string>
-    <string name="button_leave_group">Išeiti iš grupės</string>
-    <string name="role_in_group">Vaidmuo</string>
-    <string name="group_is_decentralized">Grupė yra pilnai decentralizuota – ji yra matoma tik nariams.</string>
-    <string name="theme">Apipavidalinimas</string>
-    <string name="feature_enabled_for_contact">įjungta adresatui</string>
-    <string name="disappearing_messages_are_prohibited">Išnykstančios žinutės šioje grupėje yra uždraustos.</string>
-    <string name="group_members_can_send_dms">Grupės nariai gali siųsti tiesiogines žinutes.</string>
-    <string name="group_members_can_send_disappearing">Grupės nariai gali siųsti išnykstančias žinutes.</string>
-    <string name="v4_3_improved_privacy_and_security_desc">Slėpti programėlės ekraną paskiausių programėlių sąraše.</string>
-    <string name="should_be_at_least_one_profile">Turėtų būti bent vienas naudotojo profilis.</string>
-    <string name="should_be_at_least_one_visible_profile">Turėtų būti matomas bent vienas naudotojo profilis.</string>
-    <string name="chat_preferences_contact_allows">Adresatas leidžia</string>
-    <string name="voice_prohibited_in_this_chat">Balso žinutės šiame pokalbyje yra uždraustos.</string>
-    <string name="v4_4_disappearing_messages_desc">Išsiųstos žinutės bus ištrintos po nustatyto laiko.</string>
-    <string name="user_unhide">Nebeslėpti</string>
-    <string name="la_lock_mode">SimpleX užrakto veiksena</string>
-    <string name="host_verb">Serveris</string>
-    <string name="callstatus_missed">praleistas skambutis</string>
-    <string name="enable_lock">Įjungti užraktą</string>
-    <string name="restart_the_app_to_create_a_new_chat_profile">Norėdami sukurti naują pokalbio profilį, paleiskite programėlę iš naujo.</string>
-    <string name="join_group_question">Prisijungti prie grupės\?</string>
-    <string name="database_restore_error">Duomenų bazės atkūrimo klaida</string>
-    <string name="alert_message_no_group">Šios grupės daugiau nebėra.</string>
-    <string name="network_option_seconds_label">sek.</string>
-    <string name="member_role_will_be_changed_with_notification">Vaidmuo bus pakeistas į „%s“. Visiems grupėje bus pranešta.</string>
-    <string name="member_role_will_be_changed_with_invitation">Vaidmuo bus pakeistas į „%s“. Narys gaus naują pakvietimą.</string>
-    <string name="chat_preferences">Pokalbio nuostatos</string>
-    <string name="contact_preferences">Adresato nuostatos</string>
-    <string name="join_group_button">Prisijungti</string>
-    <string name="change_verb">Keisti</string>
-    <string name="conn_stats_section_title_servers">SERVERIAI</string>
-    <string name="cant_delete_user_profile">Nepavyksta ištrinti naudotojo profilio!</string>
-    <string name="clear_chat_menu_action">Išvalyti</string>
-    <string name="unhide_profile">Nebeslėpti profilio</string>
-    <string name="videos_limit_title">Per daug vaizdo įrašų!</string>
-    <string name="connect_via_link_or_qr">Prisijungti per nuorodą / QR kodą</string>
-    <string name="save_profile_password">Įrašyti profilio slaptažodį</string>
-    <string name="decryption_error">Iššifravimo klaida</string>
-    <string name="description_via_group_link_incognito">inkognito per grupės nuorodą</string>
-    <string name="smp_server_test_create_file">Sukurti failą</string>
-    <string name="lock_not_enabled">SimpleX užraktas neįjungtas!</string>
-    <string name="icon_descr_send_message">Siųsti žinutę</string>
-    <string name="alert_title_msg_bad_hash">Bloga žinutės maiša</string>
-    <string name="messages_section_title">Žinutės</string>
-    <string name="messages_section_description">Šis nustatymas yra taikomas jūsų dabartiniame pokalbio profilyje esančioms žinutėms</string>
-    <string name="incognito">Inkognito</string>
-    <string name="unhide_chat_profile">Nebeslėpti pokalbio profilio</string>
-    <string name="smp_server_test_download_file">Atsisiųsti failą</string>
-    <string name="la_immediately">Nedelsiant</string>
-    <string name="network_socks_proxy_settings">SOCKS įgaliotojo serverio nustatymai</string>
-    <string name="alert_text_msg_bad_hash">Skiriasi ankstesnės žinutės maiša.</string>
-    <string name="change_database_passphrase_question">Keisti duomenų bazės slaptafrazę\?</string>
-    <string name="network_proxy_port">prievadas %d</string>
-    <string name="stop_rcv_file__message">Failo gavimas bus sustabdytas.</string>
-    <string name="network_socks_toggle_use_socks_proxy">Naudoti SOCKS įgaliotąjį serverį</string>
-    <string name="video_descr">Vaizdo įrašas</string>
-    <string name="clear_verb">Išvalyti</string>
-    <string name="icon_descr_context">Konteksto piktograma</string>
-    <string name="revoke_file__message">Failas bus ištrintas iš serverių.</string>
-    <string name="mark_read">Žymėti kaip skaitytą</string>
-    <string name="port_verb">Prievadas</string>
-    <string name="stop_snd_file__message">Failo siuntimas bus sustabdytas.</string>
-    <string name="stop_file__confirm">Stabdyti</string>
-    <string name="stop_file__action">Stabdyti failą</string>
-    <string name="stop_rcv_file__title">Stabdyti failo gavimą\?</string>
-    <string name="stop_snd_file__title">Stabdyti failo siuntimą\?</string>
-    <string name="this_text_is_available_in_settings">Šis tekstas yra prieinamas nustatymuose</string>
-    <string name="calls_prohibited_with_this_contact">Garso/vaizdo skambučiai yra uždrausti.</string>
-    <string name="both_you_and_your_contact_can_make_calls">Tiek jūs, tiek ir jūsų adresatas gali skambinti.</string>
-    <string name="v4_5_message_draft">Žinutės juodraštis</string>
-    <string name="v4_6_hidden_chat_profiles_descr">Apsaugokite slaptažodžiu savo pokalbių profilius!</string>
-    <string name="alert_title_msg_bad_id">Blogas žinutės ID</string>
-    <string name="lock_after">Užrakinti po</string>
-    <string name="alert_title_group_invitation_expired">Pakvietimas nebegalioja!</string>
-    <string name="icon_descr_add_members">Pakviesti narius</string>
-    <string name="leave_group_question">Išeiti iš grupės\?</string>
-    <string name="unknown_database_error_with_info">Nežinoma duomenų bazės klaida: %s</string>
-    <string name="users_delete_with_connections">Profilis ir ryšiai su serveriu</string>
-    <string name="direct_messages_are_prohibited_in_chat">Tiesioginės žinutės tarp narių šioje grupėje yra uždraustos.</string>
-    <string name="audio_video_calls">Garso/vaizdo skambučiai</string>
-    <string name="available_in_v51">"
-\nPrieinama versijoje v5.1"</string>
-    <string name="gallery_video_button">Vaizdo įrašas</string>
-    <string name="v5_0_large_files_support">Vaizdo įrašai ir failai iki 1GB</string>
 </resources>

apps/android/app/src/main/res/values-nl/strings.xml

@@ -16,7 +16,7 @@
     <string name="icon_descr_asked_to_receive">Gevraagd om de afbeelding te ontvangen</string>
     <string name="change_verb">Wijziging</string>
     <string name="network_settings">Geavanceerde netwerk instellingen</string>
-    <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="network_enable_socks_info">Toegang tot de servers via SOCKS proxy op poort 9050\? 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.</string>
@@ -66,7 +66,7 @@
     <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>
     <string name="allow_voice_messages_question">Spraak berichten toestaan\?</string>
-    <string name="onboarding_notifications_mode_periodic_desc"><b>Goed voor de batterij</b>. Achtergrondservice controleert berichten elke 10 minuten. Mogelijk mist u oproepen of dringende berichten.</string>
+    <string name="onboarding_notifications_mode_periodic_desc"><b>Goed voor batterij</b>. Achtergrondservice controleert elke 10 minuten op nieuwe berichten. U kunt oproepen en dringende berichten missen.</string>
     <string name="integrity_msg_bad_hash">Onjuiste bericht hash</string>
     <string name="scan_QR_code_to_connect_to_contact_who_shows_QR_code"><b>Scan QR-code</b>: om verbinding te maken met uw contactpersoon die u de QR-code laat zien.</string>
     <string name="integrity_msg_bad_id">Onjuiste bericht ID</string>
@@ -75,6 +75,7 @@
     <string name="about_simplex">Over SimpleX</string>
     <string name="about_simplex_chat">Over <xliff:g id="appNameFull">SimpleX Chat</xliff:g></string>
     <string name="above_then_preposition_continuation">hier boven, dan:</string>
+    <string name="accept_requests">Verzoeken accepteren</string>
     <string name="users_delete_all_chats_deleted">Alle gesprekken en berichten worden verwijderd, dit kan niet ongedaan worden gemaakt!</string>
     <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 contactpersoon dit toestaat.</string>
@@ -95,17 +96,18 @@
     <string name="app_version_name">App versie: v%s</string>
     <string name="network_session_mode_user_description">Er wordt een aparte TCP-verbinding (en SOCKS-referentie) gebruikt <b> voor elk chat profiel dat je in de app hebt </b>.</string>
     <string name="audio_call_no_encryption">audio oproep (niet e2e versleuteld)</string>
+    <string name="accept_automatically">Automatisch</string>
     <string name="notifications_mode_service_desc">Achtergrondservice is altijd actief, meldingen worden weergegeven zodra de berichten beschikbaar zijn.</string>
-    <string name="add_new_contact_to_create_one_time_QR_code"><b>Nieuw contact toevoegen</b>: om een eenmalige QR-code voor uw contact te maken.</string>
+    <string name="add_new_contact_to_create_one_time_QR_code"><b>Nieuw contact toevoegen</b>: om uw eenmalige QR-code voor uw contact te maken.</string>
     <string name="icon_descr_call_ended">Oproep beëindigd</string>
     <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"><b>Het beste voor de batterij</b>. U ontvangt alleen meldingen wanneer de app wordt uitgevoerd (GEEN achtergrondservice).</string>
+    <string name="onboarding_notifications_mode_off_desc"><b>Beste voor de batterij</b>. U ontvangt alleen meldingen als de app draait, de achtergronddienst wordt NIET gebruikt.</string>
     <string name="it_can_disabled_via_settings_notifications_still_shown"><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 jij als je contactpersoon kunnen verzonden berichten onherroepelijk verwijderen.</string>
     <string name="both_you_and_your_contact_can_send_disappearing">Zowel jij als je contactpersoon kunnen verdwijnende berichten sturen.</string>
     <string name="both_you_and_your_contact_can_send_voice">Zowel jij als je contactpersoon kunnen spraak berichten verzenden.</string>
     <string name="impossible_to_recover_passphrase"><b>Let op</b>: u kunt het wachtwoord NIET herstellen of wijzigen als u het kwijt raakt.</string>
-    <string name="onboarding_notifications_mode_service_desc"><b>Gebruikt meer batterij</b>! Achtergrondservice wordt altijd uitgevoerd - meldingen worden weergegeven zodra berichten beschikbaar zijn.</string>
+    <string name="onboarding_notifications_mode_service_desc"><b>Gebruikt meer batterij</b>! Achtergrondservice is altijd actief, meldingen worden weergegeven zodra de berichten beschikbaar zijn.</string>
     <string name="icon_descr_cancel_link_preview">link voorbeeld annuleren</string>
     <string name="callstatus_ended">oproep beëindigd <xliff:g id="duration" example="01:15">%1$s</xliff:g></string>
     <string name="database_initialization_error_title">Kan de database niet initialiseren</string>
@@ -208,6 +210,7 @@
     <string name="create_one_time_link">Maak een eenmalige uitnodiging link</string>
     <string name="colored">gekleurd</string>
     <string name="callstatus_connecting">Oproep verbinden…</string>
+    <string name="contact_requests">Contact verzoeken</string>
     <string name="create_profile_button">Maak</string>
     <string name="create_profile">Maak een profiel aan</string>
     <string name="delete_address">Adres verwijderen</string>
@@ -622,8 +625,10 @@
     <string name="icon_descr_simplex_team"><xliff:g id="appName">SimpleX</xliff:g>-Team</string>
     <string name="this_QR_code_is_not_a_link">Deze QR-code is geen link!</string>
     <string name="this_link_is_not_a_valid_connection_link">Deze link is geen geldige link!</string>
-    <string name="share_invitation_link">Eenmalige link delen</string>
+    <string name="show_QR_code_for_your_contact_to_scan_from_the_app__multiline">Uw contactpersoon kan de QR-code vanuit de app scannen.</string>
+    <string name="share_invitation_link">Uitnodiging link delen</string>
     <string name="scan_code">Code scannen</string>
+    <string name="your_contact_address">Uw contact adres</string>
     <string name="your_settings">Uw instellingen</string>
     <string name="share_link">Deel link</string>
     <string name="you_control_your_chat">Jij beheert je gesprek!</string>
@@ -632,13 +637,13 @@
     <string name="you_control_servers_to_receive_your_contacts_to_send">U bepaalt via welke server(s) je de berichten <b>ontvangt</b>, uw contacten de servers die u gebruikt om ze berichten te sturen.</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="messages_section_description">Deze instelling is van toepassing op berichten in uw huidige chat profiel</string>
+    <string name="messages_section_description">Deze instelling is van toepassing op berichten in jou huidige chat profiel</string>
     <string name="save_archive">Bewaar archief</string>
     <string name="rcv_group_event_updated_group_profile">bijgewerkt groep profiel</string>
     <string name="group_member_status_removed">verwijderd</string>
     <string name="group_main_profile_sent">Uw chat profiel wordt verzonden naar de groepsleden</string>
     <string name="failed_to_create_user_duplicate_desc">Je hebt al een chat profiel met dezelfde weergave naam. Kies een andere naam.</string>
-    <string name="you_are_already_connected_to_vName_via_this_link">U bent al verbonden met <xliff:g id="contactName" example="Alice">%1$s</xliff:g>.</string>
+    <string name="you_are_already_connected_to_vName_via_this_link">U bent al verbonden met <xliff:g id="contactName" example="Alice">%1$s!</xliff:g>.</string>
     <string name="error_smp_test_failed_at_step">Test mislukt bij stap %s.</string>
     <string name="smp_server_test_secure_queue">Veilige wachtrij</string>
     <string name="database_initialization_error_desc">De database werkt niet goed. Tik voor meer informatie</string>
@@ -704,7 +709,7 @@
     <string name="you_can_also_connect_by_clicking_the_link">U kunt ook verbinding maken door op de link te klikken. Als het in de browser wordt geopend, klikt u op de knop <b> Openen in mobiele app </b>.</string>
     <string name="your_profile_will_be_sent">Uw chat profiel wordt naar uw contactpersoon verzonden</string>
     <string name="your_chat_profiles">Uw chat profielen</string>
-    <string name="your_simplex_contact_address">Uw SimpleX adres</string>
+    <string name="your_simplex_contact_address">Uw <xliff:g id="appName">SimpleX</xliff:g> contact adres</string>
     <string name="chat_with_the_founder">Stuur vragen en ideeën</string>
     <string name="send_us_an_email">Stuur ons een e-mail</string>
     <string name="chat_lock">SimpleX Vergrendelen</string>
@@ -720,8 +725,10 @@
     <string name="smp_servers_your_server_address">Uw server adres</string>
     <string name="smp_servers_your_server">Uw server</string>
     <string name="network_session_mode_transport_isolation">Transport isolation</string>
+    <string name="network_socks_toggle">SOCKS-proxy gebruiken (poort 9050)</string>
     <string name="save_preferences_question">Voorkeuren opslaan\?</string>
     <string name="save_and_notify_contact">Opslaan en Contact melden</string>
+    <string name="section_title_welcome_message">WELKOMST BERICHT</string>
     <string name="your_current_profile">Je huidige profiel</string>
     <string name="save_and_notify_contacts">Opslaan en Contacten melden</string>
     <string name="save_and_notify_group_members">Opslaan en Groepsleden melden</string>
@@ -760,7 +767,7 @@
     <string name="your_chat_database">Uw chat database</string>
     <string name="set_password_to_export">Wachtwoord instellen om te exporteren</string>
     <string name="restart_the_app_to_create_a_new_chat_profile">Start de app opnieuw om een nieuw chat profiel aan te maken.</string>
-    <string name="you_must_use_the_most_recent_version_of_database">U mag de meest recente versie van uw chat-database ALLEEN op één apparaat gebruiken, anders ontvangt u mogelijk geen berichten meer van sommige contacten.</string>
+    <string name="you_must_use_the_most_recent_version_of_database">U mag de meest recente versie van uw chat database ALLEEN op één apparaat gebruiken, anders ontvangt u mogelijk geen berichten meer van sommige contacten.</string>
     <string name="restart_the_app_to_use_imported_chat_database">Start de app opnieuw om de geïmporteerde chat database te gebruiken.</string>
     <string name="stop_chat_to_enable_database_actions">Stop de chat om database acties mogelijk te maken.</string>
     <string name="delete_files_and_media_desc">Deze actie kan niet ongedaan worden gemaakt, alle ontvangen en verzonden bestanden en media worden verwijderd. Foto\'s met een lage resolutie blijven behouden.</string>
@@ -840,7 +847,7 @@
     <string name="connected_to_server_to_receive_messages_from_contact">U bent verbonden met de server die wordt gebruikt om berichten van dit contact te ontvangen.</string>
     <string name="profile_will_be_sent_to_contact_sending_link">Je profiel wordt verzonden naar het contact van wie je deze link hebt ontvangen.</string>
     <string name="you_will_join_group">U wordt lid van de groep waar deze link naar verwijst en maakt verbinding met de groepsleden.</string>
-    <string name="notifications_mode_off">Uitvoeren bij geopende app</string>
+    <string name="notifications_mode_off">Wordt uitgevoerd wanneer de app is geopend</string>
     <string name="settings_notification_preview_mode_title">Toon voorbeeld</string>
     <string name="ntf_channel_calls">SimpleX Chat oproepen</string>
     <string name="notifications_mode_periodic">Start periodiek</string>
@@ -920,6 +927,7 @@
     <string name="use_simplex_chat_servers__question"><xliff:g id="appNameFull">SimpleX Chat</xliff:g> servers gebruiken\?</string>
     <string name="voice_messages_are_prohibited">Spraak berichten zijn verboden in deze groep.</string>
     <string name="personal_welcome">Welkom <xliff:g>%1$s</xliff:g>!</string>
+    <string name="you_can_share_your_address_anybody_will_be_able_to_connect">U kunt uw adres delen als een link of als een QR-code. Iedereen kan verbinding met u maken. U verliest uw contacten niet als u deze later verwijdert.</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 <xliff:g id="member profile" example="alice (Alice)">%1$s</xliff:g> verwijderd</string>
@@ -1090,7 +1098,7 @@
     <string name="passcode_not_changed">Toegangscode niet gewijzigd!</string>
     <string name="passcode_set">Toegangscode ingesteld!</string>
     <string name="la_mode_system">Systeem</string>
-    <string name="decryption_error">Decodering fout</string>
+    <string name="decryption_error">Decryptie fout</string>
     <string name="alert_text_msg_bad_hash">De hash van het vorige bericht is anders.</string>
     <string name="alert_text_decryption_error_too_many_skipped"><xliff:g id="message count" example="1">%1$d</xliff:g> berichten overgeslagen.</string>
     <string name="alert_text_fragment_encryption_out_of_sync_old_database">Het kan gebeuren wanneer u of uw verbinding de oude databaseback-up gebruikte.</string>
@@ -1108,7 +1116,7 @@
     <string name="revoke_file__title">Bestand intrekken\?</string>
     <string name="stop_file__confirm">Stop</string>
     <string name="stop_file__action">Bestand stoppen</string>
-    <string name="stop_rcv_file__title">Stoppen met het ontvangen van bestand\?</string>
+    <string name="stop_rcv_file__title">Stopt met het ontvangen van een bestand\?</string>
     <string name="stop_snd_file__title">Bestand verzenden stoppen\?</string>
     <string name="only_your_contact_can_make_calls">Alleen je contact kan bellen.</string>
     <string name="revoke_file__message">Het bestand wordt van de servers verwijderd.</string>
@@ -1128,136 +1136,4 @@
     <string name="v5_0_polish_interface">Poolse interface</string>
     <string name="v5_0_polish_interface_descr">Dank aan de gebruikers – draag bij via Weblate!</string>
     <string name="v5_0_large_files_support">Video\'s en bestanden tot 1 GB</string>
-    <string name="auth_open_chat_profiles">Chat profielen openen</string>
-    <string name="learn_more_about_address">Over SimpleX adres</string>
-    <string name="learn_more">Kom meer te weten</string>
-    <string name="scan_qr_to_connect_to_contact">Om verbinding te maken, kan uw contact persoon de QR-code scannen of de link in de app gebruiken.</string>
-    <string name="customize_theme_title">Thema aanpassen</string>
-    <string name="group_welcome_preview">Voorbeeld</string>
-    <string name="you_can_share_this_address_with_your_contacts">U kunt dit adres delen met uw contacten om ze verbinding te laten maken met %s.</string>
-    <string name="export_theme">Exporteer thema</string>
-    <string name="color_title">Titel</string>
-    <string name="you_can_accept_or_reject_connection">Wanneer mensen vragen om verbinding te maken, kunt u dit accepteren of weigeren.</string>
-    <string name="you_wont_lose_your_contacts_if_delete_address">U raakt uw contacten niet kwijt als u later uw adres verwijdert.</string>
-    <string name="simplex_address">SimpleX adres</string>
-    <string name="create_address_and_let_people_connect">Maak een adres aan zodat mensen contact met je kunnen opnemen.</string>
-    <string name="create_simplex_address">Maak een SimpleX adres aan</string>
-    <string name="share_with_contacts">Delen met contacten</string>
-    <string name="your_contacts_will_remain_connected">Uw contacten blijven verbonden.</string>
-    <string name="profile_update_will_be_sent_to_contacts">Profiel update wordt naar uw contacten verzonden.</string>
-    <string name="share_address_with_contacts_question">Adres delen met contacten\?</string>
-    <string name="stop_sharing">Stop met delen</string>
-    <string name="stop_sharing_address">Stop met het delen van adres\?</string>
-    <string name="invite_friends">Nodig vrienden uit</string>
-    <string name="email_invite_subject">Laten we praten in SimpleX Chat</string>
-    <string name="save_auto_accept_settings">Sla instellingen voor automatisch accepteren op</string>
-    <string name="save_settings_question">Instellingen opslaan\?</string>
-    <string name="enter_welcome_message_optional">Voer welkomst bericht in... (optioneel)</string>
-    <string name="dont_create_address">Maak geen adres aan</string>
-    <string name="email_invite_body">Hoi!
-\nMaak verbinding met mij via SimpleX Chat: %s</string>
-    <string name="you_can_create_it_later">U kan het later maken</string>
-    <string name="share_address">Adres delen</string>
-    <string name="enter_welcome_message">Welkomst bericht invoeren…</string>
-    <string name="import_theme">Thema importeren</string>
-    <string name="theme_simplex">SimpleX</string>
-    <string name="color_primary_variant">Extra accent</string>
-    <string name="color_secondary_variant">Extra secundair</string>
-    <string name="color_background">Achtergrond</string>
-    <string name="color_surface">Menu\'s &amp; waarschuwingen</string>
-    <string name="color_received_message">Ontvangen bericht</string>
-    <string name="color_sent_message">Verzonden bericht</string>
-    <string name="color_secondary">Secundair</string>
-    <string name="all_your_contacts_will_remain_connected_update_sent">Al uw contacten blijven verbonden. Profiel update wordt naar uw contacten verzonden.</string>
-    <string name="one_time_link_short">Eenmalige link</string>
-    <string name="address_section_title">Adres</string>
-    <string name="add_address_to_your_profile">Voeg een adres toe aan uw profiel, zodat uw contacten het met andere mensen kunnen delen. Profiel update wordt naar uw contacten verzonden.</string>
-    <string name="auto_accept_contact">Automatisch accepteren</string>
-    <string name="if_you_cant_meet_in_person">Als je elkaar niet persoonlijk kunt ontmoeten, laat dan de QR-code zien in een videogesprek of deel de link.</string>
-    <string name="continue_to_next_step">Doorgaan</string>
-    <string name="dark_theme">Donker thema</string>
-    <string name="error_setting_address">Fout bij het instellen van het adres</string>
-    <string name="import_theme_error">Fout bij importeren thema</string>
-    <string name="import_theme_error_desc">Zorg ervoor dat het bestand de juiste YAML-syntaxis heeft. Exporteer het thema om een voorbeeld te hebben van de themabestandsstructuur.</string>
-    <string name="opening_database">Database openen…</string>
-    <string name="read_more_in_user_guide_with_link">Lees meer in de <font color="#0088ff">Gebruikershandleiding</font>.</string>
-    <string name="theme_colors_section_title">THEMA KLEUREN</string>
-    <string name="you_can_share_your_address">U kunt uw adres delen als een link of QR-code - iedereen kan verbinding met u maken.</string>
-    <string name="your_contacts_will_see_it">Uw contacten in SimpleX zullen het zien.
-\nU kunt dit wijzigen in Instellingen.</string>
-    <string name="all_app_data_will_be_cleared">Alle app-gegevens worden verwijderd.</string>
-    <string name="empty_chat_profile_is_created">Er wordt een leeg chatprofiel met de opgegeven naam gemaakt en de app wordt zoals gewoonlijk geopend.</string>
-    <string name="enabled_self_destruct_passcode">Zelfvernietigings wachtwoord inschakelen</string>
-    <string name="self_destruct">Zelfvernietiging</string>
-    <string name="change_self_destruct_mode">Zelfvernietigings modus wijzigen</string>
-    <string name="change_self_destruct_passcode">Zelfvernietigings code wijzigen</string>
-    <string name="enable_self_destruct">Zelfvernietiging inschakelen</string>
-    <string name="self_destruct_new_display_name">Nieuwe weergavenaam:</string>
-    <string name="self_destruct_passcode">Zelfvernietigingscode</string>
-    <string name="self_destruct_passcode_changed">Zelfvernietigingscode gewijzigd!</string>
-    <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="set_passcode">Toegangscode instellen</string>
-    <string name="prohibit_message_reactions">Berichtreacties verbieden.</string>
-    <string name="only_you_can_add_message_reactions">Alleen jij kunt berichtreacties toevoegen.</string>
-    <string name="message_reactions_are_prohibited">Reacties op berichten zijn verboden in deze groep.</string>
-    <string name="prohibit_message_reactions_group">Berichten reacties verbieden.</string>
-    <string name="allow_message_reactions_only_if">Sta berichtreacties alleen toe als uw contactpersoon dit toestaat.</string>
-    <string name="allow_your_contacts_adding_message_reactions">Sta uw contactpersonen toe om berichtreacties toe te voegen.</string>
-    <string name="allow_message_reactions">Sta berichtreacties toe.</string>
-    <string name="group_members_can_add_message_reactions">Groepsleden kunnen berichtreacties toevoegen.</string>
-    <string name="both_you_and_your_contact_can_add_message_reactions">Zowel u als uw contactpersoon kunnen berichtreacties 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="only_your_contact_can_add_message_reactions">Alleen uw contactpersoon kan berichtreacties toevoegen.</string>
-    <string name="custom_time_unit_days">dagen</string>
-    <string name="custom_time_unit_hours">uren</string>
-    <string name="custom_time_unit_minutes">minuten</string>
-    <string name="custom_time_unit_months">maanden</string>
-    <string name="custom_time_unit_weeks">weken</string>
-    <string name="send_disappearing_message_send">Versturen</string>
-    <string name="send_disappearing_message_5_minutes">5 minuten</string>
-    <string name="send_disappearing_message_30_seconds">30 seconden</string>
-    <string name="send_disappearing_message">Stuur een verdwijnend bericht</string>
-    <string name="send_disappearing_message_1_minute">1 minuut</string>
-    <string name="send_disappearing_message_custom_time">Aangepaste tijd</string>
-    <string name="disappearing_message">Verdwijnend bericht</string>
-    <string name="custom_time_unit_seconds">seconden</string>
-    <string name="custom_time_picker_select">Selecteer</string>
-    <string name="custom_time_picker_custom">aangepast</string>
-    <string name="info_row_moderated_at">Gemodereerd om</string>
-    <string name="info_row_updated_at">Record bijgewerkt op</string>
-    <string name="item_info_current">(huidig)</string>
-    <string name="share_text_database_id">Database-ID: %d</string>
-    <string name="info_menu">Info</string>
-    <string name="info_row_disappears_at">Verdwijnt om</string>
-    <string name="share_text_moderated_at">Gemodereerd op: %s</string>
-    <string name="share_text_disappears_at">Verdwijnt om: %s</string>
-    <string name="current_version_timestamp">%s (huidig)</string>
-    <string name="share_text_sent_at">Verzonden op: %s</string>
-    <string name="error_loading_details">Fout bij het laden van details</string>
-    <string name="sent_message">Verzonden bericht</string>
-    <string name="info_row_deleted_at">Verwijderd om</string>
-    <string name="info_row_received_at">Ontvangen op</string>
-    <string name="info_row_sent_at">Verzonden op</string>
-    <string name="share_text_deleted_at">Verwijderd om: %s</string>
-    <string name="share_text_received_at">Ontvangen op: %s</string>
-    <string name="share_text_updated_at">Record bijgewerkt op: %s</string>
-    <string name="edit_history">Geschiedenis</string>
-    <string name="received_message">Ontvangen bericht</string>
-    <string name="whats_new_read_more">Lees meer</string>
-    <string name="v5_1_message_reactions">Reacties op berichten</string>
-    <string name="v5_1_self_destruct_passcode_descr">Alle gegevens worden bij het invoeren gewist.</string>
-    <string name="v5_1_better_messages">Betere berichten</string>
-    <string name="v5_1_custom_themes_descr">Pas kleuren thema\'s aan en deel ze.</string>
-    <string name="v5_1_custom_themes">Aangepaste thema\'s</string>
-    <string name="v5_1_message_reactions_descr">Eindelijk, we hebben ze! 🚀</string>
-    <string name="v5_1_japanese_portuguese_interface">Japanse en Portugese gebruikersinterface</string>
-    <string name="v5_1_self_destruct_passcode">Zelfvernietigingscode</string>
-    <string name="whats_new_thanks_to_users_contribute_weblate">Dank aan de gebruikers – draag bij via Weblate!</string>
-    <string name="v5_1_better_messages_descr">- spraakberichten tot 5 minuten.
-\n- aangepaste tijd om te verdwijnen.
-\n- bewerkingsgeschiedenis.</string>
 </resources>

apps/android/app/src/main/res/values-pl/strings.xml

@@ -279,7 +279,7 @@
     <string name="scan_code_from_contacts_app">Zeskanuj kod bezpieczeństwa z aplikacji Twojego kontaktu.</string>
     <string name="security_code">Kod bezpieczeństwa</string>
     <string name="icon_descr_settings">Ustawienia</string>
-    <string name="share_invitation_link">Udostępnij 1-razowy link</string>
+    <string name="share_invitation_link">Udostępnij link zaproszenia</string>
     <string name="show_QR_code">Pokaż kod QR</string>
     <string name="is_verified">%s jest zweryfikowany</string>
     <string name="this_QR_code_is_not_a_link">Ten kod QR nie jest linkiem!</string>
@@ -290,6 +290,7 @@
     <string name="your_chat_profile_will_be_sent_to_your_contact">Twój profil czatu zostanie wysłany
 \ndo Twojego kontaktu</string>
     <string name="your_profile_will_be_sent">Twój profil czatu zostanie wysłany do Twojego kontaktu</string>
+    <string name="your_contact_address">Twój adres kontaktowy</string>
     <string name="you_will_be_connected_when_group_host_device_is_online">Zostaniesz połączony do grupy, gdy urządzenie gospodarza grupy będzie online, proszę czekać lub sprawdzić później!</string>
     <string name="you_will_be_connected_when_your_contacts_device_is_online">Zostaniesz połączony, gdy urządzenie Twojego kontaktu będzie online, proszę czekać lub sprawdzić później!</string>
     <string name="smp_servers_preset_add">Dodaj gotowe serwery</string>
@@ -329,9 +330,9 @@
     <string name="your_ICE_servers">Twoje serwery ICE</string>
     <string name="smp_servers_your_server">Twój serwer</string>
     <string name="smp_servers_your_server_address">Twój adres serwera</string>
-    <string name="your_simplex_contact_address">Twój adres SimpleX</string>
+    <string name="your_simplex_contact_address">Twój adres kontaktowy <xliff:g id="appName">SimpleX</xliff:g></string>
     <string name="contribute">Przyczyń się</string>
-    <string name="network_enable_socks_info">Uzyskiwanie dostępu do serwerów przez SOCKS proxy na porcie %d\? Proxy musi zostać uruchomione przed włączeniem tej opcji.</string>
+    <string name="network_enable_socks_info">Uzyskiwać dostęp do serwerów przez SOCKS proxy na porcie 9050\? Proxy musi zostać uruchomione przed włączeniem tej opcji.</string>
     <string name="network_settings">Zaawansowane ustawienia sieci</string>
     <string name="app_version_code">Kompilacja aplikacji: %s</string>
     <string name="appearance_settings">Wygląd</string>
@@ -362,7 +363,11 @@
     <string name="network_disable_socks">Użyć bezpośredniego połączenia z Internetem\?</string>
     <string name="network_use_onion_hosts">Użyj hostów .onion</string>
     <string name="network_enable_socks">Użyć proxy SOCKS\?</string>
+    <string name="network_socks_toggle">Użyj proxy SOCKS (port 9050)</string>
+    <string name="accept_requests">Akceptuj prośby</string>
     <string name="all_your_contacts_will_remain_connected">Wszystkie Twoje kontakty pozostaną połączone.</string>
+    <string name="accept_automatically">Automatycznie</string>
+    <string name="contact_requests">Prośby kontaktu</string>
     <string name="create_address">Utwórz adres</string>
     <string name="developer_options">ID bazy danych i opcja izolacji transportu.</string>
     <string name="delete_address">Usuń adres</string>
@@ -382,6 +387,8 @@
     <string name="show_dev_options">Pokaż:</string>
     <string name="show_developer_options">Pokaż opcje dewelopera</string>
     <string name="core_simplexmq_version">simplexmq: v%s (%2s)</string>
+    <string name="section_title_welcome_message">WIADOMOŚĆ POWITALNA</string>
+    <string name="you_can_share_your_address_anybody_will_be_able_to_connect">Możesz udostępnić swój adres jako link lub jako kod QR - każdy będzie mógł się z Tobą połączyć. Nie stracisz swoich kontaktów, jeśli później go usuniesz.</string>
     <string name="your_current_profile">Twój obecny profil</string>
     <string name="confirm_password">Potwierdź hasło</string>
     <string name="create_profile">Utwórz profil</string>
@@ -1028,12 +1035,13 @@
     <string name="group_info_section_title_num_members"><xliff:g id="num_members">%1$s</xliff:g> CZŁONKÓW</string>
     <string name="simplex_service_notification_title">serwis <xliff:g id="appNameFull">SimpleX Chat</xliff:g></string>
     <string name="contact_wants_to_connect_via_call"><xliff:g id="contactName" example="Alice">%1$s</xliff:g> chce się z Tobą połączyć przez</string>
-    <string name="you_are_already_connected_to_vName_via_this_link">Jesteś już połączony z <xliff:g id="contactName" example="Alice">%1$s</xliff:g>.</string>
+    <string name="you_are_already_connected_to_vName_via_this_link">Jesteś już połączony z <xliff:g id="contactName" example="Alice">%1$s!</xliff:g>.</string>
     <string name="you_can_connect_to_simplex_chat_founder">Możesz <font color="#0088ff">połączyć się z deweloperami <xliff:g id="appNameFull">SimpleX Chat</xliff:g> aby zadać wszelkie pytania i otrzymywać aktualizacje</font>.</string>
     <string name="you_can_share_group_link_anybody_will_be_able_to_connect">Możesz udostępnić link lub kod QR - każdy będzie mógł dołączyć do grupy. Nie stracisz członków grupy, jeśli później ją usuniesz.</string>
     <string name="you_must_use_the_most_recent_version_of_database">Musisz używać najnowszej wersji bazy danych czatu TYLKO na jednym urządzeniu, w przeciwnym razie możesz przestać otrzymywać wiadomości od niektórych kontaktów.</string>
     <string name="you_can_start_chat_via_setting_or_by_restarting_the_app">Możesz rozpocząć czat poprzez Ustawienia aplikacji / Bazę danych lub poprzez ponowne uruchomienie aplikacji.</string>
     <string name="your_settings">Twoje ustawienia</string>
+    <string name="show_QR_code_for_your_contact_to_scan_from_the_app__multiline">Twój kontakt może zeskanować kod QR z aplikacji.</string>
     <string name="your_current_chat_database_will_be_deleted_and_replaced_with_the_imported_one">Twoja obecna baza danych czatu zostanie USUNIĘTA i ZASTĄPIONA zaimportowaną.
 \nTej czynności nie można cofnąć - Twój profil, kontakty, wiadomości i pliki zostaną nieodwracalnie utracone.</string>
     <string name="contact_sent_large_file">Twój kontakt wysłał plik, który jest większy niż obecnie obsługiwany maksymalny rozmiar (<xliff:g id="maxFileSize">%1$s</xliff:g>).</string>
@@ -1076,7 +1084,7 @@
     <string name="you_can_turn_on_lock">Możesz włączyć blokadę SimpleX poprzez Ustawienia.</string>
     <string name="enable_lock">Włącz blokadę</string>
     <string name="authentication_cancelled">Uwierzytelnianie anulowane</string>
-    <string name="confirm_passcode">Potwierdź pin</string>
+    <string name="confirm_passcode">Potwierdź Pin</string>
     <string name="incorrect_passcode">Nieprawidłowy pin</string>
     <string name="lock_after">Zablokuj po</string>
     <string name="lock_mode">Tryb blokady</string>
@@ -1129,136 +1137,4 @@
     <string name="v5_0_app_passcode_descr">Ustaw go zamiast uwierzytelniania systemowego.</string>
     <string name="v5_0_large_files_support_descr">Szybko i bez czekania aż nadawca będzie online!</string>
     <string name="v5_0_polish_interface_descr">Podziękowania dla użytkowników - wkład za pośrednictwem Weblate!</string>
-    <string name="change_self_destruct_mode">Zmień tryb samozniszczenia</string>
-    <string name="change_self_destruct_passcode">Zmień pin samozniszczenia</string>
-    <string name="enabled_self_destruct_passcode">Włącz pin samodestrukcji</string>
-    <string name="self_destruct">Samozniszczenie</string>
-    <string name="self_destruct_passcode_changed">Pin samozniszczenia zmieniony!</string>
-    <string name="all_app_data_will_be_cleared">Wszystkie dane aplikacji są usunięte.</string>
-    <string name="enable_self_destruct">Włącz samodestrukcję</string>
-    <string name="if_you_enter_self_destruct_code">Jeśli wpiszesz swój pin samodestrukcji podczas otwierania aplikacji:</string>
-    <string name="self_destruct_new_display_name">Nowa nazwa wyświetlana:</string>
-    <string name="empty_chat_profile_is_created">Tworzony jest pusty profil czatu o podanej nazwie, a aplikacja otwiera się jak zwykle.</string>
-    <string name="app_passcode_replaced_with_self_destruct">Pin aplikacji został zastąpiony pinem samozniszczenia.</string>
-    <string name="if_you_enter_passcode_data_removed">Jeśli wprowadzisz ten pin podczas otwierania aplikacji, wszystkie dane aplikacji zostaną nieodwracalnie usunięte!</string>
-    <string name="set_passcode">Ustaw pin</string>
-    <string name="share_address">Udostępnij adres</string>
-    <string name="you_can_share_this_address_with_your_contacts">Możesz udostępnić ten adres Twoim kontaktom, aby umożliwić im połączenie z %s.</string>
-    <string name="learn_more">Dowiedz się więcej</string>
-    <string name="stop_sharing_address">Przestać udostępniać adres\?</string>
-    <string name="auto_accept_contact">Automatycznie akceptuj</string>
-    <string name="share_address_with_contacts_question">Udostępnić adres kontaktom\?</string>
-    <string name="enter_welcome_message_optional">Wpisz wiadomość powitalną… (opcjonalne)</string>
-    <string name="profile_update_will_be_sent_to_contacts">Aktualizacja profilu zostanie wysłana do Twoich kontaktów.</string>
-    <string name="save_settings_question">Zapisać ustawienia\?</string>
-    <string name="stop_sharing">Przestań udostępniać</string>
-    <string name="continue_to_next_step">Kontynuuj</string>
-    <string name="dont_create_address">Nie twórz adresu</string>
-    <string name="email_invite_body">Cześć!
-\nPołącz się ze mną za pomocą SimpleX Chat: %s</string>
-    <string name="invite_friends">Zaproś znajomych</string>
-    <string name="email_invite_subject">Porozmawiajmy w SimpleX Chat</string>
-    <string name="group_welcome_preview">Podgląd</string>
-    <string name="opening_database">Otwieranie bazy danych…</string>
-    <string name="error_setting_address">Błąd ustawiania adresu</string>
-    <string name="auth_open_chat_profiles">Otwórz profile czatu</string>
-    <string name="learn_more_about_address">O adresie SimpleX</string>
-    <string name="one_time_link_short">1-razowy link</string>
-    <string name="read_more_in_user_guide_with_link">Przeczytaj więcej w <font color="#0088ff">Podręczniku Użytkownika</font>.</string>
-    <string name="simplex_address">Adres SimpleX</string>
-    <string name="you_can_accept_or_reject_connection">Kiedy ludzie proszą o połączenie, możesz je zaakceptować lub odrzucić.</string>
-    <string name="you_wont_lose_your_contacts_if_delete_address">Nie stracisz kontaktów, jeśli później usuniesz swój adres.</string>
-    <string name="customize_theme_title">Dostosuj motyw</string>
-    <string name="theme_colors_section_title">KOLORY MOTYWU</string>
-    <string name="your_contacts_will_remain_connected">Twoje kontakty pozostaną połączone.</string>
-    <string name="add_address_to_your_profile">Dodaj adres do swojego profilu, aby Twoje kontakty mogły go udostępnić innym osobom. Aktualizacja profilu zostanie wysłana do Twoich kontaktów.</string>
-    <string name="create_address_and_let_people_connect">Utwórz adres, aby ludzie mogli się z Tobą połączyć.</string>
-    <string name="create_simplex_address">Utwórz adres SimpleX</string>
-    <string name="save_auto_accept_settings">Zapisz ustawienia automatycznej akceptacji</string>
-    <string name="share_with_contacts">Udostępnij kontaktom</string>
-    <string name="you_can_create_it_later">Możesz go utworzyć później</string>
-    <string name="your_contacts_will_see_it">Twoje kontakty w SimpleX będą to widzieć.
-\nMożesz to zmienić w Ustawieniach.</string>
-    <string name="address_section_title">Adres</string>
-    <string name="theme_simplex">SimpleX</string>
-    <string name="color_secondary">Drugorzędny</string>
-    <string name="color_primary_variant">Dodatkowy akcent</string>
-    <string name="dark_theme">Ciemny motyw</string>
-    <string name="export_theme">Eksportuj motyw</string>
-    <string name="import_theme">Importuj motyw</string>
-    <string name="import_theme_error">Błąd importu motywu</string>
-    <string name="import_theme_error_desc">Upewnij się, że plik ma poprawną składnię YAML. Eksportuj motyw, aby mieć przykład struktury plików motywu.</string>
-    <string name="color_surface">Menu i alerty</string>
-    <string name="color_secondary_variant">Dodatkowy drugorzędny</string>
-    <string name="color_background">Tło</string>
-    <string name="color_received_message">Otrzymano wiadomość</string>
-    <string name="color_sent_message">Wyślij wiadomość</string>
-    <string name="color_title">Tytuł</string>
-    <string name="all_your_contacts_will_remain_connected_update_sent">Wszystkie Twoje kontakty pozostaną połączone. Aktualizacja profilu zostanie wysłana do Twoich kontaktów.</string>
-    <string name="enter_welcome_message">Wpisz wiadomość powitalną…</string>
-    <string name="if_you_cant_meet_in_person">Jeśli nie możesz spotkać się osobiście, pokaż kod QR w rozmowie wideo lub udostępnij link.</string>
-    <string name="you_can_share_your_address">Możesz udostępnić swój adres jako link lub kod QR - każdy może się z Tobą połączyć.</string>
-    <string name="self_destruct_passcode">Pin samozniszczenia</string>
-    <string name="self_destruct_passcode_enabled">Pin samozniszczenia włączony!</string>
-    <string name="scan_qr_to_connect_to_contact">Aby się połączyć, Twój kontakt może zeskanować kod QR lub skorzystać z linku w aplikacji.</string>
-    <string name="send_disappearing_message_custom_time">Niestandardowy czas</string>
-    <string name="custom_time_unit_days">dni</string>
-    <string name="send_disappearing_message_send">Wyślij</string>
-    <string name="send_disappearing_message">Wyślij znikającą wiadomość</string>
-    <string name="prohibit_message_reactions_group">Zabroń reakcje wiadomości.</string>
-    <string name="message_reactions">Reakcje wiadomości</string>
-    <string name="group_members_can_add_message_reactions">Członkowie grupy mogą dodawać reakcje wiadomości.</string>
-    <string name="custom_time_unit_hours">godziny</string>
-    <string name="message_reactions_prohibited_in_this_chat">Reakcje wiadomości są zabronione na tym czacie.</string>
-    <string name="message_reactions_are_prohibited">Reakcje wiadomości są zabronione w tej grupie.</string>
-    <string name="custom_time_unit_minutes">minuty</string>
-    <string name="custom_time_unit_months">miesiące</string>
-    <string name="only_you_can_add_message_reactions">Tylko Ty możesz dodawać reakcje wiadomości.</string>
-    <string name="prohibit_message_reactions">Zabroń reakcje wiadomości.</string>
-    <string name="only_your_contact_can_add_message_reactions">Tylko Twój kontakt może dodawać reakcje wiadomości.</string>
-    <string name="custom_time_unit_seconds">sekundy</string>
-    <string name="custom_time_unit_weeks">tygodnie</string>
-    <string name="send_disappearing_message_5_minutes">5 minut</string>
-    <string name="allow_message_reactions">Zezwalaj na reakcje wiadomości.</string>
-    <string name="allow_your_contacts_adding_message_reactions">Zezwalaj kontaktom na reakcje wiadomości.</string>
-    <string name="disappearing_message">Znikająca wiadomość</string>
-    <string name="send_disappearing_message_30_seconds">30 sekund</string>
-    <string name="send_disappearing_message_1_minute">1 minuta</string>
-    <string name="allow_message_reactions_only_if">Zezwalaj na reakcje wiadomości tylko wtedy, gdy zezwala na to Twój kontakt.</string>
-    <string name="both_you_and_your_contact_can_add_message_reactions">Zarówno Ty, jak i Twój kontakt możecie dodawać reakcje wiadomości.</string>
-    <string name="custom_time_picker_select">Wybierz</string>
-    <string name="custom_time_picker_custom">niestandardowy</string>
-    <string name="error_loading_details">Błąd ładowania szczegółów</string>
-    <string name="received_message">Otrzymano wiadomość</string>
-    <string name="sent_message">Wyślij wiadomość</string>
-    <string name="info_row_deleted_at">Usunięto o</string>
-    <string name="info_row_moderated_at">Moderowany o</string>
-    <string name="share_text_received_at">Otrzymane o: %s</string>
-    <string name="info_row_updated_at">Rekord zaktualizowany o</string>
-    <string name="info_row_sent_at">Wysłano o</string>
-    <string name="share_text_sent_at">Wysłano o: %s</string>
-    <string name="share_text_database_id">ID bazy danych: %d</string>
-    <string name="item_info_current">(aktualny)</string>
-    <string name="share_text_deleted_at">Usunięto o: %s</string>
-    <string name="info_row_disappears_at">Znika o</string>
-    <string name="share_text_disappears_at">Znika o: %s</string>
-    <string name="info_menu">Info</string>
-    <string name="share_text_moderated_at">Moderowany o: %s</string>
-    <string name="edit_history">Historia</string>
-    <string name="info_row_received_at">Otrzymane o</string>
-    <string name="current_version_timestamp">%s (aktualny)</string>
-    <string name="share_text_updated_at">Rekord zaktualizowany o: %s</string>
-    <string name="v5_1_self_destruct_passcode_descr">Wszystkie dane są usuwane po jego wprowadzeniu.</string>
-    <string name="whats_new_thanks_to_users_contribute_weblate">Podziękowania dla użytkowników - wkład za pośrednictwem Weblate!</string>
-    <string name="v5_1_message_reactions">Reakcje wiadomości</string>
-    <string name="v5_1_better_messages">Lepsze wiadomości</string>
-    <string name="v5_1_custom_themes_descr">Dostosuj i udostępniaj motywy kolorów.</string>
-    <string name="v5_1_custom_themes">Niestandardowe motywy</string>
-    <string name="v5_1_message_reactions_descr">W końcu je mamy! 🚀</string>
-    <string name="v5_1_japanese_portuguese_interface">Japoński i portugalski interfejs użytkownika</string>
-    <string name="whats_new_read_more">Przeczytaj więcej</string>
-    <string name="v5_1_self_destruct_passcode">Pin samozniszczenia</string>
-    <string name="v5_1_better_messages_descr">- wiadomości głosowe do 5 minut.
-\n- niestandardowy czas zniknięcia.
-\n- historia edycji.</string>
 </resources>

apps/android/app/src/main/res/values-pt-rBR/strings.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="about_simplex_chat">Sobre o <xliff:g id="appNameFull">SimpleX Chat</xliff:g></string>
-    <string name="about_simplex">Sobre o SimpleX</string>
+    <string name="about_simplex">Sobre SimpleX</string>
     <string name="chat_item_ttl_day">1 dia</string>
     <string name="chat_item_ttl_week">1 semana</string>
     <string name="chat_item_ttl_month">1 mês</string>
@@ -50,6 +50,7 @@
     <string name="icon_descr_close_button">Botão Fechar</string>
     <string name="clear_verification">Limpar verificação</string>
     <string name="app_version_title">Versão do App</string>
+    <string name="accept_automatically">Automaticamente</string>
     <string name="bold">negrito</string>
     <string name="callstatus_error">erro de chamada</string>
     <string name="settings_audio_video_calls">Chamadas de áudio e vídeo</string>
@@ -66,6 +67,7 @@
     <string name="incognito_random_profile_description">Um perfil aleatório será enviado para o seu contato</string>
     <string name="chat_preferences">Preferências de chat</string>
     <string name="network_session_mode_user">perfil de chat</string>
+    <string name="accept_requests">Aceitar solicitações</string>
     <string name="icon_descr_audio_off">Áudio desligado</string>
     <string name="auto_accept_images">Aceitar imagens automaticamente</string>
     <string name="chat_database_deleted">Banco de dados de chat excluído</string>
@@ -77,8 +79,8 @@
     <string name="chat_console">Console de chat</string>
     <string name="smp_servers_check_address">Verifique o endereço do servidor e tente novamente.</string>
     <string name="network_session_mode_user_description">Uma conexão TCP separada (e credencial SOCKS) será usada <b>para cada perfil de chat que você tiver no aplicativo</b>.</string>
-    <string name="onboarding_notifications_mode_off_desc"><b>Melhor para bateria</b>. Você receberá notificações apenas quando o aplicativo estiver em execução (sem segundo plano).</string>
-    <string name="onboarding_notifications_mode_service_desc"><b>Consome mais bateria</b>! O serviço em segundo plano está sempre em execução - as notificações são exibidas assim que as mensagens estiverem disponíveis.</string>
+    <string name="onboarding_notifications_mode_off_desc"><b>Melhor para bateria</b>. Você receberá notificações apenas quando o aplicativo estiver em execução, o serviço em segundo plano NÃO será usado.</string>
+    <string name="onboarding_notifications_mode_service_desc"><b>Consome mais bateria</b>! O serviço em segundo plano está sempre em execução - as notificações serão exibidas assim que as mensagens estiverem disponíveis.</string>
     <string name="settings_section_title_chats">CHATS</string>
     <string name="settings_section_title_icon">ÍCONE DO APP</string>
     <string name="chat_database_section">BANCO DE DADOS DE CHAT</string>
@@ -87,7 +89,7 @@
     <string name="change_database_passphrase_question">Alterar senha do banco de dados\?</string>
     <string name="chat_archive_header">Arquivo de chat</string>
     <string name="rcv_conn_event_switch_queue_phase_completed">endereço alterado para você</string>
-    <string name="both_you_and_your_contact_can_send_disappearing">Você e seu contato podem enviar mensagens temporárias.</string>
+    <string name="both_you_and_your_contact_can_send_disappearing">Você e seu contato podem enviar mensagens que desaparecem.</string>
     <string name="full_backup">Backup de dados do aplicativo</string>
     <string name="settings_section_title_calls">CHAMADAS</string>
     <string name="v4_2_auto_accept_contact_requests">Aceitar solicitações de contato automaticamente</string>
@@ -95,7 +97,7 @@
     <string name="notifications_mode_service_desc">O serviço em segundo plano está sempre em execução - as notificações serão exibidas assim que as mensagens estiverem disponíveis.</string>
     <string name="network_session_mode_entity_description">Uma conexão TCP separada (e credencial SOCKS) será usada <b>para cada contato e membro do grupo</b>.
 \n<b>Observação</b>: se você tiver muitas conexões, o consumo de bateria e tráfego pode ser substancialmente maior e algumas conexões podem falhar.</string>
-    <string name="onboarding_notifications_mode_periodic_desc"><b>Bom para bateria</b>. O serviço em segundo plano procura por mensagens a cada 10 minutos. Você pode perder chamadas ou mensagens urgentes.</string>
+    <string name="onboarding_notifications_mode_periodic_desc"><b>Bom para bateria</b>. O serviço em segundo plano verifica novas mensagens a cada 10 minutos. Você pode perder chamadas e mensagens urgentes.</string>
     <string name="callstatus_ended">chamda encerrada <xliff:g id="duration" example="01:15">%1$s</xliff:g></string>
     <string name="chat_with_developers">Chat com os desenvolvedores</string>
     <string name="create_group_link">Criar link de grupo</string>
@@ -109,7 +111,7 @@
     <string name="notification_preview_somebody">Contato oculto:</string>
     <string name="copy_verb">Copiar</string>
     <string name="allow_verb">Permitir</string>
-    <string name="allow_to_send_disappearing">Permitir enviar mensagens temporárias.</string>
+    <string name="allow_to_send_disappearing">Permitir enviar mensagens que desaparecem.</string>
     <string name="allow_direct_messages">Permitir o envio de mensagens diretas aos membros.</string>
     <string name="connect_via_link_or_qr">Conectar via link/QR</string>
     <string name="clear_chat_warning">Todas as mensagens serão excluídas - isso não pode ser desfeito! As mensagens serão excluídas APENAS para você.</string>
@@ -121,6 +123,7 @@
     <string name="copied">Copiado para a área de transferência</string>
     <string name="accept_connection_request__question">Aceitar solicitação de conexão\?</string>
     <string name="network_settings">Configurações de rede avançadas</string>
+    <string name="contact_requests">Solicitações de contato</string>
     <string name="create_address">Criar endereço</string>
     <string name="all_your_contacts_will_remain_connected">Todos os seus contatos permanecerão conectados.</string>
     <string name="callstatus_accepted">chamada aceita</string>
@@ -142,7 +145,7 @@
     <string name="accept_feature">Aceitar</string>
     <string name="allow_disappearing_messages_only_if">Permitir mensagens temporárias apenas se o seu contato permitir.</string>
     <string name="allow_irreversible_message_deletion_only_if">Permita a exclusão irreversível da mensagem somente se o seu contato permitir.</string>
-    <string name="allow_your_contacts_to_send_disappearing_messages">Permitir que seus contatos enviem mensagens temporárias.</string>
+    <string name="allow_your_contacts_to_send_disappearing_messages">Permitir que seus contatos enviem mensagens que desaparecem.</string>
     <string name="allow_voice_messages_only_if">Permitir mensagens de voz somente se o seu contato permitir.</string>
     <string name="allow_your_contacts_to_send_voice_messages">Permitir que seus contatos enviem mensagens de voz.</string>
     <string name="group_member_role_admin">administrador</string>
@@ -154,7 +157,7 @@
     <string name="alert_title_contact_connection_pending">Contato ainda não está conectado!</string>
     <string name="contribute">Contribuir</string>
     <string name="create_profile_button">Criar</string>
-    <string name="network_enable_socks_info">Acessar os servidores via proxy SOCKS na porta %d\? O proxy deve ser iniciado antes de habilitar esta opção.</string>
+    <string name="network_enable_socks_info">Acessar os servidores via proxy SOCKS na porta 9050\? O proxy deve ser iniciado antes de habilitar esta opção.</string>
     <string name="allow_your_contacts_irreversibly_delete">Permitir que seus contatos excluam de forma irreversível as mensagens enviadas.</string>
     <string name="smp_servers_add_to_another_device">Adicionar a outro dispositivo</string>
     <string name="v4_2_group_links_desc">Os administradores podem criar os links para ingressar em grupos.</string>
@@ -260,7 +263,7 @@
     <string name="settings_section_title_device">DISPOSITIVO</string>
     <string name="settings_developer_tools">Ferramentas de desenvolvimento</string>
     <string name="group_member_status_introduced">conectando (introduzido)</string>
-    <string name="color_primary">Acento</string>
+    <string name="color_primary">Realçar</string>
     <string name="error_removing_member">Erro ao remover membro</string>
     <string name="error_changing_role">Erro ao alterar função</string>
     <string name="conn_level_desc_direct">direto</string>
@@ -346,11 +349,11 @@
     <string name="ttl_h">%dh</string>
     <string name="ttl_hours">%d horas</string>
     <string name="description_via_contact_address_link_incognito">anônimo via link de endereço de contato</string>
-    <string name="description_via_one_time_link_incognito">anônimo via link de uso único</string>
+    <string name="description_via_one_time_link_incognito">anônimo via link único</string>
     <string name="hide_verb">Ocultar</string>
     <string name="from_gallery_button">Da Galeria</string>
     <string name="gallery_video_button">Vídeo</string>
-    <string name="group_members_can_send_disappearing">Os membros do grupo podem enviar mensagens temporárias.</string>
+    <string name="group_members_can_send_disappearing">Os membros do grupo podem enviar mensagens que desaparecem.</string>
     <string name="icon_descr_file">Arquivo</string>
     <string name="full_name__field">Nome completo:</string>
     <string name="incoming_audio_call">Chamada de áudio recebida</string>
@@ -455,15 +458,16 @@
     <string name="reveal_verb">Revelar</string>
     <string name="icon_descr_server_status_pending">Pendente</string>
     <string name="prohibit_direct_messages">Proibir o envio de DMs para membros.</string>
-    <string name="scan_QR_code">Escanear QR Code</string>
+    <string name="scan_QR_code">Escanear código QR</string>
     <string name="reject_contact_button">Rejeitar</string>
     <string name="feature_offered_item">ofereceu %s</string>
     <string name="icon_descr_address"><xliff:g id="appName">Endereço</xliff:g> SimpleX</string>
+    <string name="show_QR_code_for_your_contact_to_scan_from_the_app__multiline">Seu contato pode escanear o código QR do aplicativo.</string>
     <string name="feature_offered_item_with_param">ofereceu %s: %2s</string>
     <string name="paste_connection_link_below_to_connect">Cole o link que você recebeu na caixa abaixo para conectar com o seu contato.</string>
     <string name="new_in_version">Novo em %s</string>
     <string name="send_us_an_email">Envie-nos um e-mail</string>
-    <string name="smp_servers_scan_qr">Escanear QR code do servidor</string>
+    <string name="smp_servers_scan_qr">Escanear código QR do servidor</string>
     <string name="your_SMP_servers">Seus servidores SMP</string>
     <string name="chat_item_ttl_none">nunca</string>
     <string name="restore_database_alert_title">Restaurar o backup do banco de dados\?</string>
@@ -604,7 +608,7 @@
     <string name="markdown_in_messages">Markdown em mensagens</string>
     <string name="smp_servers">Servidores SMP</string>
     <string name="smp_servers_preset_address">Endereço do servidor pré-definido</string>
-    <string name="many_people_asked_how_can_it_deliver">Muitos perguntaram:<i> se <xliff:g id="appName">SimpleX</xliff:g> não tem identificadores de usuários, como ele pode mandar mensagens\?</i></string>
+    <string name="many_people_asked_how_can_it_deliver">Muitos perguntaram:<i> se <xliff:g id="appName">SimpleX</xliff:g> não tem identificadores de usuários, como ele pode mandar memsagens\?</i></string>
     <string name="reject">Rejeitar</string>
     <string name="integrity_msg_skipped"><xliff:g id="connection ID" example="1">%1$d</xliff:g> mensagens ignoradas</string>
     <string name="protect_app_screen">Proteger a tela do app</string>
@@ -613,7 +617,8 @@
     <string name="join_group_button">Junte-se</string>
     <string name="you_can_share_group_link_anybody_will_be_able_to_connect">Você pode compartilhar um link ou um código QR - qualquer um poderá entrar no grupo. Você não perderá membros do grupo se você deletá-los mais tarde.</string>
     <string name="users_delete_data_only">Somente dados de perfil local</string>
-    <string name="only_you_can_send_disappearing">Somente você pode enviar mensagens temporárias.</string>
+    <string name="only_you_can_send_disappearing">Somente você pode enviar mensagens
+\ntemporárias.</string>
     <string name="only_your_contact_can_send_disappearing">Somente seu contato pode enviar mensagens temporárias.</string>
     <string name="icon_descr_instant_notifications">Notificações instantâneas</string>
     <string name="service_notifications">Notificações instantâneas!</string>
@@ -652,6 +657,7 @@
     <string name="this_QR_code_is_not_a_link">Esse código QR não é um link!</string>
     <string name="your_chat_profile_will_be_sent_to_your_contact">Seu perfil de chat será enviado para seu
 \ncontato</string>
+    <string name="your_contact_address">Seu endereço de contato</string>
     <string name="you_will_be_connected_when_your_contacts_device_is_online">Você será conectado quando o dispositivo do seu contato estiver online, aguarde ou verifique mais tarde!</string>
     <string name="how_to">Como</string>
     <string name="smp_servers_test_failed">Teste do servidor falhou!</string>
@@ -732,7 +738,7 @@
     <string name="send_live_message">Enviar mensagem ao vivo</string>
     <string name="above_then_preposition_continuation">acima, então:</string>
     <string name="to_connect_via_link_title">Para conectar via link</string>
-    <string name="image_descr_qr_code">QR Code</string>
+    <string name="image_descr_qr_code">Código QR</string>
     <string name="mark_code_verified">Marcado como verificado</string>
     <string name="to_verify_compare">Para verificar a criptografia de ponta-a-ponta com seu contato, compare (ou escaneie) o código em seus dispositivos.</string>
     <string name="smp_save_servers_question">Salvar servidores\?</string>
@@ -778,15 +784,18 @@
     <string name="network_use_onion_hosts_no_desc_in_alert">Hosts Onion não serão usados.</string>
     <string name="network_use_onion_hosts_prefer_desc">Os hosts Onion serão usados quando disponíveis.</string>
     <string name="network_use_onion_hosts_prefer_desc_in_alert">Os hosts Onion serão usados quando disponíveis.</string>
+    <string name="you_can_share_your_address_anybody_will_be_able_to_connect">Você pode compartilhar seu endereço como um link ou como um código QR - qualquer pessoa poderá se conectar a você. Você não perderá seus contatos se excluí-los posteriormente.</string>
     <string name="your_current_profile">Seu perfil atual</string>
     <string name="privacy_redefined">Privacidade redefinida</string>
     <string name="onboarding_notifications_mode_title">Notificações privadas</string>
     <string name="make_private_connection">Fazer uma conexão privada</string>
     <string name="people_can_connect_only_via_links_you_share">Pessoas podem se conectar com você somente via links compartilhados.</string>
     <string name="alert_text_skipped_messages_it_can_happen_when">Pode acontecer quando:
-\n1. As mensagens expiraram no remetente após 2 dias ou no servidor após 30 dias.
-\n2. A descriptografia da mensagem falhou porque você ou seu contato usou o backup do banco de dados antigo.
-\n3. A conexão foi comprometida.</string>
+\n1. As mensagens expiram no servidor se não forem recebidas por 30 dias,
+\n2. O servidor que você usa para receber as mensagens deste contato foi atualizado e reiniciado.
+\n3. A conexão está comprometida.
+\nPor favor, conecte-se aos desenvolvedores via Configurações para receber as atualizações sobre os servidores.
+\nEstaremos adicionando redundância de servidor para evitar perda de mensagens.</string>
     <string name="you_have_to_enter_passphrase_every_time">Você tem que digitar a senha toda vez que o aplicativo iniciar - ela não é armazenada no dispositivo.</string>
     <string name="save_welcome_message_question">Salvar mensagem de boas-vindas\?</string>
     <string name="delete_profile">Excluir perfil</string>
@@ -806,6 +815,7 @@
     <string name="network_settings_title">Configurações de conexão</string>
     <string name="no_details">sem detalhes</string>
     <string name="add_contact">Link de convite de uso único</string>
+    <string name="network_socks_toggle">Usar proxy SOCKS (porta 9050)</string>
     <string name="smp_servers_your_server_address">Seu endereço de servidor</string>
     <string name="your_settings">Suas configurações</string>
     <string name="is_verified">%s é verificado</string>
@@ -856,12 +866,12 @@
     <string name="voice_messages">Mensagens de voz</string>
     <string name="description_via_contact_address_link">via link de endereço de contato</string>
     <string name="description_via_one_time_link">via link de uso único</string>
-    <string name="share_invitation_link">Compartilhar link de uso único</string>
+    <string name="share_invitation_link">Compartilhar link de convite</string>
     <string name="network_use_onion_hosts">Usar hosts .onion</string>
     <string name="video_call_no_encryption">chamada de vídeo (não criptografada ponta-a-ponta)</string>
     <string name="stop_chat_question">Parar chat\?</string>
     <string name="simplex_link_mode_browser">Pelo navegador</string>
-    <string name="you_are_already_connected_to_vName_via_this_link">Você já está conectado a<xliff:g id="contactName" example="Alice">%1$s</xliff:g>.</string>
+    <string name="you_are_already_connected_to_vName_via_this_link">Você já está conectado a<xliff:g id="contactName" example="Alice">%1$s!</xliff:g>.</string>
     <string name="database_initialization_error_desc">O banco de dados não está funcionando corretamente. Toque para saber mais</string>
     <string name="waiting_for_image">Aguardando imagem</string>
     <string name="show_QR_code">Mostrar código QR</string>
@@ -911,6 +921,7 @@
     <string name="you_are_observer">você é um observador</string>
     <string name="voice_message_with_duration">Mensagem de voz (<xliff:g id="duration">%1$s</xliff:g>)</string>
     <string name="share_link">Compartilhar link</string>
+    <string name="section_title_welcome_message">MENSAGEM DE BOAS-VINDAS</string>
     <string name="to_protect_privacy_simplex_has_ids_for_queues">Para proteger a privacidade, em vez dos IDs de usuário usados por todas as outras plataformas, <xliff:g id="appName">SimpleX</xliff:g> tem identificadores para filas de mensagens, separados para cada um de seus contatos.</string>
     <string name="icon_descr_video_call">chamada de vídeo</string>
     <string name="show_call_on_lock_screen">Mostrar</string>
@@ -928,7 +939,7 @@
     <string name="auth_unlock">Desbloquear</string>
     <string name="moderate_message_will_be_deleted_warning">A mensagem será excluída para todos os membros.</string>
     <string name="moderate_message_will_be_marked_warning">A mensagem será marcada como moderada para todos os membros.</string>
-    <string name="share_image">Compartilhar mídia…</string>
+    <string name="share_image">Compartilhar imagem…</string>
     <string name="icon_descr_waiting_for_image">Aguardando imagem</string>
     <string name="share_file">Compartilhar arquivo…</string>
     <string name="image_decoding_exception_desc">A imagem não pode ser decodificada. Por favor, tente uma imagem diferente ou entre em contato com os desenvolvedores.</string>
@@ -965,7 +976,7 @@
     <string name="contact_you_shared_link_with_wont_be_able_to_connect">O contato com o qual você compartilhou este link NÃO será capaz de se conectar!</string>
     <string name="icon_descr_simplex_team">Equipe <xliff:g id="appName">SimpleX</xliff:g></string>
     <string name="use_simplex_chat_servers__question">Usar servidores<xliff:g id="appNameFull">SimpleX</xliff:g>\?</string>
-    <string name="using_simplex_chat_servers">Usando servidores <xliff:g id="appNameFull">SimpleX</xliff:g>.</string>
+    <string name="using_simplex_chat_servers">Usando servidores<xliff:g id="appNameFull">SimpleX</xliff:g>.</string>
     <string name="show_developer_options">Mostrar opções para desenvolvedores</string>
     <string name="v4_6_audio_video_calls_descr">Suporte bluetooth e outras melhorias.</string>
     <string name="to_reveal_profile_enter_password">Para revelar seu perfil oculto, digite uma senha em um campo de busca em sua página de perfis de chat.</string>
@@ -1007,7 +1018,7 @@
     <string name="you_sent_group_invitation">Você enviou convite de grupo</string>
     <string name="incognito_random_profile">Seu perfil aleatório</string>
     <string name="auth_simplex_lock_turned_on">Bloqueio SimpleX ativado</string>
-    <string name="your_simplex_contact_address">Seu endereço SimpleX</string>
+    <string name="your_simplex_contact_address">Seu endereço de contato<xliff:g id="appName">SimpleX</xliff:g></string>
     <string name="network_options_reset_to_defaults">Redefinir para os padrões</string>
     <string name="image_descr_link_preview">imagem de pré-visualização do link</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">Para proteger suas informações, ative o bloqueio SimpleX. Você será solicitado a completar a autenticação antes que este recurso seja ativado.</string>
@@ -1033,7 +1044,7 @@
     <string name="enable_automatic_deletion_message">Esta ação não pode ser desfeita - as mensagens enviadas e recebidas antes do selecionado serão excluídas. Pode levar vários minutos.</string>
     <string name="confirm_database_upgrades">Confirme as atualizações do banco de dados</string>
     <string name="only_client_devices_store_contacts_groups_e2e_encrypted_messages">Perfis de usuário, contatos, grupos e mensagens enviadas com <b>criptografia de ponta-a-ponta</b> são armazenados somente no seu dispositivo.</string>
-    <string name="thank_you_for_installing_simplex">Obrigado por instalar <xliff:g id="appNameFull">SimpleX</xliff:g>!</string>
+    <string name="thank_you_for_installing_simplex">Obrigado por instalar<xliff:g id="appNameFull">SimpleX</xliff:g>!</string>
     <string name="the_messaging_and_app_platform_protecting_your_privacy_and_security">A plataforma de mensagens que protege sua privacidade e segurança.</string>
     <string name="invite_prohibited_description">Você está tentando convidar um contato com quem compartilhou um perfil anônimo para o grupo no qual está usando seu perfil principal</string>
     <string name="you_control_servers_to_receive_your_contacts_to_send">Você controla por meio de qual(is) servidor(es) <b>receber</b> as mensagens, seus contatos controlam os servidores que você usa para enviar mensagens.</string>
@@ -1071,7 +1082,7 @@
     <string name="network_socks_toggle_use_socks_proxy">Usar proxy SOCKS</string>
     <string name="host_verb">Hospedar</string>
     <string name="disable_onion_hosts_when_not_supported">Definir <i>Usar hosts .onion</i> para não se o proxy SOCKS não oferecer suporte a eles.</string>
-    <string name="port_verb">Migrar</string>
+    <string name="port_verb">Porta</string>
     <string name="confirm_passcode">Confirmar senha</string>
     <string name="incorrect_passcode">Senha incorreta</string>
     <string name="lock_after">Bloquear após</string>
@@ -1087,175 +1098,4 @@
     <string name="enable_lock">Habilitar bloqueio</string>
     <string name="passcode_changed">Senha alterada!</string>
     <string name="you_can_turn_on_lock">Você pode ativar o bloqueio SimpleX via Configurações.</string>
-    <string name="alert_title_msg_bad_hash">Hash de mensagem incorreta</string>
-    <string name="alert_text_msg_bad_hash">O hash da mensagem anterior é diferente.</string>
-    <string name="alert_text_decryption_error_header"><xliff:g id="message count" example="1"/> descriptografia das mensagens falhou</string>
-    <string name="alert_title_msg_bad_id">ID de mensagem incorreta</string>
-    <string name="alert_text_msg_bad_id">A ID da próxima mensagem está incorreta (menor ou igual à anterior).
-\nIsso pode acontecer por causa de algum bug ou quando a conexão está comprometida.</string>
-    <string name="alert_text_fragment_encryption_out_of_sync_old_database">Isso pode acontecer quando você ou sua conexão usaram o backup do banco de dados antigo.</string>
-    <string name="alert_text_fragment_please_report_to_developers">Por favor, informe aos desenvolvedores.</string>
-    <string name="stop_rcv_file__message">O recebimento do arquivo será interrompido.</string>
-    <string name="stop_snd_file__message">O envio do arquivo será interrompido.</string>
-    <string name="stop_file__action">Parar arquivo</string>
-    <string name="stop_rcv_file__title">Parar de receber arquivo\?</string>
-    <string name="stop_snd_file__title">Parar de enviar arquivo\?</string>
-    <string name="revoke_file__action">Revogar arquivo</string>
-    <string name="stop_file__confirm">Parar</string>
-    <string name="revoke_file__message">O arquivo será excluído dos servidores.</string>
-    <string name="revoke_file__title">Revogar arquivo\?</string>
-    <string name="no_spaces">Sem espaços!</string>
-    <string name="alert_text_fragment_permanent_error_reconnect">Este erro é permanente para esta conexão, por favor, reconecte.</string>
-    <string name="alert_text_decryption_error_too_many_skipped"><xliff:g id="message count" example="1"/> mensagens ignoradas</string>
-    <string name="audio_video_calls">Chamadas de áudio/vídeo</string>
-    <string name="calls_prohibited_with_this_contact">Chamadas de áudio/vídeo são proibidas.</string>
-    <string name="available_in_v51">"
-\nDisponível em v5.1"</string>
-    <string name="both_you_and_your_contact_can_make_calls">Você e seu contato podem fazer chamadas.</string>
-    <string name="only_you_can_make_calls">Somente você pode fazer chamadas.</string>
-    <string name="only_your_contact_can_make_calls">Somente seu contato pode fazer chamadas.</string>
-    <string name="prohibit_calls">Proibir chamadas de áudio/vídeo.</string>
-    <string name="allow_calls_only_if">Permita chamadas somente se o seu contato permiti-las.</string>
-    <string name="allow_your_contacts_to_call">Permita que seus contatos liguem para você.</string>
-    <string name="v5_0_app_passcode">Senha do aplicativo</string>
-    <string name="v5_0_large_files_support_descr">Rápido e sem esperar até que o remetente esteja online!</string>
-    <string name="v5_0_polish_interface">interface polonesa</string>
-    <string name="v5_0_app_passcode_descr">Defina-o em vez da autenticação do sistema.</string>
-    <string name="v5_0_polish_interface_descr">Obrigado aos usuários – contribuam via Weblate!</string>
-    <string name="v5_0_large_files_support">Vídeos e arquivos de até 1gb</string>
-    <string name="gallery_image_button">Imagem</string>
-    <string name="decryption_error">erro de descriptografia</string>
-    <string name="revoke_file__confirm">Revogar</string>
-    <string name="learn_more_about_address">Sobre o endereço SimpleX</string>
-    <string name="color_secondary_variant">Secundária adicional</string>
-    <string name="color_primary_variant">Acento adicional</string>
-    <string name="one_time_link_short">Link de uso único</string>
-    <string name="add_address_to_your_profile">Adicione o endereço ao seu perfil, para que seus contatos possam compartilhá-lo com outras pessoas. A atualização do perfil será enviada aos seus contatos.</string>
-    <string name="create_address_and_let_people_connect">Crie um endereço para permitir que as pessoas se conectem com você.</string>
-    <string name="create_simplex_address">Criar endereço SimpleX</string>
-    <string name="continue_to_next_step">Continuar</string>
-    <string name="dont_create_address">Não criar endereço</string>
-    <string name="address_section_title">Endereço</string>
-    <string name="dark_theme">Tema escuro</string>
-    <string name="color_background">Fundo</string>
-    <string name="all_your_contacts_will_remain_connected_update_sent">Todos os seus contactos permanecerão ligados. A atualização do perfil será enviada para seus contatos.</string>
-    <string name="auto_accept_contact">Aceitação automática</string>
-    <string name="customize_theme_title">Personalizar o tema</string>
-    <string name="enter_welcome_message">Digite a mensagem de boas-vindas…</string>
-    <string name="error_setting_address">Erro ao definir o endereço</string>
-    <string name="learn_more">Saiba mais</string>
-    <string name="theme_simplex">SimpleX</string>
-    <string name="import_theme_error_desc">Certifique-se que o arquivo tenha a sintaxe YAML correta. Exporte o tema para ter um exemplo da estrutura do arquivo do tema.</string>
-    <string name="export_theme">Exportar tema</string>
-    <string name="import_theme_error">Erro ao importar tema</string>
-    <string name="color_surface">Menus e alertas</string>
-    <string name="color_received_message">Mensagem recebida</string>
-    <string name="color_sent_message">Mensagem enviada</string>
-    <string name="color_title">Título</string>
-    <string name="if_you_cant_meet_in_person">Se não puderem se encontrar pessoalmente, mostre o QR code em uma chamada de vídeo ou compartilhe o link.</string>
-    <string name="scan_qr_to_connect_to_contact">Para se conectar, seu contato pode ler o QR code ou usar o link no aplicativo.</string>
-    <string name="you_can_share_your_address">Você pode compartilhar seu endereço como um link ou QR code - qualquer pessoa pode se conectar a você.</string>
-    <string name="you_wont_lose_your_contacts_if_delete_address">Você não perderá seus contatos se, posteriormente, excluir seu endereço.</string>
-    <string name="simplex_address">Endereço SimpleX</string>
-    <string name="you_can_accept_or_reject_connection">Quando as pessoas solicitam uma conexão, você pode aceitá-la ou rejeitá-la.</string>
-    <string name="theme_colors_section_title">CORES DO TEMA</string>
-    <string name="share_with_contacts">compartilhar com os contatos</string>
-    <string name="profile_update_will_be_sent_to_contacts">A atualização do perfil será enviada aos seus contatos.</string>
-    <string name="save_settings_question">Salvar configurações\?</string>
-    <string name="stop_sharing">Parar de compartilhar</string>
-    <string name="stop_sharing_address">Parar de compartilhar o endereço\?</string>
-    <string name="email_invite_body">Oi!
-\nConecte-se comigo via SimpleX Chat: %s</string>
-    <string name="invite_friends">Convide amigos</string>
-    <string name="email_invite_subject">Vamos conversar no SimpleX</string>
-    <string name="you_can_create_it_later">Você pode criá-lo mais tarde</string>
-    <string name="share_address">Compartilhar endereço</string>
-    <string name="you_can_share_this_address_with_your_contacts">Você pode compartilhar esse endereço com seus contatos para que eles se conectem com %s.</string>
-    <string name="group_welcome_preview">Prévia</string>
-    <string name="color_secondary">Secundária</string>
-    <string name="import_theme">Importar tema</string>
-    <string name="read_more_in_user_guide_with_link">Leia mais em <font color="#0088ff">Guia do Usuário</font>.</string>
-    <string name="enter_welcome_message_optional">Digite a mensagem de boas-vindas... (opcional)</string>
-    <string name="save_auto_accept_settings">Salvar configurações de aceitação automática</string>
-    <string name="opening_database">Abrindo banco de dados…</string>
-    <string name="auth_open_chat_profiles">Abrir perfis de bate-papo</string>
-    <string name="share_address_with_contacts_question">Compartilhar endereço com os contatos\?</string>
-    <string name="your_contacts_will_see_it">Seus contatos no SimpleX o verão.
-\nVocê pode alterá-la nas Configurações.</string>
-    <string name="your_contacts_will_remain_connected">Seus contatos continuarão conectados.</string>
-    <string name="all_app_data_will_be_cleared">Todos os dados do aplicativo serão excluídos.</string>
-    <string name="app_passcode_replaced_with_self_destruct">A senha do aplicativo é substituída por uma senha de auto-destruição.</string>
-    <string name="self_destruct_new_display_name">Novo nome de exibição:</string>
-    <string name="set_passcode">Definir senha</string>
-    <string name="enable_self_destruct">Ativar auto-destruição</string>
-    <string name="send_disappearing_message">Enviar mensagem temporária</string>
-    <string name="send_disappearing_message_1_minute">1 minuto</string>
-    <string name="send_disappearing_message_30_seconds">30 segundos</string>
-    <string name="send_disappearing_message_5_minutes">5 minutos</string>
-    <string name="send_disappearing_message_custom_time">Horário personalizado</string>
-    <string name="disappearing_message">Mensagem temporária</string>
-    <string name="send_disappearing_message_send">Enviar</string>
-    <string name="self_destruct_passcode_changed">A senha de auto-destruição foi alterada!</string>
-    <string name="self_destruct_passcode">Senha de auto-destruição</string>
-    <string name="self_destruct_passcode_enabled">Senha de auto-destruição ativada!</string>
-    <string name="enabled_self_destruct_passcode">Ativar senha de auto-destruição</string>
-    <string name="allow_message_reactions">Permitir reações à mensagens.</string>
-    <string name="only_you_can_add_message_reactions">Somente você pode adicionar reações à mensagens.</string>
-    <string name="only_your_contact_can_add_message_reactions">Somente seu contato pode adicionar reações à mensagens.</string>
-    <string name="message_reactions_are_prohibited">Reações à mensagens são proibidas neste grupo.</string>
-    <string name="custom_time_unit_hours">horas</string>
-    <string name="custom_time_unit_minutes">minutos</string>
-    <string name="custom_time_unit_seconds">segundos</string>
-    <string name="self_destruct">Auto-destruição</string>
-    <string name="error_loading_details">Erro ao carregar detalhes</string>
-    <string name="edit_history">Histórico</string>
-    <string name="info_menu">Info</string>
-    <string name="received_message">Mensagem recebida</string>
-    <string name="sent_message">Mensagem enviada</string>
-    <string name="empty_chat_profile_is_created">Um perfil chat vazio com o nome fornecido é criado, e o aplicativo é aberto normalmente.</string>
-    <string name="change_self_destruct_mode">Alterar o modo de auto-destruição</string>
-    <string name="if_you_enter_passcode_data_removed">Se você digitar essa senha ao abrir o aplicativo, todos os dados do aplicativo serão excluídos irreversivelmente!</string>
-    <string name="info_row_deleted_at">Excluído em</string>
-    <string name="info_row_received_at">Recebido em</string>
-    <string name="info_row_updated_at">Registro atualizado em</string>
-    <string name="share_text_database_id">ID do banco de dados: %d</string>
-    <string name="share_text_deleted_at">Excluído em: %s</string>
-    <string name="info_row_disappears_at">Desaparece em</string>
-    <string name="share_text_disappears_at">Desaparece em: %s</string>
-    <string name="info_row_moderated_at">Moderado em</string>
-    <string name="share_text_moderated_at">Moderado em: %s</string>
-    <string name="share_text_received_at">Recebido em: %s</string>
-    <string name="share_text_updated_at">Registro atualizado em: %s</string>
-    <string name="item_info_current">(atual)</string>
-    <string name="current_version_timestamp">%s (atual)</string>
-    <string name="allow_your_contacts_adding_message_reactions">Permitir que seus contatos adicionem reações à mensagens.</string>
-    <string name="both_you_and_your_contact_can_add_message_reactions">Você e seu contato podem adicionar reações à mensagens.</string>
-    <string name="group_members_can_add_message_reactions">Os membros do grupo podem adicionar reações às mensagens.</string>
-    <string name="message_reactions_prohibited_in_this_chat">Reações à mensagens são proibidas neste chat.</string>
-    <string name="prohibit_message_reactions">Proibir reações à mensagens.</string>
-    <string name="custom_time_picker_custom">personalizado</string>
-    <string name="whats_new_read_more">Ler mais</string>
-    <string name="v5_1_self_destruct_passcode_descr">Todos seus dados são apagados quando digitado</string>
-    <string name="v5_1_message_reactions_descr">Finalmente, nós os temos! 🚀</string>
-    <string name="v5_1_message_reactions">Reações à mensagens</string>
-    <string name="v5_1_self_destruct_passcode">Senha de auto-destruição</string>
-    <string name="v5_1_better_messages">Mensagens melhores</string>
-    <string name="v5_1_japanese_portuguese_interface">IU em japonês e português</string>
-    <string name="custom_time_unit_months">meses</string>
-    <string name="custom_time_picker_select">Selecionar</string>
-    <string name="whats_new_thanks_to_users_contribute_weblate">Obrigado aos usuários – contribua via Weblate!</string>
-    <string name="v5_1_better_messages_descr">- mensagens de voz de até 5 minutos
-\n- tempo personalizado para desaparecer.
-\n- histórico de edição.</string>
-    <string name="custom_time_unit_weeks">semanas</string>
-    <string name="allow_message_reactions_only_if">Permitir reações à mensagens somente se o seu contato permitir.</string>
-    <string name="v5_1_custom_themes_descr">Personalize e compartilhe temas de cores.</string>
-    <string name="v5_1_custom_themes">Temas personalizados</string>
-    <string name="custom_time_unit_days">dias</string>
-    <string name="message_reactions">Reações à mensagens</string>
-    <string name="prohibit_message_reactions_group">Proibir reações à mensagens.</string>
-    <string name="share_text_sent_at">Enviado em: %s</string>
-    <string name="info_row_sent_at">Enviado em</string>
-    <string name="change_self_destruct_passcode">Alterar senha de auto-destruição</string>
-    <string name="if_you_enter_self_destruct_code">Se você digitar sua senha de auto-destruição ao abrir o aplicativo:</string>
 </resources>

apps/android/app/src/main/res/values-pt/strings.xml

@@ -1,683 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="image_descr_qr_code">Código QR</string>
-    <string name="paste_button">Colar</string>
-    <string name="paste_connection_link_below_to_connect">Cole a ligação que você recebeu na caixa abaixo para se conectar ao seu contato.</string>
-    <string name="connect_button">Conectar</string>
-    <string name="chat_console">Consola de conversa</string>
-    <string name="smp_servers_test_failed">Teste ao servidor falhou!</string>
-    <string name="network_socks_toggle_use_socks_proxy">Usar proxy SOCKS</string>
-    <string name="network_socks_toggle">Usar proxy SOCKS (porto 9050)</string>
-    <string name="network_enable_socks">Usar proxy SOCKS\?</string>
-    <string name="port_verb">Porto</string>
-    <string name="network_proxy_port">porto %d</string>
-    <string name="appearance_settings">Aparência</string>
-    <string name="app_version_title">Versão da aplicação</string>
-    <string name="all_your_contacts_will_remain_connected">Todos os seus contatos permanecerão conectados.</string>
-    <string name="delete_address">Eliminar endereço</string>
-    <string name="accept_automatically">Automaticamente</string>
-    <string name="a_plus_b">a + b</string>
-    <string name="callstatus_missed">chamada perdida</string>
-    <string name="always_use_relay">Utilizar sempre o servidor de relay</string>
-    <string name="icon_descr_audio_call">chamada de áudio</string>
-    <string name="accept_call_on_lock_screen">Aceitar</string>
-    <string name="show_call_on_lock_screen">Mostrar</string>
-    <string name="answer_call">Atender chamada</string>
-    <string name="integrity_msg_bad_hash">hash de mensagem incorreto</string>
-    <string name="integrity_msg_bad_id">ID da mensagem incorreto</string>
-    <string name="alert_title_msg_bad_hash">Hash de mensagem incorreto</string>
-    <string name="alert_title_msg_bad_id">ID da mensagem incorreto</string>
-    <string name="lock_after">Bloquear após</string>
-    <string name="full_backup">Backup de dados da aplicação</string>
-    <string name="auto_accept_images">Aceitar imagens automaticamente</string>
-    <string name="passcode_set">Código de acesso definido!</string>
-    <string name="settings_section_title_you">VOCÊ</string>
-    <string name="settings_section_title_messages">MENSAGENS E FICHEIROS</string>
-    <string name="settings_section_title_icon">ÍCONE DA APLICAÇÃO</string>
-    <string name="chat_item_ttl_month">1 mês</string>
-    <string name="messages_section_title">Mensagens</string>
-    <string name="chat_archive_section">ARQUIVO DE CONVERSA</string>
-    <string name="button_add_welcome_message">Adicionar mensagem de boas-vindas</string>
-    <string name="users_add">Adicional perfil</string>
-    <string name="users_delete_data_only">Apenas dados de perfil local</string>
-    <string name="color_primary">Realçar</string>
-    <string name="chat_preferences_you_allow">Você permite</string>
-    <string name="timed_messages">Mensagens que desaparecem</string>
-    <string name="chat_preferences_always">sempre</string>
-    <string name="chat_preferences_no">não</string>
-    <string name="set_group_preferences">Definir preferências de grupo</string>
-    <string name="voice_messages">Mensagens de voz</string>
-    <string name="available_in_v51">"
-\nDisponível na v5.1"</string>
-    <string name="accept_feature">Aceitar</string>
-    <string name="allow_your_contacts_to_send_disappearing_messages">Permitir que seus contatos enviem mensagens que desaparecem.</string>
-    <string name="accept_feature_set_1_day">Definir 1 dia</string>
-    <string name="allow_irreversible_message_deletion_only_if">Permitir a exclusão irreversível de mensagens apenas se o seu contato permitir.</string>
-    <string name="allow_your_contacts_irreversibly_delete">Permitir que seus contatos eliminem de forma irreversível mensagens enviadas.</string>
-    <string name="allow_voice_messages_only_if">Permitir mensagens de voz apenas se o contato permitir.</string>
-    <string name="allow_your_contacts_to_send_voice_messages">Permitir que seus contatos enviem mensagens de voz.</string>
-    <string name="allow_calls_only_if">Permitir chamadas apenas se o seu contato as permitir.</string>
-    <string name="allow_your_contacts_to_call">Permitir que os seus contatos liguem para si.</string>
-    <string name="both_you_and_your_contact_can_send_disappearing">Você e o seu contato podem enviar mensagens que desaparecem.</string>
-    <string name="both_you_and_your_contact_can_make_calls">Você e o seu contato podem fazer chamadas.</string>
-    <string name="allow_direct_messages">Permitir o envio de mensagens diretas aos membros.</string>
-    <string name="allow_to_send_voice">Permitir o envio de mensagens de voz.</string>
-    <string name="ttl_min">%d min</string>
-    <string name="ttl_month">%d mês</string>
-    <string name="ttl_months">%d meses</string>
-    <string name="ttl_mth">%dmês</string>
-    <string name="v4_2_group_links_desc">Administradores podem criar as ligações para entrar em grupos.</string>
-    <string name="v4_3_voice_messages">Mensagens de voz</string>
-    <string name="v4_2_auto_accept_contact_requests">Aceitar automaticamente pedidos de contato</string>
-    <string name="v4_3_improved_server_configuration_desc">Adicionar servidores lendo QR codes.</string>
-    <string name="v4_4_disappearing_messages">Mensagens que desaparecem</string>
-    <string name="v4_4_live_messages">Mensagens ao vivo</string>
-    <string name="v4_4_disappearing_messages_desc">As mensagens enviadas serão eliminadas após o tempo definido.</string>
-    <string name="v4_5_message_draft">Mensagem de rascunho</string>
-    <string name="v5_0_app_passcode_descr">Defina-o em vez de autenticação do sistema.</string>
-    <string name="connect_via_link_verb">Conectar</string>
-    <string name="connected_to_server_to_receive_messages_from_contact">Você está conectado ao servidor usado para receber mensagens deste contacto.</string>
-    <string name="sender_you_pronoun">você</string>
-    <string name="ensure_xftp_server_address_are_correct_format_and_unique">Certifique-se de que os endereços do servidor XFTP estão no formato correto, separados por linhas e não estão duplicados.</string>
-    <string name="smp_server_test_disconnect">Desconectar</string>
-    <string name="error_smp_test_certificate">Possivelmente, a impressão digital do certificado no endereço do servidor está incorreta</string>
-    <string name="enter_passphrase_notification_title">A senha é necessária</string>
-    <string name="settings_notifications_mode_title">Serviço de notificações</string>
-    <string name="notifications_mode_service">Sempre ligado</string>
-    <string name="notification_preview_mode_contact_desc">Mostrar apenas contato</string>
-    <string name="la_lock_mode_passcode">Modo de entrada de código de acesso</string>
-    <string name="la_auth_failed">Falha na autenticação</string>
-    <string name="auth_log_in_using_credential">Inicie sessão usando a sua credencial</string>
-    <string name="delete_message_mark_deleted_warning">A mensagem será marcada para eliminação. O(s) destinatário(s) poderá(ão) revelar esta mensagem.</string>
-    <string name="icon_descr_sent_msg_status_sent">enviada</string>
-    <string name="group_preview_you_are_invited">você está convidado para o grupo</string>
-    <string name="you_are_observer">você é observador</string>
-    <string name="notifications">Notificações</string>
-    <string name="icon_descr_server_status_disconnected">Desconectado</string>
-    <string name="text_field_set_contact_placeholder">Definir nome do contato…</string>
-    <string name="allow_voice_messages_question">Permitir mensagens de voz\?</string>
-    <string name="live_message">Mensagem ao vivo!</string>
-    <string name="back">Voltar</string>
-    <string name="set_contact_name">Definir nome do contato</string>
-    <string name="you_accepted_connection">Você aceitou a conexão</string>
-    <string name="about_simplex">Sobre o SimpleX</string>
-    <string name="network_settings">Definições de rede avançadas</string>
-    <string name="about_simplex_chat">Sobre o <xliff:g id="appNameFull">SimpleX Chat</xliff:g></string>
-    <string name="above_then_preposition_continuation">acima, então:</string>
-    <string name="users_delete_all_chats_deleted">Todas as conversas e mensagens serão apagadas - esta ação não pode ser revertida!</string>
-    <string name="all_group_members_will_remain_connected">Todos os membros do grupo permanecerão conectados.</string>
-    <string name="clear_chat_warning">Todas as mensagens serão apagadas - esta ação não pode ser revertida! As mensagens serão apagadas APENAS para si.</string>
-    <string name="allow_verb">Permitir</string>
-    <string name="allow_disappearing_messages_only_if">Permitir mensagens que desaparecem apenas se o seu contato permitir.</string>
-    <string name="notification_preview_mode_message">Mensagem de texto</string>
-    <string name="delete_message_cannot_be_undone_warning">A mensagem será apagada - esta ação não pode ser revertida!</string>
-    <string name="database_migrations">Migrações: %s</string>
-    <string name="icon_descr_call_missed">Chamada perdida</string>
-    <string name="la_minutes">%d minutos</string>
-    <string name="smp_server_test_connect">Conectar</string>
-    <string name="server_connected">conectado</string>
-    <string name="callstate_connected">conectado</string>
-    <string name="rcv_group_event_member_connected">conectado</string>
-    <string name="group_member_status_connected">conectado</string>
-    <string name="group_member_status_group_deleted">grupo eliminado</string>
-    <string name="notification_contact_connected">Conectado</string>
-    <string name="chat_item_ttl_day">1 dia</string>
-    <string name="chat_item_ttl_week">1 semana</string>
-    <string name="accept_contact_button">Aceitar</string>
-    <string name="callstatus_accepted">aceitar chamada</string>
-    <string name="smp_servers_add">Adicionar servidor…</string>
-    <string name="accept">Aceitar</string>
-    <string name="accept_connection_request__question">Aceitar pedido de ligação\?</string>
-    <string name="accept_contact_incognito_button">Aceitar modo anónimo</string>
-    <string name="accept_requests">Aceitar pedidos</string>
-    <string name="smp_servers_preset_add">Adicionar servidores pré-definidos</string>
-    <string name="network_enable_socks_info">Aceder aos servidores via proxy SOCKS no porto %d\? O proxy tem de iniciar antes de ativar esta opção.</string>
-    <string name="smp_servers_add_to_another_device">Adicionar a outro dispositivo</string>
-    <string name="group_member_role_admin">administrador</string>
-    <string name="allow_to_delete_messages">Permitir apagar irreversivelmente as mensagens enviadas.</string>
-    <string name="delete_address__question">Eliminar endereço\?</string>
-    <string name="delete_after">Eliminar após</string>
-    <string name="delete_verb">Eliminar</string>
-    <string name="delete_contact_menu_action">Eliminar</string>
-    <string name="chat_archive_header">Arquivo de conversa</string>
-    <string name="delete_group_menu_action">Eliminar</string>
-    <string name="delete_files_and_media_all">Eliminar todos os ficheiros</string>
-    <string name="delete_archive">Eliminar ficheiro</string>
-    <string name="delete_chat_archive_question">Eliminar arquivo de conversa\?</string>
-    <string name="delete_database">Eliminar base de dados</string>
-    <string name="chat_database_section">BASE DE DADOS DE CONVERSA</string>
-    <string name="chat_database_deleted">Base de dados de conversa eliminada</string>
-    <string name="display_name">Nome para Exibição</string>
-    <string name="show_dev_options">Mostrar:</string>
-    <string name="deleted_description">eliminada</string>
-    <string name="rcv_group_event_group_deleted">grupo eliminado</string>
-    <string name="group_display_name_field">Nome do grupo:</string>
-    <string name="display_name_cannot_contain_whitespace">O nome para exibição não pode conter espaços em branco.</string>
-    <string name="ttl_m">%dm</string>
-    <string name="dont_show_again">Não mostrar novamente</string>
-    <string name="show_developer_options">Mostrar opções de desenvolvedor</string>
-    <string name="notification_preview_mode_message_desc">Mostrar contato e mensagem</string>
-    <string name="settings_notification_preview_mode_title">Mostrar pré-visualização</string>
-    <string name="allow_to_send_disappearing">Permitir enviar mensagens que desaparecem.</string>
-    <string name="display_name__field">Nome para Exibição:</string>
-    <string name="show_QR_code">Mostrar código QR</string>
-    <string name="disappearing_messages_are_prohibited">Mensagens que desaparecem são proibidas neste grupo.</string>
-    <string name="connect_via_link_or_qr">Conectar via ligação / código QR</string>
-    <string name="disappearing_prohibited_in_this_chat">Mensagens que desaparecem são proibidas nesta conversa.</string>
-    <string name="send_verb">Enviar</string>
-    <string name="live">AO VIVO</string>
-    <string name="send_live_message_desc">Enviar uma mensagem ao vivo - ela será atualizada para o(s) destinatário(s) à medida que você a digita</string>
-    <string name="info_row_local_name">Nome local</string>
-    <string name="lock_mode">Modo de bloqueio</string>
-    <string name="ensure_smp_server_address_are_correct_format_and_unique">Certifique-se de que os endereços do servidor SMP estão no formato correto, separados por linhas e não estão duplicados.</string>
-    <string name="make_private_connection">Fazer uma conexão privada</string>
-    <string name="make_profile_private">Tornar o perfil privado!</string>
-    <string name="ensure_ICE_server_address_are_correct_format_and_unique">Certifique-se de que os endereços do servidor WebRTC ICE estão no formato correto, separados por linhas e não estão duplicados.</string>
-    <string name="voice_prohibited_in_this_chat">Mensagens de voz são proibidas neste chat.</string>
-    <string name="voice_messages_are_prohibited">Mensagens de voz são proibidas neste grupo.</string>
-    <string name="voice_messages_prohibited">Mensagens de voz proibidas!</string>
-    <string name="voice_message_with_duration">Mensagem de voz (<xliff:g id="duration">%1$s</xliff:g>)</string>
-    <string name="app_version_name">Versão da aplicação: v%s</string>
-    <string name="keychain_is_storing_securely">O Android Keystore é usado para armazenar com segurança a senha - permite que o serviço de notificações funcione.</string>
-    <string name="keychain_allows_to_receive_ntfs">O Android Keystore será usado para armazenar com segurança a senha depois de voçê reiniciar a aplicação ou alterar a senha - irá permitir receber notificações.</string>
-    <string name="notifications_will_be_hidden">As notificações serão entregues apenas até à aplicação parar!</string>
-    <string name="app_version_code">Compilação da aplicação: %s</string>
-    <string name="notifications_mode_off_desc">A aplicação pode receber notificações apenas quando estiver em execução, nenhum serviço em segundo plano será iniciado</string>
-    <string name="network_use_onion_hosts_no">Não</string>
-    <string name="passcode_not_changed">Código de acesso não alterado!</string>
-    <string name="v5_0_app_passcode">Código de acesso da aplicação</string>
-    <string name="password_to_show">Senha a ser exibida</string>
-    <string name="la_mode_passcode">Código de acesso</string>
-    <string name="passcode_changed">Código de acesso alterado!</string>
-    <string name="paste_the_link_you_received">Colar ligação recebida</string>
-    <string name="restore_passphrase_not_found_desc">Senha não encontrada na Keystore, por favor insira-a manualmente. Isto pode ter acontecido se você restaurou os dados da aplicação usando uma ferramenta de backup. Se não for o caso, entre em contato com os desenvolvedores.</string>
-    <string name="incognito_random_profile_from_contact_description">Um perfil aleatório será enviado para o contato do qual você recebeu esta ligação</string>
-    <string name="error_smp_test_server_auth">O servidor requer autorização para criar filas, verifique a senha</string>
-    <string name="conn_stats_section_title_servers">SERVIDORES</string>
-    <string name="error_xftp_test_server_auth">O servidor requer autorização para fazer upload, verifique a senha</string>
-    <string name="incognito_random_profile_description">Um perfil aleatório será enviado para o seu contato</string>
-    <string name="disable_onion_hosts_when_not_supported">Defina <i>Usar hosts .onion</i> como Não se o proxy SOCKS não o suportar.</string>
-    <string name="network_use_onion_hosts">Usar hosts .onion</string>
-    <string name="smp_servers_use_server">Usar servidor</string>
-    <string name="v4_6_audio_video_calls">Chamadas de áudio e vídeo</string>
-    <string name="attach">Anexar</string>
-    <string name="v4_5_message_draft_descr">Preservar o último rascunho da mensagem, com anexos.</string>
-    <string name="icon_descr_video_asked_to_receive">Solicitada a recepção do vídeo</string>
-    <string name="network_session_mode_user_description">Uma conexão TCP separada (e credencial SOCKS) será usada <b> para cada perfil de conversa que você tiver na aplicação </b>.</string>
-    <string name="network_session_mode_entity_description">Uma conexão TCP separada (e credencial SOCKS) será usada <b> para cada contato e membro do grupo</b>.
-\n<b> Por favor note</b>: se você tiver muitas conexões, o seu consumo de bateria e consumo de tráfego pode ser substancialmente maior e algumas conexões podem falhar.</string>
-    <string name="icon_descr_asked_to_receive">Solicitada a recepção da imagem</string>
-    <string name="auth_unavailable">Autenticação indisponível</string>
-    <string name="bold">negrito</string>
-    <string name="both_you_and_your_contacts_can_delete">Você e o seu contato podem eliminar irreversivelmente as mensagens enviadas.</string>
-    <string name="failed_to_create_user_duplicate_desc">Você já tem um perfil de chat com o mesmo nome para exibição. Por favor, escolha outro nome.</string>
-    <string name="you_are_invited_to_group">Você está convidado para o grupo</string>
-    <string name="you_can_also_connect_by_clicking_the_link">Você também se pode conectar clicando na ligação. Se ele abrir no navegador, clique no botão <b>Abrir na aplicação móvel</b>.</string>
-    <string name="you_are_invited_to_group_join_to_connect_with_group_members">Você está convidado para o grupo. Junte-se para se conectar com os membros do grupo.</string>
-    <string name="info_row_group">Grupo</string>
-    <string name="icon_descr_audio_on">Áudio ligado</string>
-    <string name="authentication_cancelled">Autenticação cancelada</string>
-    <string name="add_new_contact_to_create_one_time_QR_code"><b> Adicionar novo contato</b>: para criar o seu código QR de utilização única para o seu contato.</string>
-    <string name="onboarding_notifications_mode_periodic_desc"><b> Bom para a bateria </b>. O serviço em segundo plano verifica se há novas mensagens a cada 10 minutos. Você pode perder chamadas e mensagens urgentes.</string>
-    <string name="turning_off_service_and_periodic">A otimização da bateria está ativa, desativando o serviço em segundo plano e os pedidos periódicos de novas mensagens. Você pode reativá-los através das definições.</string>
-    <string name="onboarding_notifications_mode_off_desc"><b>Melhor para a bateria</b>. Você receberá notificações apenas quando a aplicação estiver em execução, o serviço em segundo plano NÃO será usado.</string>
-    <string name="it_can_disabled_via_settings_notifications_still_shown"><b>Pode ser desativado nas definições</b> – as notificações ainda serão exibidas enquanto a aplicação estiver em execução.</string>
-    <string name="onboarding_notifications_mode_service_desc"><b>Consome mais bateria</b>! O serviço em segundo plano está sempre em execução - as notificações serão exibidas assim que as mensagens estiverem disponíveis.</string>
-    <string name="settings_audio_video_calls">Chamadas de áudio e vídeo</string>
-    <string name="icon_descr_audio_off">Áudio desligado</string>
-    <string name="impossible_to_recover_passphrase"><b> Por favor note </b>: você NÃO será capaz de recuperar ou alterar a senha se a perder.</string>
-    <string name="audio_video_calls">Chamadas de áudio/vídeo</string>
-    <string name="both_you_and_your_contact_can_send_voice">Tanto você como o seu contato podem enviar mensagens de voz.</string>
-    <string name="calls_prohibited_with_this_contact">Chamadas de áudio/vídeo são proibidas.</string>
-    <string name="notifications_mode_service_desc">O serviço em segundo plano está sempre em execução - as notificações serão exibidas assim que as mensagens estiverem disponíveis.</string>
-    <string name="la_authenticate">Autenticar</string>
-    <string name="scan_QR_code_to_connect_to_contact_who_shows_QR_code"><b>Leia o código QR </b>: para se conectar ao seu contato que lhe mostra o código QR.</string>
-    <string name="callstatus_ended">chamada finalizada <xliff:g id="duration" example="01:15">%1$s</xliff:g></string>
-    <string name="callstatus_calling">a chamar…</string>
-    <string name="callstatus_error">erro de chamada</string>
-    <string name="callstatus_in_progress">chamada em curso</string>
-    <string name="call_already_ended">Chamada já finalizada!</string>
-    <string name="icon_descr_call_progress">Chamada em curso</string>
-    <string name="icon_descr_call_ended">Chamada finalizada</string>
-    <string name="settings_section_title_calls">CHAMADAS</string>
-    <string name="v4_5_transport_isolation_descr">Por perfil de conversa (padrão) ou por ligação (BETA).</string>
-    <string name="cannot_access_keychain">Não é possível aceder à Keystore para salvar a senha da base de dados</string>
-    <string name="invite_prohibited">Não é possível convidar o contato!</string>
-    <string name="icon_descr_cancel_link_preview">cancelar pré-visualização da ligação</string>
-    <string name="call_on_lock_screen">Chamadas no ecrã de bloqueio:</string>
-    <string name="alert_title_cant_invite_contacts">Não é possível convidar contatos!</string>
-    <string name="change_verb">Alterar</string>
-    <string name="cant_delete_user_profile">Não é possível eliminar o perfil do utilizador!</string>
-    <string name="feature_cancelled_item">cancelado %s</string>
-    <string name="cannot_receive_file">Não é possível receber o ficheiro</string>
-    <string name="icon_descr_cancel_image_preview">Cancelar pré-visualização da imagem</string>
-    <string name="icon_descr_cancel_file_preview">Cancelar pré-visualização do ficheiro</string>
-    <string name="cancel_verb">Cancelar</string>
-    <string name="icon_descr_cancel_live_message">Cancelar mensagem ao vivo</string>
-    <string name="use_camera_button">Câmera</string>
-    <string name="snd_conn_event_switch_queue_phase_changing">a alterar endereço…</string>
-    <string name="snd_conn_event_switch_queue_phase_changing_for_member">a alterar o endereço de %s…</string>
-    <string name="chat_database_imported">Base de dados de conversa importada</string>
-    <string name="chat_is_stopped">A conversa está parada</string>
-    <string name="smp_servers_check_address">Verifique o endereço do servidor e tente novamente.</string>
-    <string name="profile_will_be_sent_to_contact_sending_link">O seu perfil será enviado para o contato do qual você recebeu esta ligação.</string>
-    <string name="error_deleting_database">Erro ao eliminar a base de dados de conversa</string>
-    <string name="error_deleting_link_for_group">Erro ao eliminar ligação de grupo</string>
-    <string name="network_session_mode_user">Perfil de conversa</string>
-    <string name="change_lock_mode">Alterar o modo de bloqueio</string>
-    <string name="settings_section_title_chats">CONVERSAS</string>
-    <string name="chat_is_running">Conversa em execução</string>
-    <string name="error_changing_message_deletion">Erro ao alterar configuração</string>
-    <string name="change_database_passphrase_question">Alterar a senha da base de dados\?</string>
-    <string name="chat_is_stopped_indication">A conversa está parada</string>
-    <string name="rcv_group_event_changed_member_role">função alterada de %s para %s</string>
-    <string name="rcv_group_event_changed_your_role">alterou sua função para %s</string>
-    <string name="rcv_conn_event_switch_queue_phase_completed">endereço alterado para si</string>
-    <string name="rcv_conn_event_switch_queue_phase_changing">a alterar endereço…</string>
-    <string name="clear_contacts_selection_button">Limpar</string>
-    <string name="error_creating_link_for_group">Erro ao criar ligação de grupo</string>
-    <string name="change_role">Alterar função</string>
-    <string name="change_member_role_question">Alterar a função no grupo\?</string>
-    <string name="error_changing_role">Erro ao alterar função</string>
-    <string name="chat_preferences_contact_allows">O contato permite</string>
-    <string name="chat_preferences">Preferências de conversa</string>
-    <string name="app_name"><xliff:g id="appName">SimpleX</xliff:g></string>
-    <string name="thousand_abbreviation">m</string>
-    <string name="connect_via_contact_link">Conectar através da ligação de contato\?</string>
-    <string name="connect_via_invitation_link">Conectar via convite de ligação\?</string>
-    <string name="connect_via_group_link">Conectar através da ligação do grupo\?</string>
-    <string name="you_will_join_group">Você irá juntar-se a um grupo ao qual esta ligação se refere e conectar-se aos membros do grupo.</string>
-    <string name="server_error">erro</string>
-    <string name="failed_to_create_user_title">Erro ao criar perfil!</string>
-    <string name="error_adding_members">Erro ao adicionar membro(s)</string>
-    <string name="error_creating_address">Erro ao criar endereço</string>
-    <string name="error_accepting_contact_request">Erro ao aceitar pedido de contato</string>
-    <string name="error_deleting_contact">Erro ao eliminar contato</string>
-    <string name="error_deleting_contact_request">Erro ao eliminar pedido de contato</string>
-    <string name="error_deleting_group">Erro ao eliminar grupo</string>
-    <string name="error_deleting_pending_contact_connection">Erro ao eliminar conexão de contato pendente</string>
-    <string name="error_changing_address">Erro ao alterar endereço</string>
-    <string name="error_deleting_user">Erro ao eliminar perfil de utilizador</string>
-    <string name="database_initialization_error_title">Não é possível inicializar a base de dados</string>
-    <string name="la_change_app_passcode">Alterar código de acesso</string>
-    <string name="chat_with_developers">Converse com os desenvolvedores</string>
-    <string name="icon_descr_server_status_error">Erro</string>
-    <string name="clear_chat_button">Limpar conversa</string>
-    <string name="clear_chat_question">Limpar conversa\?</string>
-    <string name="clear_verb">Limpar</string>
-    <string name="clear_chat_menu_action">Limpar</string>
-    <string name="icon_descr_close_button">Botão fechar</string>
-    <string name="clear_verification">Limpar verificação</string>
-    <string name="v4_6_chinese_spanish_interface">Interface em chinês e espanhol</string>
-    <string name="notifications_mode_periodic_desc">Verifica novas mensagens a cada 10 minutos durante até 1 minuto</string>
-    <string name="confirm_password">Confirmar senha</string>
-    <string name="hidden_profile_password">Senha de perfil oculto</string>
-    <string name="save_profile_password">Salvar senha do perfil</string>
-    <string name="confirm_passcode">Confirme o código de acesso</string>
-    <string name="incorrect_passcode">Código de acesso incorreto</string>
-    <string name="new_passcode">Novo código de acesso</string>
-    <string name="restore_database_alert_desc">Introduza a senha anterior depois de restaurar o backup da base de dados. Esta ação não pode ser revertida.</string>
-    <string name="confirm_database_upgrades">Confirmar atualizações da base de dados</string>
-    <string name="enter_password_to_show">Insira senha para pesquisa</string>
-    <string name="profile_password">Senha do perfil</string>
-    <string name="v4_4_verify_connection_security_desc">Comparar códigos de segurança com os seus contatos.</string>
-    <string name="v4_6_hidden_chat_profiles_descr">Proteja os seus perfis de comversa com uma senha!</string>
-    <string name="la_current_app_passcode">Código de acesso atual</string>
-    <string name="la_enter_app_passcode">Introduza o código de acesso</string>
-    <string name="submit_passcode">Submeter</string>
-    <string name="group_member_status_complete">completar</string>
-    <string name="confirm_new_passphrase">Confirme a nova senha…</string>
-    <string name="configure_ICE_servers">Configurar servidores ICE</string>
-    <string name="confirm_verb">Confirmar</string>
-    <string name="la_no_app_password">Nenhum código de acesso da aplicação</string>
-    <string name="smp_server_test_compare_file">Comparar ficheiro</string>
-    <string name="error_saving_user_password">Erro ao salvar a senha do utilizador</string>
-    <string name="la_please_remember_to_store_password">Por favor, lembre-se ou armazene-a com segurança - não há nenhuma maneira de recuperar uma senha perdida!</string>
-    <string name="set_password_to_export">Definir senha para exportar</string>
-    <string name="connection_request_sent">Pedido de conexão enviado!</string>
-    <string name="create_address">Criar endereço</string>
-    <string name="create_profile_button">Criar</string>
-    <string name="colored">colorido</string>
-    <string name="callstate_connecting">conectando…</string>
-    <string name="icon_descr_call_connecting">Conectando chamada</string>
-    <string name="group_member_status_accepted">conectando (aceite)</string>
-    <string name="group_member_status_announced">conectando (anunciado)</string>
-    <string name="group_member_status_connecting">conectando</string>
-    <string name="icon_descr_contact_checked">Contato verificado</string>
-    <string name="group_link">Ligação de grupo</string>
-    <string name="display_name_connecting">conectando…</string>
-    <string name="display_name_connection_established">conexão estabelecida</string>
-    <string name="connection_error_auth">Erro de conexão (AUTH)</string>
-    <string name="smp_server_test_create_file">Criar ficheiro</string>
-    <string name="group_connection_pending">conectando…</string>
-    <string name="icon_descr_context">Ícone de contexto</string>
-    <string name="copied">Copiado para a área de transferência</string>
-    <string name="to_reveal_profile_enter_password">Para revelar seu perfil oculto, digite uma senha completa num campo de pesquisa na página dos seus perfis de conversa.</string>
-    <string name="server_connecting">conectando</string>
-    <string name="icon_descr_server_status_connected">Conectado</string>
-    <string name="contact_connection_pending">conectando…</string>
-    <string name="connection_timeout">Tempo limite de conexão</string>
-    <string name="contact_requests">Pedidos de contato</string>
-    <string name="contact_preferences">Preferências de contato</string>
-    <string name="notification_preview_somebody">Contato escondido:</string>
-    <string name="alert_title_contact_connection_pending">O contato ainda não está conectado!</string>
-    <string name="notification_preview_mode_contact">Nome do contato</string>
-    <string name="contribute">Contribuir</string>
-    <string name="copy_verb">Copiar</string>
-    <string name="core_version">Versão principal: v%s</string>
-    <string name="archive_created_on_ts">Criado a <xliff:g id="archive_ts">%1$s</xliff:g></string>
-    <string name="create_group_link">Criar ligação de grupo</string>
-    <string name="v4_2_group_links">Ligações de grupo</string>
-    <string name="callstatus_connecting">conectando chamada…</string>
-    <string name="connect_via_link">Conectar via ligação</string>
-    <string name="connection_error">Erro de conexão</string>
-    <string name="connection_local_display_name">conexão <xliff:g id="connection ID" example="1">%1$d</xliff:g></string>
-    <string name="contact_already_exists">O contato já existe</string>
-    <string name="create_one_time_link">Criar convite de ligação de utilização única</string>
-    <string name="one_time_link">Convite de ligação de utilização única</string>
-    <string name="save_servers_button">Salvar</string>
-    <string name="settings_section_title_incognito">Modo anónimo</string>
-    <string name="rcv_group_event_invited_via_your_group_link">convidado através da ligação do seu grupo</string>
-    <string name="invite_prohibited_description">Você está a tentar convidar um contato com quem partilhou um perfil anónimo para o grupo no qual voçê está a usar o seu perfil principal</string>
-    <string name="info_row_connection">Conexão</string>
-    <string name="incognito_info_protects">O modo anónimo protege a privacidade do nome e da imagem do seu perfil principal — para cada novo contato um novo perfil aleatório é criado.</string>
-    <string name="save_color">Salvar cor</string>
-    <string name="description_you_shared_one_time_link">você partilhou ligação de utilização única</string>
-    <string name="description_you_shared_one_time_link_incognito">você partilhou ligação anónima de utilização única</string>
-    <string name="invalid_connection_link">Ligação de conexão inválida</string>
-    <string name="save_verb">Salvar</string>
-    <string name="if_you_received_simplex_invitation_link_you_can_open_in_browser">Se você recebeu convite de ligação do <xliff:g id="appName">SimpleX Chat</xliff:g>, você pode abri-lo no seu navegador:</string>
-    <string name="group_invitation_tap_to_join_incognito">Toque para entrar em modo anónimo</string>
-    <string name="save_passphrase_in_keychain">Salvar senha na Keystore</string>
-    <string name="if_you_cannot_meet_in_person_show_QR_in_video_call_or_via_another_channel">Se não se poderem encontrar pessoalmente, <b>mostre o código QR na chamada de vídeo </b> ou partilhe a ligação.</string>
-    <string name="save_auto_accept_settings">Salvar definições de aceitação automática</string>
-    <string name="auto_accept_contact">Aceitar automaticamente</string>
-    <string name="save_and_update_group_profile">Salvar e atualizar o perfil do grupo</string>
-    <string name="network_options_save">Salvar</string>
-    <string name="incognito_info_find">Para localizar o perfil usado para uma ligação anónima, toque no nome do contato ou grupo na parte superior da conversa.</string>
-    <string name="save_passphrase_and_open_chat">Salvar senha e abrir conversa</string>
-    <string name="save_archive">Salvar arquivo</string>
-    <string name="join_group_incognito_button">Junte-se em modo anónimo</string>
-    <string name="delete_link">Apagar ligação</string>
-    <string name="address_section_title">Endereço</string>
-    <string name="error_updating_link_for_group">Erro ao atualizar a ligação do grupo</string>
-    <string name="save_group_profile">Salvar perfil do grupo</string>
-    <string name="incognito">Anónimo</string>
-    <string name="group_unsupported_incognito_main_profile_sent">O modo anónimo não é suportado aqui - o seu perfil principal será enviado para os membros do grupo</string>
-    <string name="incognito_info_allows">Permite ter muitas ligações anónimos sem nenhum dado partilhado entre elas em nenhum perfil de conversa.</string>
-    <string name="incognito_info_share">Quando você partilha um perfil anónimo com alguém, esse perfil será usado para os grupos para os quais ele o convide.</string>
-    <string name="incognito_random_profile">O seu perfil aleatório</string>
-    <string name="simplex_link_invitation">Convite de ligação única SimpleX</string>
-    <string name="simplex_link_mode_description">Descrição</string>
-    <string name="simplex_link_mode_full">Ligação completa</string>
-    <string name="description_via_contact_address_link_incognito">anónimo via ligação de endereço de contato</string>
-    <string name="simplex_link_mode_browser_warning">Abrir a ligação no navegador pode reduzir a privacidade e a segurança da ligação. As ligações Simplex não confiáveis serão vermelhas.</string>
-    <string name="auth_confirm_credential">Confirmar credenciais</string>
-    <string name="delete_contact_all_messages_deleted_cannot_undo_warning">Contato e todas as mensagens serão eliminadas - esta acção não pode ser revertida!</string>
-    <string name="image_descr_link_preview">ligação de visualização de imagem</string>
-    <string name="invalid_contact_link">Ligação inválida!</string>
-    <string name="read_more_in_user_guide_with_link">Leia mais em <font color="#0088ff">Guia de Utilizador</font>.</string>
-    <string name="network_session_mode_entity">Conexão</string>
-    <string name="create_address_and_let_people_connect">Crie um endereço para permitir que as pessoas se conectem consigo.</string>
-    <string name="save_and_notify_contact">Salvar e notificar contato</string>
-    <string name="save_and_notify_contacts">Salvar e notificar contatos</string>
-    <string name="save_and_notify_group_members">Salvar e notificar membros do grupo</string>
-    <string name="save_preferences_question">Salvar preferências\?</string>
-    <string name="continue_to_next_step">Continuar</string>
-    <string name="learn_more_about_address">Sobre o endereço SimpleX</string>
-    <string name="add_contact">Convite de ligação de utilização única</string>
-    <string name="all_your_contacts_will_remain_connected_update_sent">Todos os seus contatos permanecerão conectados. A atualização do perfil será enviada aos seus contatos.</string>
-    <string name="add_address_to_your_profile">Adicione endereço ao seu perfil, para que os seus contatos possam partilhá-lo com outras pessoas. A atualização do perfil será enviada aos seus contatos.</string>
-    <string name="contacts_can_mark_messages_for_deletion">Os contatos podem marcar mensagens para eliminar; você será capaz de as ver.</string>
-    <string name="share_one_time_link">Criar convite de ligação de utilização única</string>
-    <string name="description_via_one_time_link_incognito">anónimo via ligação de utilização única</string>
-    <string name="description_via_group_link_incognito">anónimo via ligação de grupo</string>
-    <string name="description_via_one_time_link">via ligação de utilização única</string>
-    <string name="alert_title_cant_invite_contacts_descr">Você está a usar um perfil anónimo para este grupo - para impedir a partilha do seu perfil principal não é permitido convidar contatos</string>
-    <string name="one_time_link_short">Ligação para 1 utilização</string>
-    <string name="button_create_group_link">Criar ligação</string>
-    <string name="delete_link_question">Apagar ligação\?</string>
-    <string name="if_you_cannot_meet_in_person_scan_QR_in_video_call_or_ask_for_invitation_link">Se não puderem encontrar-se pessoalmente, você pode <b>ler o código QR na chamada de vídeo </b>, ou o seu contato pode partilhar um convite de ligação.</string>
-    <string name="if_you_cant_meet_in_person">Se não se poderem encontrar pessoalmente, mostre o código QR numa chamada de vídeo ou partilhe a ligação.</string>
-    <string name="people_can_connect_only_via_links_you_share">As pessoas podem se conectar a si apenas por meio das ligações que você partilhe.</string>
-    <string name="please_check_correct_link_and_maybe_ask_for_a_new_one">Verifique se você usou a ligação correta ou peça ao seu contato para enviar outra.</string>
-    <string name="share_link">Partilhar ligação</string>
-    <string name="send_link_previews">Enviar pré-visualizações de ligações</string>
-    <string name="connect_via_link_or_qr_from_clipboard_or_in_person">(ler ou colar da área de transferência)</string>
-    <string name="share_invitation_link">Partilhar ligação de utilização única</string>
-    <string name="read_more_in_github_with_link">Leia mais no nosso repositório <font color="#0088ff">GitHub</font>.</string>
-    <string name="create_profile">Criar perfil</string>
-    <string name="create_your_profile">Criar perfil</string>
-    <string name="num_contacts_selected">%d contato(s) selecionado(s)</string>
-    <string name="users_delete_profile_for">Eliminar perfil de conversa para</string>
-    <string name="full_deletion">Eliminar para todos</string>
-    <string name="ttl_d">%dd</string>
-    <string name="ttl_day">%d dia</string>
-    <string name="ttl_days">%d dias</string>
-    <string name="ttl_h">%dh</string>
-    <string name="delete_member_message__question">Eliminar mensagem do membro\?</string>
-    <string name="delete_message__question">Eliminar mensagem\?</string>
-    <string name="delete_chat_profile_question">Eliminar perfil de conversa\?</string>
-    <string name="delete_files_and_media_for_all_users">Eliminar ficheiros de todos os perfis de conversa</string>
-    <string name="delete_messages">Eliminar mensagens</string>
-    <string name="total_files_count_and_size">%d ficheiros(s) com tamanho total de %s</string>
-    <string name="current_passphrase">Senha atual…</string>
-    <string name="delete_pending_connection__question">Eliminar conexão pendente\?</string>
-    <string name="delete_messages_after">Eliminar mensagens após</string>
-    <string name="users_delete_question">Eliminar perfil de conversa\?</string>
-    <string name="delete_chat_profile">Eliminar perfil de conversa</string>
-    <string name="ttl_hour">%d hora</string>
-    <string name="ttl_hours">%d horas</string>
-    <string name="database_error">erro de base de dados</string>
-    <string name="passphrase_is_different">A senha da base de dados é diferente da guardada na Keystore.</string>
-    <string name="database_passphrase_is_required">A senha da base de dados é necessária para abrir a conversa.</string>
-    <string name="button_delete_group">Eliminar grupo</string>
-    <string name="delete_group_question">Eliminar grupo\?</string>
-    <string name="conn_level_desc_direct">direta</string>
-    <string name="create_secret_group_title">Criar grupo secreto</string>
-    <string name="delete_profile">Eliminar perfil</string>
-    <string name="smp_server_test_create_queue">Criar fila</string>
-    <string name="for_me_only">Eliminar para mim</string>
-    <string name="auth_disable_simplex_lock">Desabilitar o bloqueio do SimpleX</string>
-    <string name="maximum_supported_file_size">Atualmente o tamanho máximo de ficheiro suportado é <xliff:g id="maxFileSize">%1$s</xliff:g>.</string>
-    <string name="button_delete_contact">Eliminar contato</string>
-    <string name="create_group">Criar grupo secreto</string>
-    <string name="smp_servers_delete_server">Eliminar servidor</string>
-    <string name="customize_theme_title">Personalizar tema</string>
-    <string name="delete_image">Eliminar imagem</string>
-    <string name="dont_create_address">Não criar endereço</string>
-    <string name="no_call_on_lock_screen">Desabilitar</string>
-    <string name="database_passphrase">Senha da base de dados</string>
-    <string name="create_simplex_address">Criar endereço SimpleX</string>
-    <string name="info_row_database_id">ID da base de dados</string>
-    <string name="smp_server_test_delete_file">Eliminar ficheiro</string>
-    <string name="delete_contact_question">Eliminar contato\?</string>
-    <string name="settings_section_title_device">DISPOSITIVO</string>
-    <string name="direct_messages">Mensagens diretas</string>
-    <string name="decentralized">Descentralizado</string>
-    <string name="integrity_msg_duplicate">mensagem duplicada</string>
-    <string name="file_with_path">Ficheiro: %s</string>
-    <string name="group_info_member_you">você: <xliff:g id="group_info_you">%1$s</xliff:g></string>
-    <string name="ttl_s">%ds</string>
-    <string name="ttl_sec">%d seg</string>
-    <string name="ttl_w">%dw</string>
-    <string name="failed_to_create_user_duplicate_title">Nome para exibição duplicado!</string>
-    <string name="la_seconds">%d segundos</string>
-    <string name="file_saved">Ficheiro guardado</string>
-    <string name="database_upgrade">Atualização da base de dados</string>
-    <string name="ttl_week">%d semana</string>
-    <string name="ttl_weeks">%d semanas</string>
-    <string name="direct_messages_are_prohibited_in_chat">Mensagens diretas entre membros são proibidas neste grupo.</string>
-    <string name="smp_server_test_delete_queue">Eliminar fila</string>
-    <string name="smp_server_test_download_file">Transferir ficheiro</string>
-    <string name="icon_descr_file">Ficheiro</string>
-    <string name="file_not_found">Ficheiro não encontrado</string>
-    <string name="choose_file">Ficheiro</string>
-    <string name="you_wont_lose_your_contacts_if_delete_address">Você não perderá os seus contatos se eliminar o seu endereço mais tarde.</string>
-    <string name="you_can_hide_or_mute_user_profile">Você pode esconder ou silenciar um perfil de utilizador - pressione-o para o menu.</string>
-    <string name="icon_descr_video_on">Vídeo ligado</string>
-    <string name="xftp_servers">Servidores XFTP</string>
-    <string name="contact_wants_to_connect_via_call"><xliff:g id="contactName" example="Alice"> %1$s </xliff:g> quer conectar-se consigo via</string>
-    <string name="join_group_button">Junte-se</string>
-    <string name="leave_group_button">Sair</string>
-    <string name="leave_group_question">Deixar o grupo\?</string>
-    <string name="rcv_group_event_member_left">esquerda</string>
-    <string name="group_info_section_title_num_members"><xliff:g id="num_members"> %1$s </xliff:g> MEMBROS</string>
-    <string name="button_leave_group">Deixar o grupo</string>
-    <string name="chat_preferences_yes">sim</string>
-    <string name="description_via_group_link">via ligação de grupo</string>
-    <string name="la_immediately">Imediatamente</string>
-    <string name="image_descr">Imagem</string>
-    <string name="video_descr">Vídeo</string>
-    <string name="v4_3_improved_privacy_and_security">Privacidade e segurança melhoradas</string>
-    <string name="group_preview_join_as">junte-se como %s</string>
-    <string name="icon_descr_video_snd_complete">Vídeo enviado</string>
-    <string name="image_saved">Imagem guardada na Galeria</string>
-    <string name="icon_descr_video_call">chamada de vídeo</string>
-    <string name="import_database_question">Importar base de dados de conversa\?</string>
-    <string name="import_database_confirmation">Importar</string>
-    <string name="wrong_passphrase">Senha da base de dados incorreta</string>
-    <string name="group_member_status_left">esquerda</string>
-    <string name="wrong_passphrase_title">Senha errada!</string>
-    <string name="you_will_stop_receiving_messages_from_this_group_chat_history_will_be_preserved">Você deixará de receber mensagens deste grupo. O histórico de mensagens será preservado.</string>
-    <string name="join_group_question">Juntar-se ao grupo\?</string>
-    <string name="v4_2_auto_accept_contact_requests_desc">Com mensagem de boas-vindas opcional.</string>
-    <string name="simplex_link_connection">via <xliff:g id="serverHost" example="smp.simplex.im">%1$s</xliff:g></string>
-    <string name="you_are_already_connected_to_vName_via_this_link">Você já está conectado com <xliff:g id="contactName" example="Alice">%1$s! </xliff:g>.</string>
-    <string name="simplex_service_notification_title"><xliff:g id="appNameFull">SimpleX Chat</xliff:g> service</string>
-    <string name="large_file">Ficheiro grande!</string>
-    <string name="icon_descr_image_snd_complete">Imagem enviada</string>
-    <string name="you_can_connect_to_simplex_chat_founder">Você pode <font color="#0088ff">conectar-se com os desenvolvedores do <xliff:g id="appNameFull">SimpleX Chat</xliff:g> para fazer quaisquer perguntas e receber atualizações</font>.</string>
-    <string name="gallery_image_button">Imagem</string>
-    <string name="gallery_video_button">Vídeo</string>
-    <string name="icon_descr_address">Endereço <xliff:g id="appName">SimpleX</xliff:g></string>
-    <string name="icon_descr_simplex_team">Equipa <xliff:g id="appName">SimpleX</xliff:g></string>
-    <string name="learn_more">Saiba mais</string>
-    <string name="you_can_accept_or_reject_connection">Quando as pessoas solicitam conexão, você pode aceitá-la ou rejeitá-la.</string>
-    <string name="you_can_create_it_later">Você pode criá-lo mais tarde</string>
-    <string name="email_invite_subject">Vamos conversar no SimpleX Chat</string>
-    <string name="icon_descr_video_off">Vídeo desligado</string>
-    <string name="integrity_msg_skipped"><xliff:g id="connection ID" example="1">%1$d</xliff:g> mensagem(s) ignoradas</string>
-    <string name="alert_text_decryption_error_too_many_skipped"><xliff:g id="message count" example="1">%1$d</xliff:g> mensagens ignoradas.</string>
-    <string name="import_database">Importar base de dados</string>
-    <string name="your_settings">As suas definições</string>
-    <string name="settings_section_title_settings">DEFINIÇÕES</string>
-    <string name="share_verb">Partilhar</string>
-    <string name="share_address">Partilhar endereço</string>
-    <string name="icon_descr_settings">Definições</string>
-    <string name="mark_code_verified">Marcar como verificado</string>
-    <string name="delete_group_for_all_members_cannot_undo_warning">O grupo será eliminado para todos os membros - esta ação não pode ser revertida!</string>
-    <string name="delete_group_for_self_cannot_undo_warning">O grupo será eliminado para si - esta ação não pode ser revertida!</string>
-    <string name="member_will_be_removed_from_group_cannot_be_undone">O membro será removido do grupo - esta ação não pode ser revertida!</string>
-    <string name="delete_chat_profile_action_cannot_be_undone_warning">Esta ação não pode ser revertida - o seu perfil, contatos, mensagens e ficheiros serão irreversivelmente perdidos.</string>
-    <string name="enable_automatic_deletion_message">Esta ação não pode ser revertida - as mensagens enviadas e recebidas antes da seleção serão eliminadas. Pode demorar vários minutos.</string>
-    <string name="your_current_chat_database_will_be_deleted_and_replaced_with_the_imported_one">A sua base de dados atual de conversas será ELIMINADA e SUBSTITUÍDA pela importada.
-\nEsta ação não pode ser revertida - o seu perfil, contatos, mensagens e ficheiros serão irreversivelmente perdidos.</string>
-    <string name="mark_unread">Marcar como não lido</string>
-    <string name="group_member_role_member">membro</string>
-    <string name="member_info_section_title_member">MEMBRO</string>
-    <string name="v4_3_voice_messages_desc">Máximo de 40 segundos, recebido instantaneamente.</string>
-    <string name="icon_descr_more_button">Mais</string>
-    <string name="network_and_servers">Rede e servidores</string>
-    <string name="network_settings_title">Definições de rede</string>
-    <string name="settings_section_title_experimenta">EXPERIMENTAL</string>
-    <string name="you_can_start_chat_via_setting_or_by_restarting_the_app">Você pode iniciar a conversa através das Definições da aplicação / Base de Dados ou reiniciando a aplicação.</string>
-    <string name="update_network_settings_confirmation">Atualizar</string>
-    <string name="updating_settings_will_reconnect_client_to_all_servers">A atualização das definições reconectará o cliente a todos os servidores.</string>
-    <string name="v4_5_multiple_chat_profiles">Múltiplos perfis de conversa</string>
-    <string name="v4_5_reduced_battery_usage_descr">Mais melhorias chegam brevemente!</string>
-    <string name="save_settings_question">Salvar definições\?</string>
-    <string name="update_network_settings_question">Atualizar definições de rede\?</string>
-    <string name="v4_6_reduced_battery_usage_descr">Mais melhorias chegam brevemente!</string>
-    <string name="settings_notification_preview_title">Pré-visualização de notificação</string>
-    <string name="message_delivery_error_desc">Muito provavelmente este contato eliminou a conexão consigo.</string>
-    <string name="this_text_is_available_in_settings">Este texto está disponível nas definições</string>
-    <string name="update_onion_hosts_settings_question">Atualizar definições de servidores .onion\?</string>
-    <string name="your_contacts_will_see_it">Os seus contatos no SimpleX irão vê-lo.
-\nVocê pode alterá-lo nas Definições.</string>
-    <string name="onboarding_notifications_mode_subtitle">Pode ser alterado mais tarde através das definições.</string>
-    <string name="settings_section_title_help">AJUDA</string>
-    <string name="settings_section_title_support">SUPORTE SIMPLEX CHAT</string>
-    <string name="settings_experimental_features">Funcionalidades experimentais</string>
-    <string name="settings_section_title_themes">TEMAS</string>
-    <string name="theme_dark">Escuro</string>
-    <string name="dark_theme">Tema escuro</string>
-    <string name="chat_item_ttl_none">nunca</string>
-    <string name="self_destruct_new_display_name">Novo nome para exibição:</string>
-    <string name="new_in_version">Novidades %s</string>
-    <string name="notification_new_contact_request">Novo pedido de contato</string>
-    <string name="new_database_archive">Novo arquivo de base de dados</string>
-    <string name="encrypted_with_random_passphrase">A base de dados está encriptada com uma senha aleatória, você pode alterá-la.</string>
-    <string name="enter_correct_passphrase">Insira a senha correta.</string>
-    <string name="database_backup_can_be_restored">A tentativa de alterar a senha da base de dados não foi concluída.</string>
-    <string name="database_is_not_encrypted">A sua base de dados de conversas não está encriptada - defina a senha para a proteger.</string>
-    <string name="enter_passphrase">Insira a senha…</string>
-    <string name="you_have_to_enter_passphrase_every_time">Você tem que inserir a senha sempre que a aplicação é iniciada - ela não é guardada no dispositivo.</string>
-    <string name="new_passphrase">Nova senha…</string>
-    <string name="remove_passphrase">Remover</string>
-    <string name="remove_passphrase_from_keychain">Remover senha da Keystore\?</string>
-    <string name="enter_correct_current_passphrase">Insira a senha atual correta.</string>
-    <string name="update_database_passphrase">Atualizar senha da base de dados</string>
-    <string name="notification_preview_new_message">nova mensagem</string>
-    <string name="database_passphrase_and_export">Senha da base de dados &amp; exportação</string>
-    <string name="set_password_to_export_desc">A base de dados está encriptada com uma senha aleatória. Por favor, altere-a antes de exportar.</string>
-    <string name="database_passphrase_will_be_updated">A senha de encriptação da base de dados será atualizada.</string>
-    <string name="store_passphrase_securely">Por favor armazene a senha de forma segura, você NÃO será capaz de a alterar se a perder.</string>
-    <string name="database_encryption_will_be_updated">A senha de encriptação da base de dados será atualizada e armazenada na Keystore.</string>
-    <string name="database_will_be_encrypted_and_passphrase_stored">A base de dados será encriptada e a senha armazenada na Keystore.</string>
-    <string name="store_passphrase_securely_without_recover">Por favor armazene a senha de forma segura, você NÃO será capaz de aceder às conversas se a perder.</string>
-    <string name="enter_passphrase_notification_desc">Para receber notificações, por favor, digite a senha da base de dados</string>
-    <string name="network_use_onion_hosts_no_desc">Hosts Onion não serão usados.</string>
-    <string name="network_use_onion_hosts_prefer_desc">Hosts Onion serão usados quando disponíveis.</string>
-    <string name="network_use_onion_hosts_required_desc_in_alert">Hosts Onion serão necessários para a conexão.</string>
-    <string name="video_call_no_encryption">chamada de vídeo (sem encriptação ponta a ponta)</string>
-    <string name="audio_call_no_encryption">chamada de áudio (não encriptada ponta a ponta)</string>
-    <string name="encrypted_audio_call">chamada de áudio encriptada ponta a ponta</string>
-    <string name="encrypted_video_call">chamada de vídeo encriptada ponta a ponta</string>
-    <string name="group_member_role_observer">observador</string>
-    <string name="ok">OK</string>
-    <string name="feature_offered_item">oferecido %s</string>
-    <string name="old_database_archive">Arquivo de base de dados antigo</string>
-    <string name="network_use_onion_hosts_required_desc">Hosts Onion serão necessários para a conexão.</string>
-    <string name="network_use_onion_hosts_prefer_desc_in_alert">Hosts Onion serão usados quando disponíveis.</string>
-    <string name="alert_text_fragment_encryption_out_of_sync_old_database">Pode acontecer quando você ou sua conexão usaram o backup de base de dados antigo.</string>
-    <string name="status_e2e_encrypted">encriptado ponta a ponta</string>
-    <string name="feature_off">desligado</string>
-    <string name="desktop_scan_QR_code_from_app_via_scan_QR_code">💻 desktop: leia o código QR exibido a partir do aplicação, via <b>Ler código QR</b>.</string>
-    <string name="no_spaces">Sem espaços!</string>
-    <string name="status_contact_has_no_e2e_encryption">contato não tem encriptação ponta a ponta</string>
-    <string name="feature_offered_item_with_param">oferecido %s: %2s</string>
-    <string name="chat_preferences_off">desligado</string>
-    <string name="chat_preferences_on">ligado</string>
-    <string name="v4_6_group_moderation_descr">Agora os administradores podem:
-\n- eliminar mensagens de membros.
-\n- desativar membros (função de \"observador\")</string>
-    <string name="simplex_link_group">Ligação do grupo SimpleX</string>
-    <string name="images_limit_desc">Apenas 10 imagens podem ser enviadas ao mesmo tempo</string>
-    <string name="videos_limit_desc">Apenas 10 vídeos podem ser enviados ao mesmo tempo</string>
-    <string name="scan_QR_code">Ler código QR</string>
-    <string name="scan_qr_to_connect_to_contact">Para se conectar, o seu contato pode ler o código QR ou usar o link na aplicação.</string>
-    <string name="scan_code">Ler código</string>
-    <string name="to_verify_compare">Para verificar a encriptação de ponta a ponta com o seu contato, compare (ou leia) o código nos seus dispositivos.</string>
-    <string name="scan_code_from_contacts_app">Ler o código de segurança a partir da aplicação do seu contacto.</string>
-    <string name="smp_servers_scan_qr">Ler o código QR do servidor</string>
-    <string name="network_use_onion_hosts_no_desc_in_alert">Hosts Onion não serão usados.</string>
-    <string name="only_client_devices_store_contacts_groups_e2e_encrypted_messages">Apenas dispositivos cliente armazenam perfis de utilizador, contatos, grupos e mensagens enviadas com <b>encriptação de ponta a ponta de 2 camadas</b>.</string>
-    <string name="status_contact_has_e2e_encryption">contato tem encriptação ponta a ponta</string>
-    <string name="status_no_e2e_encryption">sem encriptação ponta a ponta</string>
-    <string name="group_member_status_creator">criador</string>
-    <string name="custom_time_unit_months">meses</string>
-    <string name="custom_time_unit_weeks">semanas</string>
-    <string name="custom_time_picker_custom">personalizado</string>
-    <string name="custom_time_picker_select">Selecionar</string>
-    <string name="send_disappearing_message_1_minute">1 minuto</string>
-    <string name="send_disappearing_message_30_seconds">30 segundos</string>
-    <string name="send_disappearing_message_5_minutes">5 minutos</string>
-    <string name="send_disappearing_message_custom_time">Horário personalizado</string>
-    <string name="item_info_current">(atual)</string>
-    <string name="custom_time_unit_days">dias</string>
-    <string name="group_member_status_intro_invitation">conectando (convite de apresentação)</string>
-    <string name="custom_time_unit_hours">horas</string>
-    <string name="custom_time_unit_minutes">minutos</string>
-    <string name="custom_time_unit_seconds">segundos</string>
-</resources>

apps/android/app/src/main/res/values-ru/strings.xml

@@ -63,7 +63,7 @@
     <string name="error_receiving_file">Ошибка при получении файла</string>
     <string name="error_creating_address">Ошибка при создании адреса</string>
     <string name="contact_already_exists">Существующий контакт</string>
-    <string name="you_are_already_connected_to_vName_via_this_link">Вы уже соединены с контактом <xliff:g id="contactName" example="Alice">%1$s</xliff:g>.</string>
+    <string name="you_are_already_connected_to_vName_via_this_link">Вы уже соединены с контактом <xliff:g id="contactName" example="Alice">%1$s!</xliff:g>.</string>
     <string name="invalid_connection_link">Ошибка в ссылке контакта</string>
     <string name="please_check_correct_link_and_maybe_ask_for_a_new_one">Пожалуйста, проверьте, что Вы использовали правильную ссылку, или попросите Ваш контакт отправить Вам новую.</string>
     <string name="connection_error_auth">Ошибка соединения (AUTH)</string>
@@ -182,7 +182,7 @@
     <string name="you_have_no_chats">У Вас нет чатов</string>
     <!-- ShareListView.kt -->
     <string name="share_message">Отправить сообщение…</string>
-    <string name="share_image">Поделиться изображением…</string>
+    <string name="share_image">Отправить изображение…</string>
     <string name="share_file">Отправить файл…</string>
     <!-- ComposeView.kt, helpers -->
     <string name="attach">Прикрепить</string>
@@ -330,11 +330,12 @@
     <string name="you_will_be_connected_when_group_host_device_is_online">Соединение с группой будет установлено, когда хост группы будет онлайн. Пожалуйста, подождите или проверьте позже!</string>
     <string name="you_will_be_connected_when_your_connection_request_is_accepted">Соединение будет установлено, когда Ваш запрос будет принят. Пожалуйста, подождите или проверьте позже!</string>
     <string name="you_will_be_connected_when_your_contacts_device_is_online">Соединение будет установлено, когда Ваш контакт будет онлайн. Пожалуйста, подождите или проверьте позже!</string>
+    <string name="show_QR_code_for_your_contact_to_scan_from_the_app__multiline">Ваш контакт может сосканировать QR код в приложении.</string>
     <string name="if_you_cannot_meet_in_person_show_QR_in_video_call_or_via_another_channel">Если Вы не можете встретиться лично, Вы можете <b>показать QR код во время видеозвонка</b> или поделиться ссылкой.</string>
     <string name="your_chat_profile_will_be_sent_to_your_contact">Ваш профиль будет отправлен
 \nВашему контакту</string>
     <string name="if_you_cannot_meet_in_person_scan_QR_in_video_call_or_ask_for_invitation_link">Если Вы не можете встретиться лично, Вы можете <b>сосканировать QR код во время видеозвонка</b>, или Ваш контакт может отправить Вам ссылку.</string>
-    <string name="share_invitation_link">Поделиться одноразовой ссылкой</string>
+    <string name="share_invitation_link">Поделиться ссылкой</string>
     <string name="paste_connection_link_below_to_connect">Чтобы соединиться, вставьте в это поле ссылку, полученную от Вашего контакта.</string>
     <string name="your_profile_will_be_sent">Ваш профиль будет отправлен Вашему контакту</string>
     <!-- PasteToConnect.kt -->
@@ -343,9 +344,10 @@
     <!-- CreateLinkView.kt -->
     <string name="create_one_time_link">Создать одноразовую ссылку</string>
     <string name="one_time_link">Одноразовая ссылка</string>
+    <string name="your_contact_address">Ваш SimpleX адрес</string>
     <!-- settings - SettingsView.kt -->
     <string name="your_settings">Настройки</string>
-    <string name="your_simplex_contact_address">Ваш адрес SimpleX</string>
+    <string name="your_simplex_contact_address">Ваш <xliff:g id="appName">SimpleX</xliff:g> адрес</string>
     <string name="database_passphrase_and_export">Пароль и экспорт базы</string>
     <string name="about_simplex_chat">Информация о <xliff:g id="appNameFull">SimpleX Chat</xliff:g></string>
     <string name="how_to_use_simplex_chat">Как использовать</string>
@@ -394,8 +396,9 @@
     <string name="network_and_servers">Сеть и серверы</string>
     <string name="network_settings">Настройки сети</string>
     <string name="network_settings_title">Настройки сети</string>
+    <string name="network_socks_toggle">Использовать SOCKS прокси (порт 9050)</string>
     <string name="network_enable_socks">Использовать SOCKS прокси?</string>
-    <string name="network_enable_socks_info">Соединяться с серверами через SOCKS прокси через порт %d? Прокси должен быть запущен до включения этой опции.</string>
+    <string name="network_enable_socks_info">Соединяться с серверами через SOCKS прокси через порт 9050? Прокси должен быть запущен до включения этой опции.</string>
     <string name="network_disable_socks">Использовать прямое соединение с Интернет?</string>
     <string name="network_disable_socks_info">Если Вы подтвердите, серверы смогут видеть Ваш IP адрес, а провайдер - с какими серверами Вы соединяетесь.</string>
     <string name="update_onion_hosts_settings_question">Обновить настройки .onion хостов?</string>
@@ -414,8 +417,14 @@
     <string name="create_address">Создать адрес</string>
     <string name="delete_address__question">Удалить адрес?</string>
     <string name="all_your_contacts_will_remain_connected">Все контакты, которые соединились через этот адрес, сохранятся.</string>
+    <string name="you_can_share_your_address_anybody_will_be_able_to_connect">Вы можете использовать Ваш адрес как ссылку или как QR код - кто угодно сможет соединиться с Вами. Вы сможете удалить адрес, сохранив контакты, которые через него соединились.</string>
     <string name="share_link">Поделиться\nссылкой</string>
-    <string name="delete_address">Удалить адрес</string>
+    <string name="delete_address">Удалить\nадрес</string>
+    <!-- AcceptRequestsView.kt -->
+    <string name="contact_requests">Запросы контактов</string>
+    <string name="accept_requests">Принимать запросы</string>
+    <string name="accept_automatically">Автоматически</string>
+    <string name="section_title_welcome_message">ПРИВЕТСТВЕННОЕ СООБЩЕНИЕ</string>
     <!-- User profile details - UserProfileView.kt -->
     <string name="display_name__field">Имя профиля:</string>
     <string name="full_name__field">"Полное имя:</string>
@@ -913,8 +922,8 @@
     <string name="onboarding_notifications_mode_off">Когда приложение запущено</string>
     <string name="onboarding_notifications_mode_periodic">Периодически</string>
     <string name="onboarding_notifications_mode_service">Мгновенно</string>
-    <string name="onboarding_notifications_mode_service_desc"><b>Больше расход батареи</b>! Фоновый сервис постоянно запущен - уведомления будут показаны как только есть сообщения.</string>
-    <string name="onboarding_notifications_mode_periodic_desc"><b>Меньше расход батареи</b>. Фоновый сервис проверяет сообщения каждые 10 минут. Вы можете пропустить звонки и срочные сообщения.</string>
+    <string name="onboarding_notifications_mode_service_desc"><b>Больше расход батареи</b>! Фоновый сервис постоянно запущен - уведомления будут показаны как только есть новые сообщения.</string>
+    <string name="onboarding_notifications_mode_periodic_desc"><b>Меньше расход батареи</b>. Фоновый сервис проверяет новые сообщения каждые 10 минут. Вы можете пропустить звонки и срочные сообщения.</string>
     <string name="onboarding_notifications_mode_subtitle">Можно изменить позже в настройках.</string>
     <string name="live">LIVE</string>
     <string name="send_live_message">Отправить живое сообщение</string>
@@ -1162,7 +1171,7 @@
     <string name="lock_not_enabled">Блокировка SimpleX не включена!</string>
     <string name="alert_title_msg_bad_hash">Ошибка хэш сообщения</string>
     <string name="alert_text_msg_bad_hash">Хэш предыдущего сообщения отличается.</string>
-    <string name="confirm_passcode">Подтвердить код</string>
+    <string name="confirm_passcode">Подтвердить Код</string>
     <string name="incorrect_passcode">Неправильный код</string>
     <string name="lock_after">Заблокировать через</string>
     <string name="lock_mode">Режим блокировки</string>
@@ -1211,136 +1220,4 @@
     <string name="revoke_file__action">Отозвать файл</string>
     <string name="stop_rcv_file__title">Остановить приём файла\?</string>
     <string name="you_can_turn_on_lock">Вы можете включить Блокировку SimpleX через Настройки.</string>
-    <string name="only_you_can_add_message_reactions">Только Вы можете добавлять реакции на сообщения.</string>
-    <string name="both_you_and_your_contact_can_add_message_reactions">И Вы, и Ваш контакт можете добавлять реакции на сообщения.</string>
-    <string name="one_time_link_short">Одноразовая ссылка</string>
-    <string name="simplex_address">Адрес SimpleX</string>
-    <string name="you_can_accept_or_reject_connection">Когда Вы получите запрос на соединение, Вы можете принять или отклонить его.</string>
-    <string name="enabled_self_destruct_passcode">Включить код самоуничтожения</string>
-    <string name="all_app_data_will_be_cleared">Все данные приложения будут удалены.</string>
-    <string name="if_you_enter_self_destruct_code">Если Вы введёте код самоуничтожения при открытии приложения:</string>
-    <string name="self_destruct_new_display_name">Новое имя:</string>
-    <string name="set_passcode">Установить код доступа</string>
-    <string name="edit_history">История</string>
-    <string name="info_menu">Информация</string>
-    <string name="auth_open_chat_profiles">Открыть профили чата</string>
-    <string name="received_message">Полученное сообщение</string>
-    <string name="sent_message">Отправленное сообщение</string>
-    <string name="disappearing_message">Исчезающее сообщение</string>
-    <string name="send_disappearing_message">Отправить исчезающее сообщение</string>
-    <string name="send_disappearing_message_5_minutes">5 минут</string>
-    <string name="send_disappearing_message_custom_time">Пользовательское время</string>
-    <string name="send_disappearing_message_send">Отправить</string>
-    <string name="invite_friends">Пригласить друзей</string>
-    <string name="save_auto_accept_settings">Сохранить настройки автоприема</string>
-    <string name="change_self_destruct_mode">Изменить режим самоуничтожения</string>
-    <string name="change_self_destruct_passcode">Изменить код самоуничтожения</string>
-    <string name="self_destruct">Самоуничтожение</string>
-    <string name="self_destruct_passcode_enabled">Код самоуничтожения включен!</string>
-    <string name="app_passcode_replaced_with_self_destruct">Код доступа в приложение будет заменен кодом самоуничтожения.</string>
-    <string name="enable_self_destruct">Включить код самоуничтожения</string>
-    <string name="self_destruct_passcode">Код самоуничтожения</string>
-    <string name="self_destruct_passcode_changed">Код самоуничтожения изменен!</string>
-    <string name="empty_chat_profile_is_created">Будет создан пустой профиль чата с указанным именем, и приложение откроется в обычном режиме.</string>
-    <string name="if_you_enter_passcode_data_removed">Если Вы введете этот код при открытии приложения, все данные приложения будут безвозвратно удалены!</string>
-    <string name="item_info_current">(текущее)</string>
-    <string name="share_text_database_id">ID базы данных: %d</string>
-    <string name="info_row_moderated_at">Модерировано</string>
-    <string name="share_text_moderated_at">Модерировано: %s</string>
-    <string name="info_row_received_at">Получено</string>
-    <string name="share_text_received_at">Получено: %s</string>
-    <string name="share_text_updated_at">Запись обновлена: %s</string>
-    <string name="current_version_timestamp">%s (текущее)</string>
-    <string name="info_row_sent_at">Отправлено</string>
-    <string name="share_text_sent_at">Отправлено: %s</string>
-    <string name="message_reactions">Реакции на сообщения</string>
-    <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="message_reactions_prohibited_in_this_chat">Реакции на сообщения в этом чате запрещены.</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>
-    <string name="custom_time_unit_seconds">секунд</string>
-    <string name="theme_colors_section_title">ЦВЕТА ТЕМЫ</string>
-    <string name="share_address_with_contacts_question">Поделиться адресом с контактами\?</string>
-    <string name="profile_update_will_be_sent_to_contacts">Обновлённый профиль будет отправлен Вашим контактам.</string>
-    <string name="learn_more_about_address">Об адресе SimpleX</string>
-    <string name="learn_more">Узнать больше</string>
-    <string name="if_you_cant_meet_in_person">Если Вы не можете встретиться лично, покажите QR-код во время видеозвонка или поделитесь ссылкой.</string>
-    <string name="scan_qr_to_connect_to_contact">Чтобы соединиться с Вами, Ваш контакт может отсканировать QR-код или использовать ссылку в приложении.</string>
-    <string name="you_wont_lose_your_contacts_if_delete_address">Вы не потеряете контакты, если позже удалите Ваш адрес.</string>
-    <string name="you_can_share_your_address">Вы можете поделиться своим адресом в виде ссылки или QR-кода - любой может соединиться с Вами.</string>
-    <string name="read_more_in_user_guide_with_link">Узнать больше в <font color="#0088ff">Руководстве пользователя</font>.</string>
-    <string name="your_contacts_will_remain_connected">Ваши контакты сохранятся.</string>
-    <string name="customize_theme_title">Настроить тему</string>
-    <string name="create_address_and_let_people_connect">Создайте адрес, чтобы можно было соединиться с Вами.</string>
-    <string name="all_your_contacts_will_remain_connected_update_sent">Все Ваши контакты сохранятся. Обновленный профиль будет отправлен Вашим контактам.</string>
-    <string name="add_address_to_your_profile">Добавьте адрес в свой профиль, чтобы Ваши контакты могли поделиться им. Профиль будет отправлен Вашим контактам.</string>
-    <string name="create_simplex_address">Создать адрес SimpleX</string>
-    <string name="share_with_contacts">Поделиться с контактами</string>
-    <string name="stop_sharing_address">Прекратить делиться адресом\?</string>
-    <string name="auto_accept_contact">Автоприем</string>
-    <string name="enter_welcome_message_optional">Введите приветственное сообщение... (опционально)</string>
-    <string name="save_settings_question">Сохранить настройки\?</string>
-    <string name="stop_sharing">Прекратить делиться</string>
-    <string name="continue_to_next_step">Продолжить</string>
-    <string name="dont_create_address">Не создавать адрес</string>
-    <string name="you_can_create_it_later">Вы можете создать его позже</string>
-    <string name="your_contacts_will_see_it">Ваши контакты в SimpleX получат этот адрес.
-\nВы можете изменить это в Настройках.</string>
-    <string name="address_section_title">Адрес</string>
-    <string name="enter_welcome_message">Введите приветственное сообщение…</string>
-    <string name="group_welcome_preview">Просмотр</string>
-    <string name="share_address">Поделиться адресом</string>
-    <string name="you_can_share_this_address_with_your_contacts">Вы можете поделиться этим адресом с Вашими контактами, чтобы они могли соединиться с %s.</string>
-    <string name="dark_theme">Темная тема</string>
-    <string name="import_theme">Импорт темы</string>
-    <string name="import_theme_error">Ошибка импорта темы</string>
-    <string name="theme_simplex">SimpleX</string>
-    <string name="color_secondary">Вторичный</string>
-    <string name="color_surface">Меню и диалоги</string>
-    <string name="export_theme">Экспорт темы</string>
-    <string name="color_title">Заголовок</string>
-    <string name="import_theme_error_desc">Убедитесь, что файл имеет правильный формат YAML. Экспортируйте тему, чтобы получить пример файла темы.</string>
-    <string name="color_secondary_variant">Вторичный 2</string>
-    <string name="color_primary_variant">Дополнительный акцент</string>
-    <string name="color_background">Фон</string>
-    <string name="color_received_message">Полученное сообщение</string>
-    <string name="color_sent_message">Отправленное сообщение</string>
-    <string name="whats_new_read_more">Узнать больше</string>
-    <string name="v5_1_message_reactions_descr">Наконец-то, мы их добавили! 🚀</string>
-    <string name="v5_1_japanese_portuguese_interface">Японский и Португальский UI</string>
-    <string name="v5_1_message_reactions">Реакции на сообщения</string>
-    <string name="v5_1_self_destruct_passcode">Код самоуничтожения</string>
-    <string name="v5_1_self_destruct_passcode_descr">Все данные удаляются при его вводе.</string>
-    <string name="v5_1_better_messages">Улучшенные сообщения</string>
-    <string name="v5_1_custom_themes_descr">Настраивайте и делитесь темами.</string>
-    <string name="v5_1_custom_themes">Пользовательские темы</string>
-    <string name="v5_1_better_messages_descr">- голосовые сообщения до 5 минут.
-\n- настройка времени исчезающих сообщений.
-\n- история редактирования.</string>
-    <string name="custom_time_picker_custom">другое</string>
-    <string name="custom_time_unit_days">дней</string>
-    <string name="custom_time_unit_hours">часов</string>
-    <string name="custom_time_unit_minutes">минут</string>
-    <string name="custom_time_unit_months">месяцев</string>
-    <string name="custom_time_picker_select">Выбрать</string>
-    <string name="whats_new_thanks_to_users_contribute_weblate">Благодаря пользователям – добавьте переводы через Weblate!</string>
-    <string name="custom_time_unit_weeks">недель</string>
-    <string name="send_disappearing_message_1_minute">1 минута</string>
-    <string name="send_disappearing_message_30_seconds">30 секунд</string>
-    <string name="share_text_deleted_at">Удалено: %s</string>
-    <string name="info_row_deleted_at">Удалено</string>
-    <string name="info_row_disappears_at">Исчезает</string>
-    <string name="share_text_disappears_at">Исчезает: %s</string>
-    <string name="error_loading_details">Ошибка загрузки информации</string>
-    <string name="error_setting_address">Ошибка установки адреса</string>
-    <string name="email_invite_body">Привет!
-\nСвяжитесь со мной через SimpleX Chat: %s</string>
-    <string name="email_invite_subject">Давайте поговорим в SimpleX Chat</string>
-    <string name="opening_database">Открытие базы данных…</string>
-    <string name="info_row_updated_at">Запись обновлена</string>
 </resources>

apps/android/app/src/main/res/values-zh-rCN/strings.xml

@@ -11,10 +11,10 @@
     <string name="accept_feature">接受</string>
     <string name="chat_item_ttl_month">1个月</string>
     <string name="chat_item_ttl_week">1周</string>
-    <string name="color_primary">强调色</string>
+    <string name="color_primary">色调</string>
     <string name="callstatus_accepted">已接受通话</string>
     <string name="accept">接受</string>
-    <string name="network_enable_socks_info">通过在 %d 端口的 SOCKS 代理访问服务器？启用该选项前必须先启动代理。</string>
+    <string name="network_enable_socks_info">通过 SOCKS 代理访问服务器在端口9050？允许该选项前必须开始代理。</string>
     <string name="smp_servers_add">添加服务器……</string>
     <string name="smp_servers_add_to_another_device">添加另一设备</string>
     <string name="group_member_role_admin">管理员</string>
@@ -23,6 +23,7 @@
     <string name="accept_connection_request__question">接受连接请求？</string>
     <string name="accept_contact_incognito_button">接受隐身聊天</string>
     <string name="v4_2_group_links_desc">管理员可以创建链接以加入群组。</string>
+    <string name="accept_requests">接受请求</string>
     <string name="smp_servers_preset_add">添加预设服务器</string>
     <string name="connect_via_link">通过链接连接</string>
     <string name="display_name_connection_established">已建立连接</string>
@@ -62,23 +63,23 @@
     <string name="delete_message__question">删除消息？</string>
     <string name="delete_messages">删除消息</string>
     <string name="info_row_connection">连接</string>
-    <string name="connect_via_invitation_link">通过邀请链接进行连接？</string>
-    <string name="connect_via_contact_link">通过联系人链接进行连接？</string>
+    <string name="connect_via_invitation_link">通过邀请链接连接？</string>
+    <string name="connect_via_contact_link">通过联系人链接连接？</string>
     <string name="connect_via_group_link">通过群组链接连接？</string>
     <string name="connect_via_link_or_qr">通过群组链接/二维码连接</string>
-    <string name="always_use_relay">总是通过中继连接</string>
+    <string name="always_use_relay">通过中继连接</string>
     <string name="allow_your_contacts_irreversibly_delete">允许您的联系人不可撤回地删除已发送消息。</string>
     <string name="chat_preferences_contact_allows">联系人允许</string>
     <string name="allow_voice_messages_only_if">仅有您的联系人许可后才允许语音消息。</string>
     <string name="group_info_member_you">您: <xliff:g id="group_info_you">%1$s</xliff:g></string>
     <string name="allow_your_contacts_to_send_voice_messages">允许您的联系人发送语音消息。</string>
-    <string name="chat_preferences_always">始终</string>
-    <string name="notifications_mode_service">始终开启</string>
+    <string name="chat_preferences_always">一直</string>
+    <string name="notifications_mode_service">一直开启</string>
     <string name="allow_your_contacts_to_send_disappearing_messages">允许您的联系人发送限时消息。</string>
     <string name="app_version_code">应用程序构建：%s</string>
     <string name="all_your_contacts_will_remain_connected">所有联系人会保持连接。</string>
     <string name="allow_verb">允许</string>
-    <string name="allow_direct_messages">允许向成员发送私信。</string>
+    <string name="allow_direct_messages">允许直接发送消息给成员。</string>
     <string name="allow_to_send_disappearing">允许发送限时消息。</string>
     <string name="delete_address">删除地址</string>
     <string name="delete_chat_archive_question">删除聊天档案？</string>
@@ -98,9 +99,9 @@
     <string name="app_version_title">应用程序版本</string>
     <string name="full_backup">应用程序数据备份</string>
     <string name="settings_section_title_icon">应用程序图标</string>
-    <string name="incognito_random_profile_from_contact_description">一个随机个人资料将被发送至给予您链接的联系人那里</string>
+    <string name="incognito_random_profile_from_contact_description">随机配置文件将发送给您从中收到此链接的联系人</string>
     <string name="app_version_name">应用程序版本：v%s</string>
-    <string name="notifications_mode_off_desc">应用程序仅在运行时可以接受通知，没有后台服务会被启动</string>
+    <string name="notifications_mode_off_desc">仅在运行时应用程序可以接受通知，不会启动后台服务</string>
     <string name="incognito_random_profile_description">一个随机资料将发送给您的联系人</string>
     <string name="auth_unavailable">身份验证不可用</string>
     <string name="auto_accept_images">自动接受图像</string>
@@ -111,8 +112,9 @@
     <string name="integrity_msg_bad_hash">错误消息散列</string>
     <string name="integrity_msg_bad_id">错误消息 ID</string>
     <string name="settings_audio_video_calls">语音和视频通话</string>
-    <string name="turning_off_service_and_periodic">启用电池优化，关闭了后台服务和对新消息的定期请求。您可以在设置里重新启用它们。</string>
-    <string name="notifications_mode_service_desc">后台服务始终运行——一旦有消息，就会显示通知。</string>
+    <string name="accept_automatically">自动</string>
+    <string name="turning_off_service_and_periodic">激活电池优化，关闭了后台服务和新消息的定期请求。您可以通过设置重新启用它们。</string>
+    <string name="notifications_mode_service_desc">后台服务一直在运行——一旦有消息，就会显示通知。</string>
     <string name="icon_descr_audio_off">关闭音频</string>
     <string name="icon_descr_audio_on">开启音频</string>
     <string name="icon_descr_asked_to_receive">已要求接收图片</string>
@@ -121,14 +123,14 @@
 \n&lt;b&gt;请注意&lt;/b&gt;：如果您有很多连接，您的电池和流量消耗可能会大大增加，并且某些连接可能会失败。</string>
     <string name="back">返回</string>
     <string name="add_new_contact_to_create_one_time_QR_code"><b>添加新联系人</b>：为您的联系人创建一次性二维码。</string>
-    <string name="onboarding_notifications_mode_off_desc"><b> 最长续航 </b>。您只会在应用程序运行时收到通知（无后台服务）。</string>
-    <string name="onboarding_notifications_mode_periodic_desc"><b> 较长续航 </b>。后台服务每 10 分钟检查一次消息。您可能会错过来电或者紧急信息。</string>
+    <string name="onboarding_notifications_mode_off_desc"><b> 最适合电池 </b>。您只会在应用程序运行时收到通知，不会使用后台服务。</string>
+    <string name="onboarding_notifications_mode_periodic_desc"><b> 适合于电池 </b>。后台服务每 10 分钟检查一次新消息。您可能会错过来电和紧急信息。</string>
     <string name="bold">加粗</string>
     <string name="both_you_and_your_contacts_can_delete">您和您的联系人都可以不可逆转地删除已发送的消息。</string>
     <string name="both_you_and_your_contact_can_send_disappearing">您和您的联系人都可以发送限时消息。</string>
     <string name="both_you_and_your_contact_can_send_voice">您和您的联系人都可以发送语音消息。</string>
-    <string name="it_can_disabled_via_settings_notifications_still_shown"><b> 可以在设置里禁用它 </b> - 应用程序运行时仍会显示通知。</string>
-    <string name="onboarding_notifications_mode_service_desc"><b> 使用更多电量 </b>！后台服务始终运行——一旦收到消息，就会显示通知。</string>
+    <string name="it_can_disabled_via_settings_notifications_still_shown"><b> 可以通过设置禁用它 </b> - 应用程序运行时仍会显示通知。</string>
+    <string name="onboarding_notifications_mode_service_desc"><b> 使用更多电池 </b>！后台服务一直在运行——一旦收到消息，就会显示通知。</string>
     <string name="impossible_to_recover_passphrase"><b>请注意</b>：如果您丢失密码，您将无法恢复或者更改密码。</string>
     <string name="call_already_ended">通话已结束！</string>
     <string name="scan_QR_code_to_connect_to_contact_who_shows_QR_code"><b>扫描二维码</b> ：与向您展示二维码的联系人联系。</string>
@@ -158,9 +160,9 @@
     <string name="change_role">改变角色</string>
     <string name="change_member_role_question">更改群组角色？</string>
     <string name="icon_descr_cancel_link_preview">取消链接预览</string>
-    <string name="snd_conn_event_switch_queue_phase_changing_for_member">正在为 %s 更改地址……</string>
-    <string name="rcv_conn_event_switch_queue_phase_changing">更改地址……</string>
-    <string name="snd_conn_event_switch_queue_phase_changing">正在更改地址……</string>
+    <string name="snd_conn_event_switch_queue_phase_changing_for_member">为 %s 更改地址中……</string>
+    <string name="rcv_conn_event_switch_queue_phase_changing">更改地址中……</string>
+    <string name="snd_conn_event_switch_queue_phase_changing">更改地址……</string>
     <string name="create_your_profile">创建您的资料</string>
     <string name="chat_database_deleted">聊天数据库已删除</string>
     <string name="chat_database_imported">聊天数据库已导入</string>
@@ -170,7 +172,7 @@
     <string name="chat_console">聊天控制台</string>
     <string name="chat_database_section">聊天数据库</string>
     <string name="chat_is_stopped_indication">聊天已停止</string>
-    <string name="chat_is_running">聊天运行中</string>
+    <string name="chat_is_running">聊天进行中</string>
     <string name="chat_is_stopped">聊天已停止</string>
     <string name="contact_preferences">联系人偏好设置</string>
     <string name="your_preferences">您的偏好设置</string>
@@ -239,7 +241,7 @@
     <string name="choose_file">文件</string>
     <string name="network_session_mode_user">聊天资料</string>
     <string name="v4_5_transport_isolation_descr">按聊天资料（默认）或按连接（BETA）。</string>
-    <string name="smp_servers_check_address">检查服务器地址并重试。</string>
+    <string name="smp_servers_check_address">检查服务器地址并再试一次。</string>
     <string name="clear_verification">清除验证</string>
     <string name="icon_descr_close_button">关闭按键</string>
     <string name="configure_ICE_servers">配置 ICE 服务器</string>
@@ -251,7 +253,7 @@
     <string name="notification_contact_connected">已连接</string>
     <string name="server_connecting">连接中</string>
     <string name="group_member_status_connecting">连接中</string>
-    <string name="notifications_mode_periodic_desc">每10分钟检查一次新消息，最长检查1分钟</string>
+    <string name="notifications_mode_periodic_desc">每10分钟检查一次新消息，最长1分钟</string>
     <string name="rcv_group_event_member_connected">已连接</string>
     <string name="v4_4_verify_connection_security_desc">与您的联系人比较安全码。</string>
     <string name="incoming_audio_call">语音通话来电</string>
@@ -285,7 +287,7 @@
     <string name="display_name_cannot_contain_whitespace">显示名不能包含空格。</string>
     <string name="decentralized">分散式</string>
     <string name="immune_to_spam_and_abuse">不受垃圾和骚扰消息影响</string>
-    <string name="encrypted_video_call">端到端加密视频通话</string>
+    <string name="encrypted_video_call">端到端加密语音通话</string>
     <string name="ignore">忽视</string>
     <string name="incoming_video_call">视频通话来电</string>
     <string name="no_call_on_lock_screen">禁用</string>
@@ -326,6 +328,7 @@
     <string name="delete_contact_all_messages_deleted_cannot_undo_warning">联系人和所有的消息都将被删除——这是不可逆回的！</string>
     <string name="notification_preview_mode_contact">联系人姓名</string>
     <string name="group_member_status_intro_invitation">连接（介绍邀请）</string>
+    <string name="contact_requests">联系人请求</string>
     <string name="callstate_connecting">连接中……</string>
     <string name="contacts_can_mark_messages_for_deletion">联系人可以将信息标记为删除；您将可以查看这些信息。</string>
     <string name="contribute">贡献</string>
@@ -333,7 +336,7 @@
     <string name="notification_preview_somebody">联系人已隐藏：</string>
     <string name="alert_title_contact_connection_pending">联系人尚未连接！</string>
     <string name="icon_descr_context">上下文图标</string>
-    <string name="copied">已复制到剪贴板</string>
+    <string name="copied">复制到剪贴板</string>
     <string name="contact_connection_pending">连接中……</string>
     <string name="create_group_link">创建群组链接</string>
     <string name="create_group">创建私密群组</string>
@@ -363,13 +366,13 @@
     <string name="core_version">核心版本: v%s</string>
     <string name="display_name__field">显示名：</string>
     <string name="full_name__field">全名：</string>
-    <string name="display_name">显示名</string>
+    <string name="display_name">显示名。</string>
     <string name="full_name_optional__prompt">全名（可选）</string>
     <string name="callstate_ended">已结束</string>
     <string name="group_member_status_group_deleted">群组已删除</string>
     <string name="delete_group_for_all_members_cannot_undo_warning">将为所有成员删除群组——此操作无法撤消！</string>
     <string name="conn_level_desc_direct">直接</string>
-    <string name="direct_messages">私信</string>
+    <string name="direct_messages">直接信息</string>
     <string name="feature_enabled">已启用</string>
     <string name="group_members_can_send_voice">群组成员可以发送语音消息。</string>
     <string name="v4_2_group_links">群组链接</string>
@@ -438,7 +441,7 @@
     <string name="icon_descr_flip_camera">翻转相机</string>
     <string name="enable_automatic_deletion_question">启用自动删除消息？</string>
     <string name="section_title_for_console">用于控制台</string>
-    <string name="direct_messages_are_prohibited_in_chat">此群中禁止成员之间私信。</string>
+    <string name="direct_messages_are_prohibited_in_chat">此群中禁止成员之间私聊。</string>
     <string name="disappearing_messages_are_prohibited">该组禁止限时消息。</string>
     <string name="group_members_can_delete">群组成员可以不可撤回地删除已发送的消息。</string>
     <string name="group_members_can_send_dms">群组成员可以私信。</string>
@@ -513,6 +516,7 @@
     <string name="you_must_use_the_most_recent_version_of_database">您只能在一台设备上使用最新版本的聊天数据库，否则您可能会停止接收来自某些联系人的消息。</string>
     <string name="new_passphrase">新密码……</string>
     <string name="member_role_will_be_changed_with_notification">该角色将更改为“%s”。群组中每个人都会收到通知。</string>
+    <string name="your_contact_address">您的联系人地址</string>
     <string name="chat_lock">SimpleX 锁定</string>
     <string name="periodic_notifications">定期通知</string>
     <string name="notifications_mode_periodic">定期启动</string>
@@ -589,7 +593,7 @@
     <string name="icon_descr_call_pending_sent">待定来电</string>
     <string name="connection_error_auth_desc">除非您的联系人已删除此连接或此链接已被使用，否则它可能是一个错误——请报告。
 \n如果要连接，请让您的联系人创建另一个连接链接，并检查您的网络连接是否稳定。</string>
-    <string name="you_are_already_connected_to_vName_via_this_link">您已经连接到 <xliff:g id="contactName" example="Alice">%1$s</xliff:g>。</string>
+    <string name="you_are_already_connected_to_vName_via_this_link">您已经连接到 <xliff:g id="contactName" example="Alice">%1$s!</xliff:g>。</string>
     <string name="your_chat_profile_will_be_sent_to_your_contact">您的聊天资料将被发送
 \n给您的联系人</string>
     <string name="users_delete_with_connections">资料和服务器连接</string>
@@ -802,7 +806,7 @@
     <string name="v4_4_french_interface_descr">感谢用户——通过 Weblate 做出贡献！</string>
     <string name="v4_5_transport_isolation">传输隔离</string>
     <string name="paste_connection_link_below_to_connect">将您收到的链接粘贴到下面的框中以与您的联系人联系。</string>
-    <string name="share_invitation_link">分享一次性链接</string>
+    <string name="share_invitation_link">分享邀请链接</string>
     <string name="this_string_is_not_a_connection_link">此字符串不是连接链接！</string>
     <string name="send_us_an_email">给我们发电子邮件</string>
     <string name="smp_servers">SMP 服务器</string>
@@ -826,7 +830,7 @@
     <string name="switch_verb">转变</string>
     <string name="prohibit_sending_voice_messages">禁止发送语音消息。</string>
     <string name="only_your_contact_can_send_voice">只有您的联系人可以发送语音消息。</string>
-    <string name="prohibit_direct_messages">禁止向成员发送私信。</string>
+    <string name="prohibit_direct_messages">禁止直接向成员发送私信。</string>
     <string name="protect_app_screen">保护应用程序屏幕</string>
     <string name="settings_section_title_themes">主题</string>
     <string name="stop_chat_to_enable_database_actions">停止聊天以启用数据库操作。</string>
@@ -872,6 +876,7 @@
     <string name="you_will_be_connected_when_your_contacts_device_is_online">当您的联系人设备在线时，您将可以连接，请稍等或稍后查看！</string>
     <string name="rate_the_app">评价此应用程序</string>
     <string name="network_enable_socks">使用 SOCKS 代理？</string>
+    <string name="network_socks_toggle">使用 SOCKS 代理（端口 9050）</string>
     <string name="total_files_count_and_size">%d 个文件，总大小为 %s</string>
     <string name="you_joined_this_group">您已加入此群组</string>
     <string name="you_are_invited_to_group">您被邀请加入群组</string>
@@ -886,7 +891,9 @@
     <string name="icon_descr_simplex_team"><xliff:g id="appName">SimpleX</xliff:g> 团队</string>
     <string name="group_info_section_title_num_members"><xliff:g id="num_members">%1$s</xliff:g> 成员</string>
     <string name="chat_preferences_yes">是</string>
+    <string name="you_can_share_your_address_anybody_will_be_able_to_connect">您可以将您的地址作为链接或二维码共享——任何人都可以连接到您。 如果您以后删除它，您不会丢失您的联系人。</string>
     <string name="you_control_servers_to_receive_your_contacts_to_send">您可以控制通过哪些服务器<b>接收</b>消息，您的联系人 - 您用来向他们发送消息的服务器。</string>
+    <string name="show_QR_code_for_your_contact_to_scan_from_the_app__multiline">您的联系人可以从应用程序中扫描二维码。</string>
     <string name="you_will_be_connected_when_group_host_device_is_online">您将在组主设备上线时连接到该群组，请稍等或稍后再检查！</string>
     <string name="auth_you_will_be_required_to_authenticate_when_you_start_or_resume">当您启动应用或在应用程序驻留后台超过30 秒后，您将需要进行身份验证。</string>
     <string name="archive_created_on_ts">创建于 <xliff:g id="archive_ts">%1$s</xliff:g></string>
@@ -908,7 +915,7 @@
     <string name="alert_text_connection_pending_they_need_to_be_online_can_delete_and_retry">您的联系人需要在线才能完成连接。
 \n您可以取消此连接并删除联系人（稍后尝试使用新链接）。</string>
     <string name="image_descr_simplex_logo"><xliff:g id="appName">SimpleX</xliff:g> 标志</string>
-    <string name="your_simplex_contact_address">您的 SimpleX 地址</string>
+    <string name="your_simplex_contact_address">您的 <xliff:g id="appName">SimpleX</xliff:g> 联系地址</string>
     <string name="install_simplex_chat_for_terminal">为终端安装 <xliff:g id="appNameFull">SimpleX Chat</xliff:g></string>
     <string name="use_simplex_chat_servers__question">使用 <xliff:g id="appNameFull">SimpleX Chat</xliff:g> 服务器？</string>
     <string name="we_do_not_store_contacts_or_messages_on_servers">我们不会在服务器上存储您的任何联系人或消息（一旦发送）。</string>
@@ -935,6 +942,7 @@
     <string name="network_use_onion_hosts">使用 .onion 主机</string>
     <string name="your_ICE_servers">您的 ICE 服务器</string>
     <string name="core_simplexmq_version">simplexmq: v%s (%2s)</string>
+    <string name="section_title_welcome_message">欢迎消息</string>
     <string name="you_control_your_chat">您的聊天由您掌控！</string>
     <string name="you_can_use_markdown_to_format_messages__prompt">您可以使用 markdown 来编排消息格式：</string>
     <string name="ttl_h">%dh</string>
@@ -1007,10 +1015,10 @@
     <string name="v4_6_chinese_spanish_interface_descr">感谢用户——通过 Weblate 做出贡献！</string>
     <string name="should_be_at_least_one_visible_profile">应该至少有一个可见的用户资料。</string>
     <string name="user_unmute">解除静音</string>
-    <string name="button_welcome_message">欢迎消息</string>
+    <string name="button_welcome_message">欢迎信息</string>
     <string name="you_will_still_receive_calls_and_ntfs">当静音配置文件处于活动状态时，您仍会收到来自静音配置文件的电话和通知。</string>
     <string name="you_can_hide_or_mute_user_profile">您可以隐藏或静音用户配置文件——长按以显示菜单。</string>
-    <string name="group_welcome_title">欢迎消息</string>
+    <string name="group_welcome_title">欢迎信息</string>
     <string name="confirm_database_upgrades">确认数据库升级</string>
     <string name="settings_section_title_experimenta">实验性</string>
     <string name="database_upgrade">数据库升级</string>
@@ -1126,57 +1134,7 @@
     <string name="both_you_and_your_contact_can_make_calls">您和您的联系人都可以拨打电话。</string>
     <string name="only_you_can_make_calls">只有您可以拨打电话。</string>
     <string name="only_your_contact_can_make_calls">只有您的联系人可以拨打电话。</string>
-    <string name="allow_your_contacts_to_call">允许您的联系人与您进行语音通话。</string>
-    <string name="allow_calls_only_if">仅当您的联系人许可时才允许呼叫。</string>
+    <string name="allow_your_contacts_to_call">允许您的联系人给您打电话。</string>
+    <string name="allow_calls_only_if">仅当您的联系人允许时才允许呼叫。</string>
     <string name="calls_prohibited_with_this_contact">禁止音频/视频通话。</string>
-    <string name="send_disappearing_message_1_minute">1分钟</string>
-    <string name="one_time_link_short">一次性链接</string>
-    <string name="both_you_and_your_contact_can_add_message_reactions">您和您的联系人都可以添加消息回应。</string>
-    <string name="allow_message_reactions">允许消息回应。</string>
-    <string name="allow_message_reactions_only_if">只有您的联系人允许时才允许消息回应。</string>
-    <string name="app_passcode_replaced_with_self_destruct">应用程序密码被替换为自毁密码。</string>
-    <string name="change_self_destruct_mode">更改自毁模式</string>
-    <string name="learn_more_about_address">关于 SimpleX 地址</string>
-    <string name="continue_to_next_step">继续</string>
-    <string name="all_your_contacts_will_remain_connected_update_sent">您的所有联系人将保持连接。个人资料更新将发送给您的联系人。</string>
-    <string name="auto_accept_contact">自动接受</string>
-    <string name="color_secondary_variant">额外的次要</string>
-    <string name="color_background">背景</string>
-    <string name="send_disappearing_message_5_minutes">5分钟</string>
-    <string name="send_disappearing_message_30_seconds">30秒</string>
-    <string name="address_section_title">地址</string>
-    <string name="add_address_to_your_profile">将地址添加到您的个人资料，以便您的联系人可以与其他人共享。个人资料更新将发送给您的联系人。</string>
-    <string name="allow_your_contacts_adding_message_reactions">允许您的联系人添加消息回应。</string>
-    <string name="color_primary_variant">额外的强调色</string>
-    <string name="all_app_data_will_be_cleared">已删除所有应用程序数据。</string>
-    <string name="empty_chat_profile_is_created">已创建一个包含所提供名字的空白聊天资料，应用程序照常打开。</string>
-    <string name="change_self_destruct_passcode">更改自毁密码</string>
-    <string name="self_destruct_passcode">自毁密码</string>
-    <string name="error_loading_details">加载细节错误</string>
-    <string name="send_disappearing_message_custom_time">自定义时间</string>
-    <string name="disappearing_message">限时消息</string>
-    <string name="enable_self_destruct">启用自毁功能</string>
-    <string name="enabled_self_destruct_passcode">启用自毁密码</string>
-    <string name="self_destruct">自毁</string>
-    <string name="share_text_database_id">数据库 ID：%d</string>
-    <string name="info_row_disappears_at">消失在</string>
-    <string name="error_setting_address">设置地址错误</string>
-    <string name="customize_theme_title">自定义主题</string>
-    <string name="create_address_and_let_people_connect">创建一个地址，让人们与您联系。</string>
-    <string name="create_simplex_address">创建 SimpleX 地址</string>
-    <string name="enter_welcome_message_optional">输入欢迎消息……（可选）</string>
-    <string name="dont_create_address">不创建地址</string>
-    <string name="enter_welcome_message">输入欢迎消息……</string>
-    <string name="dark_theme">深色主题</string>
-    <string name="export_theme">导出主题</string>
-    <string name="v5_1_self_destruct_passcode_descr">所有数据在输入后将被删除。</string>
-    <string name="v5_1_better_messages">更好的消息</string>
-    <string name="v5_1_custom_themes_descr">自定义和分享主题色。</string>
-    <string name="v5_1_custom_themes">自定义主题</string>
-    <string name="custom_time_unit_days">天</string>
-    <string name="custom_time_picker_custom">自定义</string>
-    <string name="item_info_current">（当前）</string>
-    <string name="info_row_deleted_at">已删除在</string>
-    <string name="share_text_deleted_at">已删除在：%s</string>
-    <string name="share_text_disappears_at">消失在：%s</string>
 </resources>