Merge branch 'master' into master-android

2024-12-17 17:20:21 +01:00 · 2024-08-22 12:24:03 +01:00
parent c9f5066c60 a95415fa1a
commit 6c3fd9b428
37 changed files with 3085 additions and 357 deletions
@@ -49,7 +49,9 @@ object ThemeManager {
      return perUserTheme
    }
    val defaultTheme = defaultActiveTheme(appSettingsTheme)
-    return ThemeModeOverride(colors = defaultTheme?.colors ?: ThemeColors(), wallpaper = defaultTheme?.wallpaper)
+    return ThemeModeOverride(colors = defaultTheme?.colors ?: ThemeColors(), wallpaper = defaultTheme?.wallpaper
+      // Situation when user didn't change global theme at all (it is not saved yet). Using defaults
+      ?: ThemeWallpaper.from(PresetWallpaper.SCHOOL.toType(CurrentColors.value.base), null, null))
  }

  fun currentColors(themeOverridesForType: WallpaperType?, perChatTheme: ThemeModeOverride?, perUserTheme: ThemeModeOverrides?, appSettingsTheme: List<ThemeOverrides>): ActiveTheme {
@@ -111,53 +111,59 @@ fun CreateFirstProfile(chatModel: ChatModel, close: () -> Unit) {
  val scrollState = rememberScrollState()
  val keyboardState by getKeyboardState()
  var savedKeyboardState by remember { mutableStateOf(keyboardState) }
-
-  ProvideWindowInsets(windowInsetsAnimationsEnabled = true) {
-    Column(
-      modifier = Modifier
-        .fillMaxSize()
-        .themedBackground(),
-      horizontalAlignment = Alignment.CenterHorizontally
-    ) {
-      CloseSheetBar(close = {
-        if (chatModel.users.none { !it.user.hidden }) {
-          appPrefs.onboardingStage.set(OnboardingStage.Step1_SimpleXInfo)
-        } else {
-          close()
-        }
-      })
-      BackHandler(onBack = {
-        appPrefs.onboardingStage.set(OnboardingStage.Step1_SimpleXInfo)
-      })
-
-      ColumnWithScrollBar(
-        modifier = if (appPlatform.isAndroid) Modifier.fillMaxSize() else Modifier.widthIn(max = 600.dp).fillMaxHeight(),
+  val handler = remember { AppBarHandler() }
+  CompositionLocalProvider(
+    LocalAppBarHandler provides handler
+  ) {
+    ProvideWindowInsets(windowInsetsAnimationsEnabled = true) {
+      Column(
+        modifier = Modifier
+          .fillMaxSize()
+          .themedBackground(),
+        horizontalAlignment = Alignment.CenterHorizontally
      ) {
-        val displayName = rememberSaveable { mutableStateOf("") }
-        val focusRequester = remember { FocusRequester() }
-        Column(Modifier.padding(horizontal = DEFAULT_PADDING)) {
-          AppBarTitle(stringResource(MR.strings.create_profile), bottomPadding = DEFAULT_PADDING)
-          ProfileNameField(displayName, stringResource(MR.strings.display_name), { it.trim() == mkValidName(it) }, focusRequester)
-          Spacer(Modifier.height(DEFAULT_PADDING))
-          ReadableText(MR.strings.your_profile_is_stored_on_your_device, TextAlign.Start, padding = PaddingValues(), style = MaterialTheme.typography.body1.copy(color = MaterialTheme.colors.secondary))
-          ReadableText(MR.strings.profile_is_only_shared_with_your_contacts, TextAlign.Start, style = MaterialTheme.typography.body1.copy(color = MaterialTheme.colors.secondary))
-        }
-        Spacer(Modifier.fillMaxHeight().weight(1f))
-        Column(Modifier.widthIn(max = if (appPlatform.isAndroid) 450.dp else 1000.dp).align(Alignment.CenterHorizontally), horizontalAlignment = Alignment.CenterHorizontally) {
-          OnboardingActionButton(
-            if (appPlatform.isAndroid) Modifier.padding(horizontal = DEFAULT_PADDING * 2).fillMaxWidth() else Modifier.widthIn(min = 300.dp),
-            labelId = MR.strings.create_profile_button,
-            onboarding = null,
-            enabled = canCreateProfile(displayName.value),
-            onclick = { createProfileOnboarding(chat.simplex.common.platform.chatModel, displayName.value, close) }
-          )
-          // Reserve space
-          TextButtonBelowOnboardingButton("", null)
-        }
+        CloseSheetBar(close = {
+          if (chatModel.users.none { !it.user.hidden }) {
+            appPrefs.onboardingStage.set(OnboardingStage.Step1_SimpleXInfo)
+          } else {
+            close()
+          }
+        })
+        BackHandler(onBack = {
+          appPrefs.onboardingStage.set(OnboardingStage.Step1_SimpleXInfo)
+        })

-        LaunchedEffect(Unit) {
-          delay(300)
-          focusRequester.requestFocus()
+        ColumnWithScrollBar(
+          modifier = Modifier.fillMaxSize()
+        ) {
+          val displayName = rememberSaveable { mutableStateOf("") }
+          val focusRequester = remember { FocusRequester() }
+          Column(if (appPlatform.isAndroid) Modifier.fillMaxSize().padding(horizontal = DEFAULT_PADDING) else Modifier.widthIn(max = 600.dp).fillMaxHeight().padding(horizontal = DEFAULT_PADDING).align(Alignment.CenterHorizontally)) {
+            Box(Modifier.align(Alignment.CenterHorizontally)) {
+              AppBarTitle(stringResource(MR.strings.create_profile), bottomPadding = DEFAULT_PADDING, withPadding = false)
+            }
+            ProfileNameField(displayName, stringResource(MR.strings.display_name), { it.trim() == mkValidName(it) }, focusRequester)
+            Spacer(Modifier.height(DEFAULT_PADDING))
+            ReadableText(MR.strings.your_profile_is_stored_on_your_device, TextAlign.Start, padding = PaddingValues(), style = MaterialTheme.typography.body1.copy(color = MaterialTheme.colors.secondary))
+            ReadableText(MR.strings.profile_is_only_shared_with_your_contacts, TextAlign.Start, style = MaterialTheme.typography.body1.copy(color = MaterialTheme.colors.secondary))
+          }
+          Spacer(Modifier.fillMaxHeight().weight(1f))
+          Column(Modifier.widthIn(max = if (appPlatform.isAndroid) 450.dp else 1000.dp).align(Alignment.CenterHorizontally), horizontalAlignment = Alignment.CenterHorizontally) {
+            OnboardingActionButton(
+              if (appPlatform.isAndroid) Modifier.padding(horizontal = DEFAULT_PADDING * 2).fillMaxWidth() else Modifier.widthIn(min = 300.dp),
+              labelId = MR.strings.create_profile_button,
+              onboarding = null,
+              enabled = canCreateProfile(displayName.value),
+              onclick = { createProfileOnboarding(chat.simplex.common.platform.chatModel, displayName.value, close) }
+            )
+            // Reserve space
+            TextButtonBelowOnboardingButton("", null)
+          }
+
+          LaunchedEffect(Unit) {
+            delay(300)
+            focusRequester.requestFocus()
+          }
        }
      }
      LaunchedEffect(Unit) {
@@ -76,56 +76,62 @@ private fun CreateSimpleXAddressLayout(
  createAddress: () -> Unit,
  nextStep: () -> Unit,
 ) {
-  ColumnWithScrollBar(
-    Modifier
-      .fillMaxSize()
-      .themedBackground(),
-    horizontalAlignment = Alignment.CenterHorizontally,
+  val handler = remember { AppBarHandler() }
+  CompositionLocalProvider(
+    LocalAppBarHandler provides handler
  ) {
-    CloseSheetBar(showClose = false, close = {})
-    AppBarTitle(stringResource(MR.strings.simplex_address))
+    ModalView({}, showClose = false) {
+      ColumnWithScrollBar(
+        Modifier
+          .fillMaxSize()
+          .themedBackground(),
+        horizontalAlignment = Alignment.CenterHorizontally,
+      ) {
+        AppBarTitle(stringResource(MR.strings.simplex_address))

-    Spacer(Modifier.weight(1f))
+        Spacer(Modifier.weight(1f))

-    if (userAddress != null) {
-      SimpleXLinkQRCode(userAddress.connReqContact)
-      Spacer(Modifier.height(DEFAULT_PADDING_HALF))
-      Row {
-        ShareAddressButton { share(simplexChatLink(userAddress.connReqContact)) }
-        Spacer(Modifier.width(DEFAULT_PADDING * 2))
-        ShareViaEmailButton { sendEmail(userAddress) }
-      }
-      Spacer(Modifier.height(DEFAULT_PADDING))
-      Spacer(Modifier.weight(1f))
-      Column(Modifier.widthIn(max = if (appPlatform.isAndroid) 450.dp else 1000.dp).align(Alignment.CenterHorizontally), horizontalAlignment = Alignment.CenterHorizontally) {
-        OnboardingActionButton(
-          modifier = if (appPlatform.isAndroid) Modifier.padding(horizontal = DEFAULT_PADDING * 2).fillMaxWidth() else Modifier.widthIn(min = 300.dp),
-          labelId = MR.strings.continue_to_next_step,
-          onboarding = null,
-          onclick = nextStep
-        )
-        // Reserve space
-        TextButtonBelowOnboardingButton("", null)
-      }
-    } else {
-      Button(createAddress, Modifier, shape = CircleShape, contentPadding = PaddingValues()) {
-        Icon(painterResource(MR.images.ic_mail_filled), null, Modifier.size(100.dp).background(MaterialTheme.colors.primary, CircleShape).padding(25.dp), tint = Color.White)
-      }
-      Spacer(Modifier.height(DEFAULT_PADDING))
-      Spacer(Modifier.weight(1f))
-      Text(stringResource(MR.strings.create_simplex_address), style = MaterialTheme.typography.h3, fontWeight = FontWeight.Bold)
-      TextBelowButton(stringResource(MR.strings.you_can_make_address_visible_via_settings))
-      Spacer(Modifier.height(DEFAULT_PADDING))
-      Spacer(Modifier.weight(1f))
+        if (userAddress != null) {
+          SimpleXLinkQRCode(userAddress.connReqContact)
+          Spacer(Modifier.height(DEFAULT_PADDING_HALF))
+          Row {
+            ShareAddressButton { share(simplexChatLink(userAddress.connReqContact)) }
+            Spacer(Modifier.width(DEFAULT_PADDING * 2))
+            ShareViaEmailButton { sendEmail(userAddress) }
+          }
+          Spacer(Modifier.height(DEFAULT_PADDING))
+          Spacer(Modifier.weight(1f))
+          Column(Modifier.widthIn(max = if (appPlatform.isAndroid) 450.dp else 1000.dp).align(Alignment.CenterHorizontally), horizontalAlignment = Alignment.CenterHorizontally) {
+            OnboardingActionButton(
+              modifier = if (appPlatform.isAndroid) Modifier.padding(horizontal = DEFAULT_PADDING * 2).fillMaxWidth() else Modifier.widthIn(min = 300.dp),
+              labelId = MR.strings.continue_to_next_step,
+              onboarding = null,
+              onclick = nextStep
+            )
+            // Reserve space
+            TextButtonBelowOnboardingButton("", null)
+          }
+        } else {
+          Button(createAddress, Modifier, shape = CircleShape, contentPadding = PaddingValues()) {
+            Icon(painterResource(MR.images.ic_mail_filled), null, Modifier.size(100.dp).background(MaterialTheme.colors.primary, CircleShape).padding(25.dp), tint = Color.White)
+          }
+          Spacer(Modifier.height(DEFAULT_PADDING))
+          Spacer(Modifier.weight(1f))
+          Text(stringResource(MR.strings.create_simplex_address), style = MaterialTheme.typography.h3, fontWeight = FontWeight.Bold)
+          TextBelowButton(stringResource(MR.strings.you_can_make_address_visible_via_settings))
+          Spacer(Modifier.height(DEFAULT_PADDING))
+          Spacer(Modifier.weight(1f))

-      Column(Modifier.widthIn(max = if (appPlatform.isAndroid) 450.dp else 1000.dp).align(Alignment.CenterHorizontally), horizontalAlignment = Alignment.CenterHorizontally) {
-        OnboardingActionButton(
-          modifier = if (appPlatform.isAndroid) Modifier.padding(horizontal = DEFAULT_PADDING * 2).fillMaxWidth() else Modifier.widthIn(min = 300.dp),
-          labelId = MR.strings.create_address_button,
-          onboarding = null,
-          onclick = createAddress
-        )
-        TextButtonBelowOnboardingButton(stringResource(MR.strings.dont_create_address), nextStep)
+          Column(Modifier.widthIn(max = if (appPlatform.isAndroid) 450.dp else 1000.dp).align(Alignment.CenterHorizontally), horizontalAlignment = Alignment.CenterHorizontally) {
+            OnboardingActionButton(
+              modifier = if (appPlatform.isAndroid) Modifier.padding(horizontal = DEFAULT_PADDING * 2).fillMaxWidth() else Modifier.widthIn(min = 300.dp),
+              labelId = MR.strings.create_address_button,
+              onboarding = null,
+              onclick = createAddress
+            )
+            TextButtonBelowOnboardingButton(stringResource(MR.strings.dont_create_address), nextStep)
+          }
+        }
      }
    }
  }
@@ -25,39 +25,47 @@ import chat.simplex.res.MR

@Composable
 fun SetNotificationsMode(m: ChatModel) {
-  ColumnWithScrollBar(
-    modifier = Modifier
-      .fillMaxSize()
-      .themedBackground()
+  val handler = remember { AppBarHandler() }
+  CompositionLocalProvider(
+    LocalAppBarHandler provides handler
  ) {
-    CloseSheetBar(showClose = false, close = {})
-    AppBarTitle(stringResource(MR.strings.onboarding_notifications_mode_title))
-    val currentMode = rememberSaveable { mutableStateOf(NotificationsMode.default) }
-    Column(Modifier.padding(horizontal = DEFAULT_PADDING * 1f)) {
-      Text(stringResource(MR.strings.onboarding_notifications_mode_subtitle), Modifier.fillMaxWidth(), textAlign = TextAlign.Center)
-      Spacer(Modifier.height(DEFAULT_PADDING * 2f))
-      SelectableCard(currentMode, NotificationsMode.OFF, stringResource(MR.strings.onboarding_notifications_mode_off), annotatedStringResource(MR.strings.onboarding_notifications_mode_off_desc)) {
-        currentMode.value = NotificationsMode.OFF
-      }
-      SelectableCard(currentMode, NotificationsMode.PERIODIC, stringResource(MR.strings.onboarding_notifications_mode_periodic), annotatedStringResource(MR.strings.onboarding_notifications_mode_periodic_desc)){
-        currentMode.value = NotificationsMode.PERIODIC
-      }
-      SelectableCard(currentMode, NotificationsMode.SERVICE, stringResource(MR.strings.onboarding_notifications_mode_service), annotatedStringResource(MR.strings.onboarding_notifications_mode_service_desc)){
-        currentMode.value = NotificationsMode.SERVICE
-      }
-    }
-    Spacer(Modifier.fillMaxHeight().weight(1f))
-    Column(Modifier.widthIn(max = if (appPlatform.isAndroid) 450.dp else 1000.dp).align(Alignment.CenterHorizontally), horizontalAlignment = Alignment.CenterHorizontally) {
-      OnboardingActionButton(
-        modifier = if (appPlatform.isAndroid) Modifier.padding(horizontal = DEFAULT_PADDING * 2).fillMaxWidth() else Modifier,
-        labelId = MR.strings.use_chat,
-        onboarding = OnboardingStage.OnboardingComplete,
-        onclick = {
-          changeNotificationsMode(currentMode.value, m)
+    ModalView({}, showClose = false) {
+      ColumnWithScrollBar(
+        modifier = Modifier
+          .fillMaxSize()
+          .themedBackground()
+      ) {
+        Box(Modifier.align(Alignment.CenterHorizontally)) {
+          AppBarTitle(stringResource(MR.strings.onboarding_notifications_mode_title))
        }
-      )
-      // Reserve space
-      TextButtonBelowOnboardingButton("", null)
+        val currentMode = rememberSaveable { mutableStateOf(NotificationsMode.default) }
+        Column(Modifier.padding(horizontal = DEFAULT_PADDING * 1f)) {
+          Text(stringResource(MR.strings.onboarding_notifications_mode_subtitle), Modifier.fillMaxWidth(), textAlign = TextAlign.Center)
+          Spacer(Modifier.height(DEFAULT_PADDING * 2f))
+          SelectableCard(currentMode, NotificationsMode.OFF, stringResource(MR.strings.onboarding_notifications_mode_off), annotatedStringResource(MR.strings.onboarding_notifications_mode_off_desc)) {
+            currentMode.value = NotificationsMode.OFF
+          }
+          SelectableCard(currentMode, NotificationsMode.PERIODIC, stringResource(MR.strings.onboarding_notifications_mode_periodic), annotatedStringResource(MR.strings.onboarding_notifications_mode_periodic_desc)) {
+            currentMode.value = NotificationsMode.PERIODIC
+          }
+          SelectableCard(currentMode, NotificationsMode.SERVICE, stringResource(MR.strings.onboarding_notifications_mode_service), annotatedStringResource(MR.strings.onboarding_notifications_mode_service_desc)) {
+            currentMode.value = NotificationsMode.SERVICE
+          }
+        }
+        Spacer(Modifier.fillMaxHeight().weight(1f))
+        Column(Modifier.widthIn(max = if (appPlatform.isAndroid) 450.dp else 1000.dp).align(Alignment.CenterHorizontally), horizontalAlignment = Alignment.CenterHorizontally) {
+          OnboardingActionButton(
+            modifier = if (appPlatform.isAndroid) Modifier.padding(horizontal = DEFAULT_PADDING * 2).fillMaxWidth() else Modifier,
+            labelId = MR.strings.use_chat,
+            onboarding = OnboardingStage.OnboardingComplete,
+            onclick = {
+              changeNotificationsMode(currentMode.value, m)
+            }
+          )
+          // Reserve space
+          TextButtonBelowOnboardingButton("", null)
+        }
+      }
    }
  }
  SetNotificationsModeAdditions()
@@ -104,84 +104,90 @@ private fun SetupDatabasePassphraseLayout(
  onConfirmEncrypt: () -> Unit,
  nextStep: () -> Unit,
 ) {
-  ColumnWithScrollBar(
-    Modifier.fillMaxSize().themedBackground().padding(bottom = DEFAULT_PADDING * 2),
-    horizontalAlignment = Alignment.CenterHorizontally,
+  val handler = remember { AppBarHandler() }
+  CompositionLocalProvider(
+    LocalAppBarHandler provides handler
  ) {
-    CloseSheetBar(showClose = false, close = {})
-    AppBarTitle(stringResource(MR.strings.setup_database_passphrase))
+    ModalView({}, showClose = false) {
+      ColumnWithScrollBar(
+        Modifier.fillMaxSize().themedBackground().padding(bottom = DEFAULT_PADDING * 2),
+        horizontalAlignment = Alignment.CenterHorizontally,
+      ) {
+        AppBarTitle(stringResource(MR.strings.setup_database_passphrase))

-    Spacer(Modifier.weight(1f))
+        Spacer(Modifier.weight(1f))

-    Column(Modifier.width(600.dp)) {
-      val focusRequester = remember { FocusRequester() }
-      val focusManager = LocalFocusManager.current
-      LaunchedEffect(Unit) {
-        delay(100L)
-        focusRequester.requestFocus()
-      }
-      PassphraseField(
-        newKey,
-        generalGetString(MR.strings.new_passphrase),
-        modifier = Modifier
-          .padding(horizontal = DEFAULT_PADDING)
-          .focusRequester(focusRequester)
-          .onPreviewKeyEvent {
-            if ((it.key == Key.Enter || it.key == Key.NumPadEnter) && it.type == KeyEventType.KeyUp) {
-              focusManager.moveFocus(FocusDirection.Down)
-              true
-            } else {
-              false
+        Column(Modifier.width(600.dp)) {
+          val focusRequester = remember { FocusRequester() }
+          val focusManager = LocalFocusManager.current
+          LaunchedEffect(Unit) {
+            delay(100L)
+            focusRequester.requestFocus()
+          }
+          PassphraseField(
+            newKey,
+            generalGetString(MR.strings.new_passphrase),
+            modifier = Modifier
+              .padding(horizontal = DEFAULT_PADDING)
+              .focusRequester(focusRequester)
+              .onPreviewKeyEvent {
+                if ((it.key == Key.Enter || it.key == Key.NumPadEnter) && it.type == KeyEventType.KeyUp) {
+                  focusManager.moveFocus(FocusDirection.Down)
+                  true
+                } else {
+                  false
+                }
+              },
+            showStrength = true,
+            isValid = ::validKey,
+            keyboardActions = KeyboardActions(onNext = { defaultKeyboardAction(ImeAction.Next) }),
+          )
+          val onClickUpdate = {
+            // Don't do things concurrently. Shouldn't be here concurrently, just in case
+            if (!progressIndicator.value) {
+              encryptDatabaseAlert(onConfirmEncrypt)
            }
-          },
-        showStrength = true,
-        isValid = ::validKey,
-        keyboardActions = KeyboardActions(onNext = { defaultKeyboardAction(ImeAction.Next) }),
-      )
-      val onClickUpdate = {
-        // Don't do things concurrently. Shouldn't be here concurrently, just in case
-        if (!progressIndicator.value) {
-          encryptDatabaseAlert(onConfirmEncrypt)
+          }
+          val disabled = currentKey.value == newKey.value ||
+              newKey.value != confirmNewKey.value ||
+              newKey.value.isEmpty() ||
+              !validKey(currentKey.value) ||
+              !validKey(newKey.value) ||
+              progressIndicator.value
+
+          PassphraseField(
+            confirmNewKey,
+            generalGetString(MR.strings.confirm_new_passphrase),
+            modifier = Modifier
+              .padding(horizontal = DEFAULT_PADDING)
+              .onPreviewKeyEvent {
+                if (!disabled && (it.key == Key.Enter || it.key == Key.NumPadEnter) && it.type == KeyEventType.KeyUp) {
+                  onClickUpdate()
+                  true
+                } else {
+                  false
+                }
+              },
+            isValid = { confirmNewKey.value == "" || newKey.value == confirmNewKey.value },
+            keyboardActions = KeyboardActions(onDone = { defaultKeyboardAction(ImeAction.Done) }),
+          )
+
+          Box(Modifier.align(Alignment.CenterHorizontally).padding(vertical = DEFAULT_PADDING)) {
+            SetPassphraseButton(disabled, onClickUpdate)
+          }
+
+          Column {
+            SectionTextFooter(generalGetString(MR.strings.you_have_to_enter_passphrase_every_time))
+            SectionTextFooter(annotatedStringResource(MR.strings.impossible_to_recover_passphrase))
+          }
+        }
+
+        Spacer(Modifier.weight(1f))
+        SkipButton(progressIndicator.value) {
+          chatModel.desktopOnboardingRandomPassword.value = true
+          nextStep()
        }
      }
-      val disabled = currentKey.value == newKey.value ||
-          newKey.value != confirmNewKey.value ||
-          newKey.value.isEmpty() ||
-          !validKey(currentKey.value) ||
-          !validKey(newKey.value) ||
-          progressIndicator.value
-
-      PassphraseField(
-        confirmNewKey,
-        generalGetString(MR.strings.confirm_new_passphrase),
-        modifier = Modifier
-          .padding(horizontal = DEFAULT_PADDING)
-          .onPreviewKeyEvent {
-            if (!disabled && (it.key == Key.Enter || it.key == Key.NumPadEnter) && it.type == KeyEventType.KeyUp) {
-              onClickUpdate()
-              true
-            } else {
-              false
-            }
-          },
-        isValid = { confirmNewKey.value == "" || newKey.value == confirmNewKey.value },
-        keyboardActions = KeyboardActions(onDone = { defaultKeyboardAction(ImeAction.Done) }),
-      )
-
-      Box(Modifier.align(Alignment.CenterHorizontally).padding(vertical = DEFAULT_PADDING)) {
-        SetPassphraseButton(disabled, onClickUpdate)
-      }
-
-      Column {
-        SectionTextFooter(generalGetString(MR.strings.you_have_to_enter_passphrase_every_time))
-        SectionTextFooter(annotatedStringResource(MR.strings.impossible_to_recover_passphrase))
-      }
-    }
-
-    Spacer(Modifier.weight(1f))
-    SkipButton(progressIndicator.value) {
-      chatModel.desktopOnboardingRandomPassword.value = true
-      nextStep()
    }
  }
 }
@@ -1950,7 +1950,7 @@
    <string name="servers_info_sessions_connected">متصل</string>
    <string name="servers_info_connected_servers_section_header">الخوادم المتصلة</string>
    <string name="servers_info_sessions_connecting">جارِ الاتصال</string>
-    <string name="servers_info_subscriptions_connections_subscribed">الاتصالات النسطة</string>
+    <string name="servers_info_subscriptions_connections_subscribed">الاتصالات النشطة</string>
    <string name="current_user">ملف التعريف الحالي</string>
    <string name="deletion_errors">أخطاء الحذف</string>
    <string name="servers_info_detailed_statistics">إحصائيات مفصلة</string>
@@ -1526,9 +1526,9 @@
    <string name="recent_history_is_not_sent_to_new_members">El historial no se envía a miembros nuevos.</string>
    <string name="retry_verb">Reintentar</string>
    <string name="camera_not_available">Cámara no disponible</string>
-    <string name="enable_sending_recent_history">Enviar hasta 100 últimos mensajes a los miembros nuevos.</string>
+    <string name="enable_sending_recent_history">Se envían hasta 100 mensajes más recientes a los miembros nuevos.</string>
    <string name="add_contact_button_to_create_link_or_connect_via_link"><![CDATA[<b>Añadir contacto</b>: crea un enlace de invitación nuevo o usa un enlace recibido.]]></string>
-    <string name="disable_sending_recent_history">No enviar historial a miembros nuevos.</string>
+    <string name="disable_sending_recent_history">No se envía el historial a los miembros nuevos.</string>
    <string name="or_show_this_qr_code">O muestra este código QR</string>
    <string name="recent_history_is_sent_to_new_members">Hasta 100 últimos mensajes son enviados a los miembros nuevos.</string>
    <string name="code_you_scanned_is_not_simplex_link_qr_code">El código QR escaneado no es un enlace SimpleX.</string>
@@ -1736,9 +1736,9 @@
    <string name="network_type_ethernet">Ethernet por cable</string>
    <string name="feature_roles_admins">administradores</string>
    <string name="feature_enabled_for">Activado para</string>
-    <string name="prohibit_sending_simplex_links">No permitir el envío de enlaces SimpleX</string>
+    <string name="prohibit_sending_simplex_links">No se permite enviar enlaces SimpleX</string>
    <string name="feature_roles_all_members">todos los miembros</string>
-    <string name="allow_to_send_simplex_links">Permitir enviar enlaces SimpleX.</string>
+    <string name="allow_to_send_simplex_links">Se permite enviar enlaces SimpleX.</string>
    <string name="saved_description">guardado</string>
    <string name="saved_from_description">guardado desde %s</string>
    <string name="saved_chat_item_info_tab">Guardado</string>
@@ -2065,7 +2065,9 @@
    <string name="invite_friends_short">Invitar</string>
    <string name="v6_0_new_chat_experience">Nueva experiencia de chat 🎉</string>
    <string name="v6_0_new_media_options">Nuevas opciones multimedia</string>
-    <string name="one_hand_ui_change_instruction">Puede cambiarlo desde el menú Apariencia.</string>
+    <string name="one_hand_ui_change_instruction">Puedes cambiar la posición de la barra desde el menú Apariencia.</string>
    <string name="v6_0_upgrade_app_descr">Descarga nuevas versiones desde GitHub.</string>
    <string name="new_message">Nuevo mensaje</string>
+    <string name="error_parsing_uri_title">Enlace no válido</string>
+    <string name="error_parsing_uri_desc">Por favor, comprueba que el enlace SimpleX es correcto.</string>
 </resources>
@@ -44,7 +44,7 @@
    <string name="network_session_mode_user_description"><![CDATA[Külön TCP kapcsolat (és SOCKS bejelentkezési adatok) lesz használva <b>az alkalmazásban minden csevegési profiljához </b>.]]></string>
    <string name="both_you_and_your_contact_can_send_disappearing">Mindkét fél küldhet eltűnő üzeneteket.</string>
    <string name="keychain_is_storing_securely">Az Android Keystore-t a jelmondat biztonságos tárolására használják - lehetővé teszi az értesítési szolgáltatás működését.</string>
-    <string name="alert_title_msg_bad_hash">Téves üzenet hash</string>
+    <string name="alert_title_msg_bad_hash">Hibás az üzenet ellenőrzőösszege</string>
    <string name="color_background">Háttér</string>
    <string name="socks_proxy_setting_limitations"><![CDATA[<b>Tudnivaló</b>: az üzenet- és fájl átjátszók SOCKS proxy által vannak kapcsolatban. A hívások és URL hivatkozás előnézetek közvetlen kapcsolatot használnak.]]></string>
    <string name="full_backup">Alkalmazásadatok biztonsági mentése</string>
@@ -124,7 +124,7 @@
    <string name="icon_descr_cancel_live_message">Élő csevegési üzenet visszavonása</string>
    <string name="allow_irreversible_message_deletion_only_if">Az üzenetek végleges törlése kizárólag abban az esetben van engedélyezve, ha az ismerőse is engedélyezi. (24 óra)</string>
    <string name="v4_6_audio_video_calls">Hang- és videóhívások</string>
-    <string name="integrity_msg_bad_hash">téves üzenet hash</string>
+    <string name="integrity_msg_bad_hash">hibás az üzenet ellenőrzőösszege</string>
    <string name="notifications_mode_service">Mindig fut</string>
    <string name="keychain_allows_to_receive_ntfs">Az Android Keystore biztonságosan fogja tárolni a jelmondatot az alkalmazás újraindítása, vagy a jelmondat megváltoztatás után - lehetővé téve az értesítések fogadását.</string>
    <string name="all_app_data_will_be_cleared">Minden alkalmazásadat törölve.</string>
@@ -242,7 +242,7 @@
    <string name="group_member_status_intro_invitation">kapcsolódás (bemutatkozó meghívó)</string>
    <string name="create_simplex_address">SimpleX cím létrehozása</string>
    <string name="rcv_direct_event_contact_deleted">törölt ismerős</string>
-    <string name="delete_member_message__question">Csoporttag üzenet törlése?</string>
+    <string name="delete_member_message__question">Csoporttag üzenetének törlése?</string>
    <string name="chat_is_running">A csevegés fut</string>
    <string name="share_one_time_link">Egyszer használatos meghívó hivatkozás létrehozása</string>
    <string name="delete_link">Törlés</string>
@@ -487,7 +487,7 @@
 \nCsatlakozzon hozzám SimpleX Chat-en keresztül: %s</string>
    <string name="display_name_cannot_contain_whitespace">A megjelenített név nem tartalmazhat szóközöket.</string>
    <string name="info_row_group">Csoport</string>
-    <string name="enter_welcome_message_optional">Üdvözlő üzenetet megadása… (opcionális)</string>
+    <string name="enter_welcome_message_optional">Üdvözlő üzenet megadása… (opcionális)</string>
    <string name="error_exporting_chat_database">Hiba a csevegési adatbázis exportálásakor</string>
    <string name="error_saving_file">Hiba a fájl mentésekor</string>
    <string name="encrypt_local_files">Helyi fájlok titkosítása</string>
@@ -544,7 +544,7 @@
    <string name="alert_text_encryption_renegotiation_failed">Sikertelen titkosítás-újraegyeztetés.</string>
    <string name="error_deleting_user">Hiba a felhasználói profil törlésekor</string>
    <string name="fix_connection_not_supported_by_group_member">Csoporttag általi javítás nem támogatott</string>
-    <string name="enter_welcome_message">Üdvözlő üzenetet megadása…</string>
+    <string name="enter_welcome_message">Üdvözlő üzenet megadása…</string>
    <string name="encrypted_database">Titkosított adatbázis</string>
    <string name="enter_password_to_show">Jelszó megadása a keresőben</string>
    <string name="file_will_be_received_when_contact_completes_uploading">A fájl akkor érkezik meg, amikor a küldője befejezte annak feltöltését.</string>
@@ -1269,7 +1269,7 @@
    <string name="chat_lock">SimpleX zár</string>
    <string name="your_settings">Beállítások</string>
    <string name="your_chat_database">Csevegési adatbázis</string>
-    <string name="rcv_group_event_member_deleted">%1$s eltávolítva</string>
+    <string name="rcv_group_event_member_deleted">eltávolította őt: %1$s</string>
    <string name="smp_servers_test_failed">Sikertelen kiszolgáló teszt!</string>
    <string name="verify_connection">Kapcsolat ellenőrzése</string>
    <string name="whats_new_read_more">Tudjon meg többet</string>
@@ -1510,7 +1510,7 @@
    <string name="read_more_in_user_guide_with_link"><![CDATA[További információ a <font color="#0088ff">Használati útmutatóban</font> olvasható.]]></string>
    <string name="settings_is_storing_in_clear_text">A jelmondat a beállításokban egyszerű szövegként van tárolva.</string>
    <string name="terminal_always_visible">Konzol megjelenítése új ablakban</string>
-    <string name="alert_text_msg_bad_hash">Az előző üzenet hash-e más.</string>
+    <string name="alert_text_msg_bad_hash">Az előző üzenet ellenőrzőösszege különbözik.</string>
    <string name="receipts_section_description">Ezek a beállítások a jelenlegi profiljára vonatkoznak</string>
    <string name="loading_remote_file_desc">Várjon, amíg a fájl betöltődik a csatolt mobilról</string>
    <string name="read_more_in_github_with_link"><![CDATA[További információ a <font color="#0088ff">GitHub tárolónkban</font>.]]></string>
@@ -100,4 +100,16 @@
    <string name="connected_mobile">Ponsel yang terhubung</string>
    <string name="multicast_connect_automatically">Hubungkan secara otomatis</string>
    <string name="callstate_connecting">menyambungkan…</string>
+    <string name="servers_info_sessions_connecting">Menghubungkan</string>
+    <string name="error_parsing_uri_title">Tautan tidak valid</string>
+    <string name="error_parsing_uri_desc">Periksa apakah tautan SimpleX sudah benar.</string>
+    <string name="connected_to_server_to_receive_messages_from_contact">Anda terhubung ke server yang digunakan untuk menerima pesan dari kontak ini.</string>
+    <string name="trying_to_connect_to_server_to_receive_messages_with_error">Mencoba menyambung ke server yang digunakan untuk menerima pesan dari kontak ini (error: %1$s).</string>
+    <string name="database_migration_in_progress">Migrasi basis data sedang berlangsung, 
+\nmemerlukan waktu beberapa menit.</string>
+    <string name="server_connecting">menghubungkan</string>
+    <string name="non_content_uri_alert_title">Lokasi file tidak valid</string>
+    <string name="app_was_crashed">Tampilan macet</string>
+    <string name="non_content_uri_alert_text">Anda membagikan lokasi file yang tidak valid. Laporkan masalah ini ke pengembang aplikasi.</string>
+    <string name="server_error">error</string>
 </resources>
@@ -2051,7 +2051,7 @@
    <string name="v6_0_reachable_chat_toolbar">Barra degli strumenti di chat accessibile</string>
    <string name="v6_0_your_contacts_descr">Archivia contatti per chattare più tardi.</string>
    <string name="v6_0_reachable_chat_toolbar_descr">Usa l\'app con una mano sola.</string>
-    <string name="v6_0_connection_servers_status_descr">Stato di connessione e server.</string>
+    <string name="v6_0_connection_servers_status_descr">Stato della connessione e dei server.</string>
    <string name="v6_0_private_routing_descr">Protegge il tuo indirizzo IP e le connessioni.</string>
    <string name="network_options_save_and_reconnect">Salva e riconnetti</string>
    <string name="reset_all_hints">Ripristina tutti i suggerimenti</string>
@@ -2013,7 +2013,7 @@
    <string name="info_view_connect_button">verbinden</string>
    <string name="contact_deleted">Contact verwijderd!</string>
    <string name="delete_contact_cannot_undo_warning">Het contact wordt verwijderd. Dit kan niet ongedaan worden gemaakt!</string>
-    <string name="keep_conversation">Blijf in gesprek</string>
+    <string name="keep_conversation">Behoud het gesprek</string>
    <string name="info_view_message_button">bericht</string>
    <string name="only_delete_conversation">Alleen conversatie verwijderen</string>
    <string name="info_view_open_button">open</string>
@@ -2065,4 +2065,6 @@
    <string name="v6_0_new_media_options">Nieuwe media-opties</string>
    <string name="invite_friends_short">Uitnodigen</string>
    <string name="new_message">Nieuw bericht</string>
+    <string name="error_parsing_uri_title">Ongeldige link</string>
+    <string name="error_parsing_uri_desc">Controleer of de SimpleX-link correct is.</string>
 </resources>
@@ -181,7 +181,7 @@
    <string name="you_are_observer">jesteś obserwatorem</string>
    <string name="observer_cant_send_message_title">Nie możesz wysyłać wiadomości!</string>
    <string name="icon_descr_server_status_connected">Połączony</string>
-    <string name="maximum_supported_file_size">Obecnie maksymalny obsługiwany rozmiar pliku to %1$s .</string>
+    <string name="maximum_supported_file_size">Obecnie maksymalny obsługiwany rozmiar pliku to %1$s.</string>
    <string name="button_delete_contact">Usuń kontakt</string>
    <string name="delete_contact_question">Usunąć kontakt\?</string>
    <string name="icon_descr_server_status_disconnected">Rozłączony</string>
@@ -344,7 +344,7 @@
    <string name="enter_one_ICE_server_per_line">Serwery ICE (po jednym na linię)</string>
    <string name="network_disable_socks_info">Jeśli potwierdzisz, serwery wiadomości będą mogły zobaczyć Twój adres IP, a Twój dostawca - z jakimi serwerami się łączysz.</string>
    <string name="network_and_servers">Sieć i serwery</string>
-    <string name="network_settings_title">Ustawienia sieci</string>
+    <string name="network_settings_title">Zaawansowane ustawienia</string>
    <string name="network_use_onion_hosts_no">Nie</string>
    <string name="network_use_onion_hosts_required_desc">Hosty onion będą wymagane do połączenia.
 \nUwaga: nie będziesz mógł połączyć się z serwerami bez adresu .onion.</string>
@@ -408,11 +408,11 @@
    <string name="decentralized">Zdecentralizowane</string>
    <string name="callstate_ended">zakończona</string>
    <string name="how_to_use_markdown">Jak korzystać z markdown</string>
-    <string name="immune_to_spam_and_abuse">Odporność na spam i nadużycia</string>
+    <string name="immune_to_spam_and_abuse">Odporność na spam</string>
    <string name="italic_text">kursywa</string>
    <string name="callstatus_missed">nieodebrane połączenie</string>
-    <string name="opensource_protocol_and_code_anybody_can_run_servers">Otwarto źródłowy protokół i kod - każdy może uruchomić serwery.</string>
-    <string name="people_can_connect_only_via_links_you_share">Ludzie mogą się z Tobą połączyć tylko poprzez linki, które udostępniasz.</string>
+    <string name="opensource_protocol_and_code_anybody_can_run_servers">Każdy może hostować serwery.</string>
+    <string name="people_can_connect_only_via_links_you_share">Ty decydujesz, kto może się połączyć.</string>
    <string name="privacy_redefined">Redefinicja prywatności</string>
    <string name="callstate_received_answer">otrzymano odpowiedź…</string>
    <string name="callstate_received_confirmation">otrzymano potwierdzenie…</string>
@@ -420,8 +420,9 @@
    <string name="secret_text">sekret</string>
    <string name="callstate_starting">uruchamianie…</string>
    <string name="strikethrough_text">strajk</string>
-    <string name="first_platform_without_user_ids">Pierwsza platforma bez żadnych identyfikatorów użytkowników – z założenia prywatna.</string>
-    <string name="next_generation_of_private_messaging">Następna generacja prywatnych wiadomości</string>
+    <string name="first_platform_without_user_ids">Brak identyfikatorów użytkownika.</string>
+    <string name="next_generation_of_private_messaging">Następna generacja
+\nprywatnych wiadomości</string>
    <string name="callstate_waiting_for_answer">oczekiwanie na odpowiedź…</string>
    <string name="callstate_waiting_for_confirmation">oczekiwanie na potwierdzenie…</string>
    <string name="you_can_use_markdown_to_format_messages__prompt">Możesz używać markdown do formatowania wiadomości:</string>
@@ -440,7 +441,7 @@
    <string name="use_chat">Użyj czatu</string>
    <string name="onboarding_notifications_mode_off">Gdy aplikacja jest uruchomiona</string>
    <string name="you_control_servers_to_receive_your_contacts_to_send"><![CDATA[Kontrolujesz przez który serwer(y) <b>odbierać</b> wiadomości, Twoje kontakty - serwery, których używasz do wysyłania im wiadomości.]]></string>
-    <string name="onboarding_notifications_mode_service_desc"><![CDATA[<b>Zużywa więcej baterii</b>! Usługa zawsze działa w tle - powiadomienia są wyświetlane, gdy tylko wiadomości są dostępne.]]></string>
+    <string name="onboarding_notifications_mode_service_desc"><![CDATA[<b>Zużywa więcej baterii</b>! Aplikacja zawsze działa w tle - powiadomienia są wyświetlane natychmiastowo.]]></string>
    <string name="incoming_audio_call">Przychodzące połączenie audio</string>
    <string name="incoming_video_call">Przychodzące połączenie wideo</string>
    <string name="paste_the_link_you_received">Wklej link, który otrzymałeś</string>
@@ -913,7 +914,7 @@
    <string name="turning_off_service_and_periodic">Optymalizacja baterii jest aktywna, wyłącza usługi w tle i okresowe żądania nowych wiadomości. Możesz je ponownie włączyć za pośrednictwem ustawień.</string>
    <string name="it_can_disabled_via_settings_notifications_still_shown"><![CDATA[<b>Można je wyłączyć poprzez ustawienia</b> - powiadomienia nadal będą pokazywane podczas działania aplikacji.]]></string>
    <string name="onboarding_notifications_mode_off_desc"><![CDATA[<b>Najlepsze dla baterii</b>. Będziesz otrzymywać powiadomienia tylko wtedy, gdy aplikacja jest uruchomiona (NIE w tle).]]></string>
-    <string name="onboarding_notifications_mode_periodic_desc"><![CDATA[<b>Dobry dla baterii</b>. Usługa w tle sprawdza wiadomości co 10 minut. Możesz przegapić połączenia lub pilne wiadomości.]]></string>
+    <string name="onboarding_notifications_mode_periodic_desc"><![CDATA[<b>Dobry dla baterii</b>. Aplikacja sprawdza wiadomości co 10 minut. Możesz przegapić połączenia lub pilne wiadomości.]]></string>
    <string name="both_you_and_your_contact_can_send_voice">Zarówno Ty, jak i Twój kontakt możecie wysyłać wiadomości głosowe.</string>
    <string name="v4_5_transport_isolation_descr">Według profilu czatu (domyślnie) lub połączenia (BETA).</string>
    <string name="alert_title_cant_invite_contacts">Nie można zaprosić kontaktów!</string>
@@ -1239,7 +1240,7 @@
 \n- niestandardowy czas zniknięcia.
 \n- historia edycji.</string>
    <string name="item_info_no_text">brak tekstu</string>
-    <string name="non_fatal_errors_occured_during_import">Podczas importu wystąpiły niekrytyczne błędy - więcej szczegółów można znaleźć w konsoli czatu.</string>
+    <string name="non_fatal_errors_occured_during_import">Podczas importu wystąpiły niekrytyczne błędy:</string>
    <string name="settings_restart_app">Restart</string>
    <string name="settings_section_title_app">APLIKACJA</string>
    <string name="shutdown_alert_desc">Powiadomienia przestaną działać do momentu ponownego uruchomienia aplikacji.</string>
@@ -1789,7 +1790,7 @@
    <string name="settings_section_title_private_message_routing">TRASOWANIE PRYWATNYCH WIADOMOŚCI</string>
    <string name="network_smp_proxy_fallback_prohibit_description">NIE wysyłaj wiadomości bezpośrednio, nawet jeśli serwer docelowy nie obsługuje prywatnego trasowania.</string>
    <string name="private_routing_explanation">Aby chronić Twój adres IP, prywatne trasowanie używa Twoich serwerów SMP, aby dostarczyć wiadomości.</string>
-    <string name="network_smp_proxy_mode_unknown">Nieznane przekaźniki</string>
+    <string name="network_smp_proxy_mode_unknown">Nieznane serwery</string>
    <string name="network_smp_proxy_mode_unknown_description">Używaj prywatnego trasowania z nieznanymi serwerami.</string>
    <string name="update_network_smp_proxy_fallback_question">Rezerwowe trasowania wiadomości</string>
    <string name="network_smp_proxy_mode_private_routing">Prywatne trasowanie</string>
@@ -1990,4 +1991,82 @@
    <string name="send_errors">Wyślij błędy</string>
    <string name="size">Rozmiar</string>
    <string name="upload_errors">Błędy przesłania</string>
+    <string name="v6_0_increase_font_size">Zwiększ rozmiar czcionki.</string>
+    <string name="info_view_message_button">wiadomość</string>
+    <string name="compose_message_placeholder">Wiadomość</string>
+    <string name="info_view_open_button">otwórz</string>
+    <string name="info_view_search_button">szukaj</string>
+    <string name="selected_chat_items_selected_n">Zaznaczono %d</string>
+    <string name="info_view_video_button">wideo</string>
+    <string name="no_filtered_contacts">Brak filtrowanych kontaktów</string>
+    <string name="invite_friends_short">Zaproś</string>
+    <string name="v6_0_upgrade_app_descr">Pobieraj nowe wersje z GitHub.</string>
+    <string name="v6_0_new_media_options">Nowe opcje mediów</string>
+    <string name="contact_list_header_title">Twoje kontakty</string>
+    <string name="new_message">Nowa wiadomość</string>
+    <string name="v6_0_upgrade_app">Aktualizuj aplikację automatycznie</string>
+    <string name="v6_0_privacy_blur">Rozmycie dla lepszej prywatności.</string>
+    <string name="one_hand_ui_change_instruction">Możesz to zmienić w ustawieniach wyglądu.</string>
+    <string name="action_button_add_members">Zaproś</string>
+    <string name="cant_send_message_to_member_alert_title">Nie można wysłać wiadomości do członka grupy</string>
+    <string name="cant_call_member_send_message_alert_text">Wyślij wiadomość aby włączyć połączenia.</string>
+    <string name="v6_0_new_chat_experience">Nowe możliwości czatu 🎉</string>
+    <string name="v6_0_reachable_chat_toolbar_descr">Korzystaj z aplikacji jedną ręką.</string>
+    <string name="v6_0_chat_list_media">Odtwórz z listy czatów.</string>
+    <string name="deleted_chats">Zarchiwizowane kontakty</string>
+    <string name="info_view_call_button">zadzwoń</string>
+    <string name="info_view_connect_button">połącz</string>
+    <string name="v6_0_connection_servers_status_descr">Stan połączenia i serwerów.</string>
+    <string name="create_address_button">Utwórz</string>
+    <string name="error_parsing_uri_title">Nieprawidłowy link</string>
+    <string name="network_options_save_and_reconnect">Zapisz i połącz ponownie</string>
+    <string name="toolbar_settings">Ustawienia</string>
+    <string name="network_option_tcp_connection">Połączenie TCP</string>
+    <string name="selected_chat_items_nothing_selected">Nic nie jest zaznaczone</string>
+    <string name="error_parsing_uri_desc">Sprawdź czy link SimpleX jest poprawny.</string>
+    <string name="one_hand_ui_card_title">Przełącz listę czatów:</string>
+    <string name="v6_0_your_contacts_descr">Archiwizuj kontakty aby porozmawiać później.</string>
+    <string name="v6_0_private_routing_descr">Chroni Twój adres IP i połączenia.</string>
+    <string name="v6_0_reachable_chat_toolbar">Osiągalny pasek narzędzi czatu</string>
+    <string name="privacy_media_blur_radius_strong">Silne</string>
+    <string name="privacy_media_blur_radius">Rozmycie mediów</string>
+    <string name="privacy_media_blur_radius_medium">Średni</string>
+    <string name="privacy_media_blur_radius_off">Wyłącz</string>
+    <string name="privacy_media_blur_radius_soft">Łagodny</string>
+    <string name="keep_conversation">Zachowaj rozmowę</string>
+    <string name="only_delete_conversation">Usuń tylko rozmowę</string>
+    <string name="you_can_still_send_messages_to_contact">Możesz wysyłać wiadomości do %1$s ze zarchiwizowanych kontaktów.</string>
+    <string name="you_can_still_view_conversation_with_contact">Nadal możesz przeglądać rozmowę z %1$s na liście czatów.</string>
+    <string name="confirm_delete_contact_question">Potwierdzić usunięcie kontaktu?</string>
+    <string name="contact_deleted">Kontakt usunięty!</string>
+    <string name="delete_contact_cannot_undo_warning">Kontakt zostanie usunięty – nie można tego cofnąć!</string>
+    <string name="conversation_deleted">Rozmowa usunięta!</string>
+    <string name="delete_without_notification">Usuń bez powiadomienia</string>
+    <string name="paste_link">Wklej link</string>
+    <string name="allow_calls_question">Zezwolić na połączenia?</string>
+    <string name="cant_call_contact_alert_title">Nie można zadzwonić do kontaktu</string>
+    <string name="cant_call_contact_connecting_wait_alert_text">Łączenie z kontaktem, poczekaj lub sprawdź później!</string>
+    <string name="cant_call_contact_deleted_alert_text">Kontakt jest usunięty.</string>
+    <string name="you_need_to_allow_calls">Aby móc dzwonić, musisz zezwolić kontaktowi na połączenia.</string>
+    <string name="calls_prohibited_alert_title">Połączenia zakazane!</string>
+    <string name="cant_call_member_alert_title">Nie można zadzwonić do członka grupy</string>
+    <string name="calls_prohibited_ask_to_enable_calls_alert_text">Poproś kontakt o włącznie połączeń.</string>
+    <string name="delete_members_messages__question">Usunąć %d wiadomości członków?</string>
+    <string name="delete_messages_mark_deleted_warning">Wiadomości zostaną oznaczone do usunięcia. Odbiorca(y) będą mogli ujawnić te wiadomości.</string>
+    <string name="select_verb">Zaznacz</string>
+    <string name="moderate_messages_will_be_deleted_warning">Wiadomości zostaną usunięte dla wszystkich członków.</string>
+    <string name="moderate_messages_will_be_marked_warning">Wiadomości zostaną oznaczone jako moderowane dla wszystkich członków.</string>
+    <string name="one_hand_ui">Osiągalny pasek narzędzi czatu</string>
+    <string name="chat_database_exported_title">Wyeksportowano bazę danych czatu</string>
+    <string name="chat_database_exported_continue">Kontynuuj</string>
+    <string name="media_and_file_servers">Serwery mediów i plików</string>
+    <string name="message_servers">Serwery wiadomości</string>
+    <string name="network_socks_proxy">Proxy SOCKS</string>
+    <string name="chat_database_exported_not_all_files">Niektóre plik(i) nie zostały wyeksportowane</string>
+    <string name="chat_database_exported_migrate">Możesz zmigrować wyeksportowaną bazy danych.</string>
+    <string name="chat_database_exported_save">Możesz zapisać wyeksportowane archiwum.</string>
+    <string name="reset_all_hints">Zresetuj wszystkie wskazówki</string>
+    <string name="v6_0_connect_faster_descr">Szybciej łącz się ze znajomymi.</string>
+    <string name="v6_0_connection_servers_status">Kontroluj swoją sieć</string>
+    <string name="v6_0_delete_many_messages_descr">Usuń do 20 wiadomości na raz.</string>
 </resources>
@@ -636,4 +636,92 @@
    <string name="enable_automatic_deletion_question">Cho phép xóa tin nhắn tự động?</string>
    <string name="edit_verb">Chỉnh sửa</string>
    <string name="icon_descr_email">Thư điện tử</string>
+    <string name="ci_status_other_error">Lỗi: %1$s</string>
+    <string name="error">Lỗi</string>
+    <string name="alert_text_encryption_renegotiation_failed">Tái đàm phán mã hóa thất bại.</string>
+    <string name="conn_event_ratchet_sync_ok">mã hóa ok</string>
+    <string name="snd_conn_event_ratchet_sync_allowed">cho phép tái đàm phán mã hóa với %s</string>
+    <string name="snd_conn_event_ratchet_sync_required">cần tái đàm phán mã hóa cho %s</string>
+    <string name="receipts_contacts_title_enable">Bật chỉ báo đã nhận?</string>
+    <string name="v5_3_encrypt_local_files">Mã hóa các tệp và phương tiện được lưu trữ</string>
+    <string name="error_alert_title">Lỗi</string>
+    <string name="call_service_notification_end_call">Kết thúc cuộc gọi</string>
+    <string name="v5_6_quantum_resistant_encryption_descr">Bật trong cuộc trò chuyện trực tiếp (BETA)!</string>
+    <string name="enabled_self_destruct_passcode">Bật mã truy cập tự hủy</string>
+    <string name="encrypt_database_question">Mã hóa cơ sở dữ liệu?</string>
+    <string name="encrypted_database">Cơ sở dữ liệu được mã hóa</string>
+    <string name="encryption_renegotiation_error">Lỗi tái đàm phán mã hóa</string>
+    <string name="migrate_to_device_enter_passphrase">Nhập mật khẩu</string>
+    <string name="receipts_contacts_enable_keep_overrides">Bật (giữ thông tin ghi đè)</string>
+    <string name="encrypt_database">Mã hóa</string>
+    <string name="conn_event_ratchet_sync_agreed">mã hóa đã đồng nhất</string>
+    <string name="conn_event_ratchet_sync_allowed">cho phép tái đàm phán mã hóa</string>
+    <string name="conn_event_ratchet_sync_required">cần tái đàm phán mã hóa</string>
+    <string name="network_option_enable_tcp_keep_alive">Bật TCP keep-alive</string>
+    <string name="enter_password_to_show">Nhập mật khẩu trong tìm kiếm</string>
+    <string name="enter_this_device_name">Nhập tên của thiết bị này…</string>
+    <string name="auth_enable_simplex_lock">Bật SimpleX Lock</string>
+    <string name="enter_welcome_message">Nhập lời chào…</string>
+    <string name="la_enter_app_passcode">Nhập mã truy cập</string>
+    <string name="icon_descr_server_status_error">Lỗi</string>
+    <string name="enter_welcome_message_optional">Nhập lời chào... (không bắt buộc)</string>
+    <string name="callstate_ended">đã kết thúc</string>
+    <string name="snd_conn_event_ratchet_sync_agreed">mã hóa đã đồng nhất cho %s</string>
+    <string name="snd_conn_event_ratchet_sync_ok">mã hóa ok cho %s</string>
+    <string name="server_error">lỗi</string>
+    <string name="smp_servers_enter_manually">Nhập máy chủ thủ công</string>
+    <string name="receipts_groups_enable_keep_overrides">Bật (giữ thông tin ghi đè nhóm)</string>
+    <string name="enter_correct_passphrase">Nhập đúng mật khẩu.</string>
+    <string name="enter_passphrase">Nhập mật khẩu…</string>
+    <string name="encrypt_local_files">Mã hóa các tệp cục bộ</string>
+    <string name="enable_self_destruct">Bật tự hủy</string>
+    <string name="receipts_groups_title_enable">Bật chỉ báo đã nhận cho các nhóm?</string>
+    <string name="group_display_name_field">Nhập tên nhóm:</string>
+    <string name="display_name">Nhập tên của bạn:</string>
+    <string name="enable_lock">Bật khóa</string>
+    <string name="servers_info_modal_error_title">Lỗi</string>
+    <string name="failed_to_create_user_title">Lỗi tạo hồ sơ!</string>
+    <string name="error_changing_message_deletion">Lỗi thay đổi cài đặt</string>
+    <string name="error_blocking_member_for_all">Lỗi chặn thành viên cho tất cả</string>
+    <string name="error_adding_members">Lỗi thêm thành viên</string>
+    <string name="error_creating_message">Lỗi tạo tin nhắn</string>
+    <string name="error_creating_address">Lỗi tạo địa chỉ</string>
+    <string name="error_accepting_contact_request">Lỗi chấp nhận yêu cầu liên hệ</string>
+    <string name="error_changing_address">Lỗi thay đổi địa chỉ</string>
+    <string name="error_deleting_database">Lỗi xóa cơ sở dữ liệu SimpleX Chat</string>
+    <string name="error_creating_member_contact">Lỗi tạo liên hệ thành viên</string>
+    <string name="error_aborting_address_change">Lỗi hủy bỏ thay đổi địa chỉ</string>
+    <string name="error_creating_link_for_group">Lỗi tạo liên kết nhóm</string>
+    <string name="error_changing_role">Lỗi thay đổi quyền hạn</string>
+    <string name="smp_proxy_error_connecting">Lỗi kết nối đến máy chủ chuyển tiếp %1$s. Vui lòng thử lại sau.</string>
+    <string name="error_deleting_contact">Lỗi xóa liên hệ</string>
+    <string name="error_deleting_group">Lỗi xóa nhóm</string>
+    <string name="error_deleting_link_for_group">Lỗi xóa liên kết nhóm</string>
+    <string name="error_deleting_contact_request">Lỗi xóa yêu cầu liên hệ</string>
+    <string name="migrate_from_device_error_deleting_database">Lỗi xóa cơ sở dữ liệu</string>
+    <string name="error_deleting_pending_contact_connection">Lỗi xóa kết nối liên hệ đang chờ xử lý</string>
+    <string name="migrate_from_device_error_exporting_archive">Lỗi xuất cơ sở dữ liệu SimpleX Chat</string>
+    <string name="error_encrypting_database">Lỗi mã hóa cơ sở dữ liệu</string>
+    <string name="error_enabling_delivery_receipts">Lỗi bật chỉ báo đã nhận!</string>
+    <string name="error_deleting_note_folder">Lỗi xóa ghi chú riêng tư</string>
+    <string name="error_deleting_user">Lỗi xóa hồ sơ người dùng</string>
+    <string name="error_importing_database">Lỗi nhập cơ sở dữ liệu SimpleX Chat</string>
+    <string name="error_exporting_chat_database">Lỗi xuất cơ sở dữ liệu SimpleX Chat</string>
+    <string name="migrate_to_device_error_downloading_archive">Lỗi tải xuống kho lưu trữ</string>
+    <string name="error_initializing_web_view">Lỗi khởi tạo WebView. Cập nhật hệ điều hành của bạn lên phiên bản mới. Vui lòng liên hệ với nhà phát triển.
+\nLỗi: %s</string>
+    <string name="error_removing_member">Lỗi xóa thành viên</string>
+    <string name="error_with_info">Lỗi: %s</string>
+    <string name="unable_to_open_browser_title">Lỗi mở trình duyệt</string>
+    <string name="error_joining_group">Lỗi tham gia nhóm</string>
+    <string name="error_loading_details">Lỗi tải thông tin chi tiết</string>
+    <string name="error_receiving_file">Lỗi nhận tệp</string>
+    <string name="error_saving_group_profile">Lỗi lưu hồ sơ nhóm</string>
+    <string name="error_saving_file">Lỗi lưu tệp</string>
+    <string name="error_loading_smp_servers">Lỗi tải máy chủ SMP</string>
+    <string name="error_loading_xftp_servers">Lỗi tải máy chủ XFTP</string>
+    <string name="servers_info_reconnect_server_error">Lỗi kết nối lại máy chủ</string>
+    <string name="servers_info_reconnect_servers_error">Lỗi kết nối lại máy chủ</string>
+    <string name="servers_info_sessions_errors">Lỗi</string>
+    <string name="servers_info_reset_stats_alert_error_title">Lỗi khôi phục thống kê</string>
 </resources>
@@ -19,10 +19,10 @@
    <string name="accept">接受</string>
    <string name="auth_unavailable">認證無效</string>
    <string name="allow_verb">允許</string>
-    <string name="display_name__field">顯示名稱：</string>
+    <string name="display_name__field">個人資料名稱：</string>
    <string name="full_name__field">全名：</string>
-    <string name="onboarding_notifications_mode_service_desc"><![CDATA[<b>使用更多電量</b>！通知服務長期在背景中運行 – 有效的訊息就會即時顯示在通知內。]]></string>
-    <string name="onboarding_notifications_mode_periodic_desc"><![CDATA[<b>對電量友善</b>。通知服務於每十分鐘檢查一次訊息。你可能會錯過通話和迫切的訊息。]]></string>
+    <string name="onboarding_notifications_mode_service_desc"><![CDATA[<b>使用更多電量</b>！程式始終在背景中運行 – 通知會立即顯示。]]></string>
+    <string name="onboarding_notifications_mode_periodic_desc"><![CDATA[<b>對電量友善</b>。程式每10分鐘檢查一次訊息。你可能會錯過電話或警急訊息。]]></string>
    <string name="answer_call">回應通話請求</string>
    <string name="clear_contacts_selection_button">清除</string>
    <string name="allow_direct_messages">允許向群組內的成員傳送私訊。</string>
@@ -69,7 +69,7 @@
    <string name="your_current_profile">你目前的個人檔案</string>
    <string name="display_name_cannot_contain_whitespace">顯示的名稱中不能有空白。</string>
    <string name="save_preferences_question">儲存設定？</string>
-    <string name="display_name">顯示名稱</string>
+    <string name="display_name">輸入你的名稱：</string>
    <string name="callstatus_error">通話出錯</string>
    <string name="callstatus_calling">正在撥打…</string>
    <string name="callstatus_in_progress">通話中</string>
@@ -130,7 +130,7 @@
    <string name="create_secret_group_title">建立私密群組</string>
    <string name="button_leave_group">退出群組</string>
    <string name="group_member_status_connected">已連接</string>
-    <string name="group_display_name_field">群組顯示名稱：</string>
+    <string name="group_display_name_field">輸入群組名稱：</string>
    <string name="group_full_name_field">群組全名：</string>
    <string name="chat_preferences">對話設定</string>
    <string name="chat_preferences_off">關閉</string>
@@ -153,7 +153,7 @@
    <string name="group_preferences">群組設定</string>
    <string name="contact_preferences">聯絡人設定</string>
    <string name="share_image">分享媒體…</string>
-    <string name="both_you_and_your_contacts_can_delete">你和你的聯絡人都可以不可逆地刪除已經傳送的訊息。</string>
+    <string name="both_you_and_your_contacts_can_delete">你和你的聯絡人都可以不可逆地刪除已傳送的訊息。</string>
    <string name="server_connected">已連接</string>
    <string name="simplex_link_mode_description">簡介</string>
    <string name="simplex_link_mode_full">完整連結</string>
@@ -179,13 +179,13 @@
    <string name="smp_servers_check_address">檢查輸入的伺服器地址，然後再試一次。</string>
    <string name="chat_console">終端機對話</string>
    <string name="star_on_github">於 Github 給個星星</string>
-    <string name="incognito_info_protects">匿名聊天模式會保護你的真實個人檔案名稱和頭像 — 當有新聯絡人的時候會自動建立一個隨機性的個人檔案。</string>
+    <string name="incognito_info_protects">隱身模式透過為每個聯絡人使用新的隨機設定檔來保護您的隱私。</string>
    <string name="incognito_info_allows">這樣是允許每一個對話中擁有不同的顯示名稱，並且沒有任何的個人資料可用於分享或有機會外洩。</string>
    <string name="allow_disappearing_messages_only_if">只有你的聯絡人允許的情況下，才允許自動銷毀訊息。</string>
    <string name="allow_your_contacts_to_send_disappearing_messages">允許你的聯絡人傳送自動銷毀的訊息。</string>
-    <string name="allow_irreversible_message_deletion_only_if">只有你的聯絡人允許的情況下，才允許不可逆地將訊息刪除。</string>
-    <string name="allow_your_contacts_irreversibly_delete">允許你的聯絡人可以不可逆地刪除已發送的訊息。</string>
-    <string name="allow_to_delete_messages">允許將不可撤銷的訊息刪除。</string>
+    <string name="allow_irreversible_message_deletion_only_if">只有你的聯絡人允許的情況下，才允許不可逆地將訊息刪除。(24小時)</string>
+    <string name="allow_your_contacts_irreversibly_delete">允許你的聯絡人不可逆地刪除已發送的訊息。(24小時)</string>
+    <string name="allow_to_delete_messages">允許不可逆地將已傳送的訊息刪除。(24小時)</string>
    <string name="allow_to_send_voice">允許傳送語音訊息。</string>
    <string name="delete_after">多久後刪除</string>
    <string name="all_group_members_will_remain_connected">群組內所有成員會保持連接。</string>
@@ -231,9 +231,9 @@
    <string name="v4_5_italian_interface_descr">感謝用戶 - 使用 Weblate 的翻譯貢獻！</string>
    <string name="app_name">SimpleX</string>
    <string name="thousand_abbreviation">k</string>
-    <string name="connect_via_contact_link">透過連結連接聯絡人？</string>
-    <string name="connect_via_invitation_link">透過邀請連結連接？</string>
-    <string name="connect_via_group_link">透過邀請連結連接群組？</string>
+    <string name="connect_via_contact_link">透過聯絡人地址連接？</string>
+    <string name="connect_via_invitation_link">透過一次性連結連接？</string>
+    <string name="connect_via_group_link">加入群組？</string>
    <string name="profile_will_be_sent_to_contact_sending_link">你的個人檔案將傳送給你接收此連結的聯絡人。</string>
    <string name="you_will_join_group">你將加入此連結內的群組並且連接到此群組成為群組內的成員。</string>
    <string name="connect_via_link_verb">連接</string>
@@ -509,7 +509,7 @@
    <string name="callstate_ended">通話完結</string>
    <string name="connect_button">連接</string>
    <string name="network_and_servers">網路 &amp; 伺服器</string>
-    <string name="network_settings_title">網路設定</string>
+    <string name="network_settings_title">進階設定</string>
    <string name="network_enable_socks">使用 SOCKS 代理伺服器</string>
    <string name="save_and_notify_group_members">儲存並通知群組內的聯絡人</string>
    <string name="exit_without_saving">退出並且不儲存記錄</string>
@@ -547,7 +547,8 @@
    <string name="smp_servers_test_some_failed">有一些伺服器測試失敗：</string>
    <string name="smp_servers_scan_qr">掃描伺服器的二維碼</string>
    <string name="smp_servers_your_server">你的伺服器</string>
-    <string name="network_use_onion_hosts_required_desc">連接時將需要使用 Onion 主機。</string>
+    <string name="network_use_onion_hosts_required_desc">連接時需要使用 Onion 主機。
+\n請注意：如果沒有 .onion 地址，您將無法連接到伺服器。</string>
    <string name="network_session_mode_user">對話檔案</string>
    <string name="description_via_group_link">透過群組連結</string>
    <string name="description_via_group_link_incognito">透過群組連結使用匿名聊天模式</string>
@@ -621,7 +622,7 @@
    <string name="no_contacts_selected">沒有聯絡人可以選擇</string>
    <string name="group_link">群組連結</string>
    <string name="delete_link">刪除連結</string>
-    <string name="group_is_decentralized">群組是完全去中心化的 - 只有群組內的成員能看到。</string>
+    <string name="group_is_decentralized">完全去中心化 - 只有成員能看到。</string>
    <string name="prohibit_sending_disappearing">禁止傳送自動銷毀的訊息。</string>
    <string name="ttl_hours">%d 個小時</string>
    <string name="whats_new">更新內容</string>
@@ -643,7 +644,7 @@
    <string name="save_group_profile">儲存群組檔案</string>
    <string name="voice_prohibited_in_this_chat">語音訊息於這個聊天室是禁用的。</string>
    <string name="v4_3_irreversible_message_deletion_desc">允許你的聯絡人可以完全刪除訊息。</string>
-    <string name="first_platform_without_user_ids">第一個沒有任何用戶識別符的通訊平台 – 以私隱為設計。</string>
+    <string name="first_platform_without_user_ids">沒有用戶識別符。</string>
    <string name="next_generation_of_private_messaging">新一代的私密訊息平台</string>
    <string name="decentralized">去中心化的</string>
    <string name="people_can_connect_only_via_links_you_share">人們只能在你分享了連結後，才能和你連接。</string>
@@ -652,10 +653,10 @@
    <string name="how_it_works">這是如何運作</string>
    <string name="onboarding_notifications_mode_subtitle">你可以之後透過設定修改。</string>
    <string name="make_private_connection">私下連接</string>
-    <string name="opensource_protocol_and_code_anybody_can_run_servers">開放源碼協議和程式碼 – 任何人也可以運行伺服器。</string>
+    <string name="opensource_protocol_and_code_anybody_can_run_servers">任何人都可以託管伺服器。</string>
    <string name="ignore">無視</string>
    <string name="incoming_audio_call">語音通話來電</string>
-    <string name="paste_the_link_you_received">貼上你接收到的連結</string>
+    <string name="paste_the_link_you_received">貼上你收到的連結</string>
    <string name="status_e2e_encrypted">端對端加密</string>
    <string name="status_no_e2e_encryption">沒有端對端加密</string>
    <string name="icon_descr_speaker_off">關閉喇叭</string>
@@ -757,7 +758,7 @@
    <string name="message_deletion_prohibited">不可逆地刪除訊息於這個聊天室內是禁用的。</string>
    <string name="only_you_can_send_voice">只有你可以傳送語音訊息。</string>
    <string name="direct_messages_are_prohibited_in_chat">私訊群組內的成員於這個群組內是禁用的。</string>
-    <string name="group_members_can_delete">群組內的成員可以不可逆地刪除訊息。</string>
+    <string name="group_members_can_delete">群組內的成員可以不可逆地刪除訊息。（24小時）</string>
    <string name="v4_3_voice_messages">語音訊息</string>
    <string name="v4_3_improved_server_configuration">改善伺服器配置</string>
    <string name="v4_3_improved_privacy_and_security_desc">當你切換至最近應用程式版面時，無法預覽程式畫面。</string>
@@ -828,8 +829,8 @@
    <string name="feature_enabled">已啟用</string>
    <string name="feature_enabled_for_you">已為你啟用</string>
    <string name="feature_enabled_for_contact">已為聯絡人啟用</string>
-    <string name="only_you_can_delete_messages">只有你能不可逆地刪除訊息（你的聯絡人可以將它標記為刪除）。</string>
-    <string name="only_your_contact_can_delete">只有你的聊絡人可以不可逆的刪除訊息（你可以將它標記為刪除）。</string>
+    <string name="only_you_can_delete_messages">只有你能不可逆地刪除訊息（你的聯絡人可以將它標記為刪除）。（24小時）</string>
+    <string name="only_your_contact_can_delete">只有你的聊絡人可以不可逆的刪除訊息（你可以將它標記為刪除）。（24小時）</string>
    <string name="only_your_contact_can_send_voice">只有你的聯絡人可以傳送語音訊息。</string>
    <string name="prohibit_direct_messages">禁止私訊群組內的成員。</string>
    <string name="message_deletion_prohibited_in_chat">不可逆地刪除訊息於這個群組內是禁用的。</string>
@@ -899,7 +900,7 @@
    <string name="icon_descr_expand_role">添加更多身份選項</string>
    <string name="icon_descr_context">聯絡人頭像</string>
    <string name="icon_descr_profile_image_placeholder">個人檔案頭像占位符</string>
-    <string name="immune_to_spam_and_abuse">不受垃圾郵件和濫用行為影響</string>
+    <string name="immune_to_spam_and_abuse">不受垃圾和騷擾訊息影響</string>
    <string name="contact_wants_to_connect_via_call">%1$s 希望透過以下方式聯絡你</string>
    <string name="icon_descr_video_on">開啟視訊</string>
    <string name="icon_descr_flip_camera">翻轉相機</string>
@@ -908,7 +909,7 @@
    <string name="your_calls">你的通話</string>
    <string name="always_use_relay">經由分程傳遞連接</string>
    <string name="call_on_lock_screen">在上鎖畫面顯示來電通知：</string>
-    <string name="integrity_msg_skipped">%1$d 你錯過了多個訊息</string>
+    <string name="integrity_msg_skipped">%1$d 條訊息已跳過</string>
    <string name="integrity_msg_bad_hash">錯誤的訊息雜湊值</string>
    <string name="alert_title_skipped_messages">你錯過了多個訊息</string>
    <string name="settings_section_title_you">你</string>
@@ -1103,7 +1104,7 @@
    <string name="alert_text_decryption_error_n_messages_failed_to_decrypt">%1$d 訊息解密失敗。</string>
    <string name="network_socks_toggle_use_socks_proxy">使用SOCKS 代理伺服器</string>
    <string name="your_XFTP_servers">你的 XFTP 伺服器</string>
-    <string name="alert_text_decryption_error_too_many_skipped">%1$d 錯過了多個訊息。</string>
+    <string name="alert_text_decryption_error_too_many_skipped">%1$d 條訊息已跳過。</string>
    <string name="v5_0_large_files_support">影片和檔案和最大上限為1gb</string>
    <string name="gallery_video_button">影片</string>
    <string name="submit_passcode">呈交</string>
@@ -1111,7 +1112,7 @@
    <string name="learn_more">查看更多</string>
    <string name="simplex_address">SimpleX 聯絡地址</string>
    <string name="one_time_link_short">一次性連結</string>
-    <string name="theme_colors_section_title">主題顏色</string>
+    <string name="theme_colors_section_title">介面顏色</string>
    <string name="create_simplex_address">建立 SimpleX 的聯絡地址</string>
    <string name="profile_update_will_be_sent_to_contacts">更新了的個人檔案將傳送給你的聯絡人。</string>
    <string name="share_address_with_contacts_question">與你的聯絡人分享聯絡地址？</string>
@@ -1140,7 +1141,7 @@
    <string name="color_sent_message">已傳送訊息</string>
    <string name="color_title">標題</string>
    <string name="learn_more_about_address">關於 SimpleX 的聯絡地址</string>
-    <string name="color_primary_variant">外加的顏色</string>
+    <string name="color_primary_variant">額外的強調色</string>
    <string name="color_secondary_variant">外加的輔助</string>
    <string name="address_section_title">聯絡地址</string>
    <string name="color_background">後台</string>
@@ -1241,4 +1242,563 @@
 \n- 編輯紀錄。</string>
    <string name="search_verb">搜尋</string>
    <string name="la_mode_off">已關閉</string>
+    <string name="v5_8_safe_files_descr">確認來自未知伺服器的檔案。</string>
+    <string name="snd_error_quota">超出額度 - 收件人未收到先前傳送的訊息</string>
+    <string name="v5_6_app_data_migration">應用程式資料轉移</string>
+    <string name="migrate_to_device_apply_onion">應用</string>
+    <string name="migrate_from_device_confirm_you_remember_passphrase">請在轉移之前確認你還記得數據庫密碼</string>
+    <string name="blocked_by_admin_item_description">被管理員封鎖</string>
+    <string name="wallpaper_advanced_settings">進階設定</string>
+    <string name="v5_4_block_group_members">封鎖群組成員</string>
+    <string name="servers_info_subscriptions_connections_subscribed">活躍連接</string>
+    <string name="abort_switch_receiving_address_confirm">中止</string>
+    <string name="rcv_group_and_other_events">和其他 %d 事件</string>
+    <string name="block_member_question">封鎖成員？</string>
+    <string name="v5_3_new_interface_languages">6種全新的介面語言</string>
+    <string name="audio_device_bluetooth">藍芽</string>
+    <string name="moderated_items_description">%2$s 審核了 %1$d 條訊息</string>
+    <string name="blocked_item_description">已封鎖</string>
+    <string name="abort_switch_receiving_address_desc">將停止地址更改。將使用舊聯絡地址。</string>
+    <string name="app_check_for_updates_beta">測試</string>
+    <string name="app_check_for_updates">檢查更新</string>
+    <string name="permissions_camera_and_record_audio">相機和麥克風</string>
+    <string name="block_member_confirmation">封鎖</string>
+    <string name="theme_destination_app_theme">應用程式主題</string>
+    <string name="feature_roles_admins">管理員</string>
+    <string name="v6_0_privacy_blur">模糊以增強隱私</string>
+    <string name="feature_roles_all_members">所有成員</string>
+    <string name="v5_6_safer_groups_descr">管理員可以為所有人封鎖一名成員</string>
+    <string name="cannot_share_message_alert_title">無法傳送訊息</string>
+    <string name="block_for_all_question">為所有成員封鎖此成員？</string>
+    <string name="theme_black">黑</string>
+    <string name="abort_switch_receiving_address_question">中止更改地址？</string>
+    <string name="cant_send_message_to_member_alert_title">無法傳送訊息給群組成員</string>
+    <string name="chat_theme_apply_to_all_modes">所有顏色模式</string>
+    <string name="chat_theme_apply_to_mode">應用到</string>
+    <string name="la_app_passcode">應用程式密碼</string>
+    <string name="settings_section_title_app">應用程式</string>
+    <string name="settings_section_title_chat_colors">聊天顏色</string>
+    <string name="chat_is_stopped_you_should_transfer_database">聊天已停止。如果你已經在另一台設備使用過此資料庫，你應該在啟動聊天前將數據庫傳輸回來。</string>
+    <string name="in_developing_title">即將推出！</string>
+    <string name="app_check_for_updates_download_completed_title">軟體更新以下載</string>
+    <string name="v6_0_your_contacts_descr">儲存聯絡人以便稍後聊天</string>
+    <string name="permissions_camera">相機</string>
+    <string name="choose_file_title">選擇一個檔案</string>
+    <string name="migrate_from_device_archive_and_upload">存檔並上傳</string>
+    <string name="migrate_from_device_all_data_will_be_uploaded">你的所有聯絡人、對話和檔案將被安全加密並切塊上傳到你設定的 XFTP 中繼</string>
+    <string name="migrate_from_device_archiving_database">正在儲存資料庫</string>
+    <string name="migrate_from_device_cancel_migration">取消遷移</string>
+    <string name="snd_conn_event_ratchet_sync_started">與 %s 協調加密中…</string>
+    <string name="turn_off_battery_optimization_button">允許</string>
+    <string name="call_service_notification_audio_call">語音通話</string>
+    <string name="camera_not_available">相機不可用</string>
+    <string name="clear_note_folder_warning">所有訊息都將被刪除 - 這無法復原</string>
+    <string name="socks_proxy_setting_limitations"><![CDATA[<b>請注意</b>：訊息和檔案中繼通過 SOCKS 代理連接。通話和傳送連預覽使用直接連接。]]></string>
+    <string name="block_for_all">封鎖全部</string>
+    <string name="v5_4_better_groups">改進群組功能</string>
+    <string name="network_type_cellular">行動網路</string>
+    <string name="block_member_button">封鎖成員</string>
+    <string name="migrate_from_device_archive_will_be_deleted"><![CDATA[<b>警告</b>：此存檔將被刪除。]]></string>
+    <string name="clear_note_folder_question">清除私密筆記？</string>
+    <string name="add_contact_tab">添加聯絡人</string>
+    <string name="network_smp_proxy_mode_always">總是</string>
+    <string name="conn_event_ratchet_sync_started">協調加密中…</string>
+    <string name="allow_to_send_files">允許傳送檔案和媒體</string>
+    <string name="allow_to_send_simplex_links">允許傳送 SimpleX 連結</string>
+    <string name="v5_2_more_things">其他</string>
+    <string name="connect_plan_already_connecting">已連接！</string>
+    <string name="abort_switch_receiving_address">中止更改地址</string>
+    <string name="connect__a_new_random_profile_will_be_shared">將分享新的隨機個人檔案</string>
+    <string name="block_member_desc">所有來自 %s 的新訊息都將被隱藏！</string>
+    <string name="rcv_group_event_member_blocked">已封鎖 %s</string>
+    <string name="group_member_role_author">作者</string>
+    <string name="member_info_member_blocked">已封鎖</string>
+    <string name="member_blocked_by_admin">被管理員封鎖</string>
+    <string name="color_primary_variant2">額外的強調色2</string>
+    <string name="v5_3_new_interface_languages_descr">阿拉伯語、保加利亞語、芬蘭語、希伯來語、泰國語和烏克蘭語——感謝使用者們與Weblate</string>
+    <string name="connect_plan_already_joining_the_group">已加入群組！</string>
+    <string name="migrate_to_device_confirm_network_settings">確認網路設定</string>
+    <string name="attempts_label">嘗試</string>
+    <string name="acknowledged">已確認</string>
+    <string name="acknowledgement_errors">確認錯誤</string>
+    <string name="completed">完成</string>
+    <string name="chunks_deleted">區塊已刪除</string>
+    <string name="chunks_uploaded">區塊已上傳</string>
+    <string name="chunks_downloaded">區塊已下載</string>
+    <string name="add_contact_button_to_create_link_or_connect_via_link"><![CDATA[<b>添加聯絡人</b>: 來創建新的邀請連結，或通過你收到的連結進行連接。]]></string>
+    <string name="create_group_button_to_create_new_group"><![CDATA[<b>建立群組</b>: 建立新的群組。]]></string>
+    <string name="bad_desktop_address">錯誤的桌面地址</string>
+    <string name="migrate_to_device_chat_migrated">已轉移聊天</string>
+    <string name="migrate_from_device_choose_migrate_from_another_device"><![CDATA[在新的設備上選擇 <i>從另一部設備轉移</i> 並掃描QR code。]]></string>
+    <string name="migrate_from_device_using_on_two_device_breaks_encryption"><![CDATA[<b>請注意</b>: 作為安全保護措施，在兩部設備上使用同一數據庫會破壞解密來自你聯絡人的訊息。]]></string>
+    <string name="confirm_delete_contact_question">確定刪除聯絡人？</string>
+    <string name="app_check_for_updates_notice_title">檢查更新</string>
+    <string name="cant_call_contact_alert_title">無法與聯絡人通話</string>
+    <string name="calls_prohibited_alert_title">通話被禁止！</string>
+    <string name="cant_call_member_alert_title">無法與群組成員通話</string>
+    <string name="v5_3_encrypt_local_files_descr">應用程式將為新的本機檔案（影片除外）加密。</string>
+    <string name="migrate_from_device_check_connection_and_try_again">檢查你的網路連接並重試</string>
+    <string name="all_users">所有配置文件</string>
+    <string name="smp_servers_configured">已設定的 SMP 伺服器</string>
+    <string name="settings_section_title_chat_theme">聊天主題</string>
+    <string name="info_view_call_button">通話</string>
+    <string name="network_smp_proxy_fallback_allow_downgrade">允許降級</string>
+    <string name="network_smp_proxy_mode_always_description">始終使用私密路由。</string>
+    <string name="chat_database_exported_title">以導出聊天資料庫</string>
+    <string name="xftp_servers_configured">已設定的 XFTP 伺服器</string>
+    <string name="color_mode">色彩模式</string>
+    <string name="deleted_chats">已儲存的聯絡人</string>
+    <string name="privacy_media_blur_radius">模糊媒體</string>
+    <string name="allow_calls_question">允許通話？</string>
+    <string name="share_text_created_at">建立於：%s</string>
+    <string name="error_initializing_web_view">Webview 初始化失敗。更新你的系統到新版本。請聯繫開發者。
+\n錯誤：%s</string>
+    <string name="rcv_direct_event_contact_deleted">已刪除聯絡人</string>
+    <string name="rcv_group_events_count">%d 個群事件</string>
+    <string name="message_too_large">訊息太大</string>
+    <string name="message_delivery_warning_title">訊息傳送警告</string>
+    <string name="ci_status_other_error">錯誤：%1$s</string>
+    <string name="developer_options_section">開發者選項</string>
+    <string name="snd_conn_event_ratchet_sync_required">與 %s 的加密需要重協商</string>
+    <string name="remote_host_error_inactive"><![CDATA[行動裝置 <b>%s</b> 不活躍]]></string>
+    <string name="favorite_chat">最喜歡</string>
+    <string name="v5_2_message_delivery_receipts">訊息成功送達！</string>
+    <string name="files_and_media">檔案和媒體</string>
+    <string name="remote_ctrl_was_disconnected_title">連線停止</string>
+    <string name="remote_host_error_bad_state"><![CDATA[與行動裝置 \u0020<b>%s</b>的連接不穩定]]></string>
+    <string name="receipts_section_contacts">聯絡人</string>
+    <string name="wallpaper_scale_fit">適合</string>
+    <string name="group_members_can_send_files">群組成員可以傳送檔案和媒體。</string>
+    <string name="linked_mobiles">連結行動裝置</string>
+    <string name="files_are_prohibited_in_group">此群組禁止檔案和媒體</string>
+    <string name="call_service_notification_end_call">結束通話</string>
+    <string name="delete_messages__question">刪除 %d 條訊息嗎？</string>
+    <string name="privacy_message_draft">訊息草稿</string>
+    <string name="conn_event_ratchet_sync_allowed">允許重新協商加密</string>
+    <string name="info_row_created_at">建立於</string>
+    <string name="error_blocking_member_for_all">為所有人封鎖時出錯</string>
+    <string name="desktop_app_version_is_incompatible">桌面應用版本 %s 與此應用不相容</string>
+    <string name="file_error_no_file">未找到檔案 - 檔案可能被刪除或被取消了</string>
+    <string name="file_error_relay">檔案伺服器錯誤：%1$s</string>
+    <string name="expand_verb">展開</string>
+    <string name="receipts_groups_enable_keep_overrides">啟用（保留組覆蓋）</string>
+    <string name="color_mode_light">淺色</string>
+    <string name="chat_theme_apply_to_light_mode">淺色模式</string>
+    <string name="group_members_can_send_simplex_links">群組成員可傳送 SimpleX 連結。</string>
+    <string name="color_mode_dark">深色</string>
+    <string name="servers_info_details">詳情</string>
+    <string name="servers_info_subscriptions_section_header">訊息接收</string>
+    <string name="error_parsing_uri_title">無效連結</string>
+    <string name="marked_deleted_items_description">%d 條訊息被標記為刪除</string>
+    <string name="blocked_items_description">%d 條訊息已攔截</string>
+    <string name="smp_proxy_error_broker_host">轉發伺服器地址不相容網路設定：%1$s。</string>
+    <string name="smp_proxy_error_broker_version">轉發伺服器地址不相容網路設定：%1$s。</string>
+    <string name="proxy_destination_error_broker_host">%1$s 的目標伺服器地址不相容轉送伺服器 %2$s 的設定</string>
+    <string name="proxy_destination_error_broker_version">%1$s 的目地伺服器版本不相容於轉送伺服器 %2$s.</string>
+    <string name="disable_notifications_button">關閉通知</string>
+    <string name="snd_error_expired">網路問題 - 多次嘗試傳送訊息後，訊息已過期。</string>
+    <string name="snd_error_proxy_relay">轉發伺服器：%1$s
+\n目標伺服器錯誤：%2$s</string>
+    <string name="member_inactive_desc">如果成員變得活躍，可能會在之後傳送訊息。</string>
+    <string name="contact_deleted">刪除了聯絡人！</string>
+    <string name="delete_contact_cannot_undo_warning">聯絡人將被刪除 - 無法復原此操作</string>
+    <string name="network_smp_proxy_fallback_prohibit">不</string>
+    <string name="app_check_for_updates_disabled">已停用</string>
+    <string name="app_check_for_updates_installed_successfully_title">安裝成功</string>
+    <string name="create_address_button">建立</string>
+    <string name="unable_to_open_browser_title">打開瀏覽器出錯</string>
+    <string name="receipts_contacts_enable_keep_overrides">啟用（保留覆蓋）</string>
+    <string name="receipts_groups_disable_keep_overrides">禁用（保留組覆蓋）</string>
+    <string name="receipts_groups_title_enable">為群組啟用回執？</string>
+    <string name="settings_section_title_network_connection">網路連接</string>
+    <string name="chat_database_exported_continue">繼續</string>
+    <string name="info_row_file_status">檔案狀態</string>
+    <string name="dark_mode_colors">深色模式顏色</string>
+    <string name="appearance_font_size">字體大小</string>
+    <string name="feature_enabled_for">啟用於</string>
+    <string name="v5_7_new_interface_languages">立陶宛語使用者介面</string>
+    <string name="v5_8_chat_themes">新的聊天主題</string>
+    <string name="v6_0_connection_servers_status_descr">連線和伺服器狀態</string>
+    <string name="v6_0_connection_servers_status">控制你的網路</string>
+    <string name="v6_0_upgrade_app_descr">從GitHub下載最新版本。</string>
+    <string name="enable_receipts_all">啟用</string>
+    <string name="v6_0_new_chat_experience">新的聊天體驗 🎉</string>
+    <string name="v6_0_new_media_options">新的媒體選項</string>
+    <string name="connected_mobile">以連接的行動裝置</string>
+    <string name="connected_desktop">連接桌面</string>
+    <string name="connected_to_desktop">連接到桌面</string>
+    <string name="desktop_connection_terminated">連線終止</string>
+    <string name="connect_to_desktop">連接到桌面</string>
+    <string name="migrate_from_device_error_uploading_archive">上傳存檔出錯</string>
+    <string name="migrate_to_device_file_delete_or_link_invalid">文件被刪除或鏈接無效</string>
+    <string name="migrate_to_device_import_failed">導入失敗</string>
+    <string name="audio_device_wired_headphones">頭戴式耳機</string>
+    <string name="audio_device_earpiece">耳機</string>
+    <string name="receipts_contacts_disable_for_all">對所有聯絡人關閉</string>
+    <string name="chat_theme_apply_to_dark_mode">深色模式</string>
+    <string name="error_enabling_delivery_receipts">啟用已讀回條時出錯！</string>
+    <string name="this_device_version"><![CDATA[<i>(此裝置 v%s)</i>]]></string>
+    <string name="desktop_incompatible_version">不相容的版本</string>
+    <string name="remote_ctrl_error_disconnected">PC版已斷線</string>
+    <string name="migrate_from_device_title">轉移裝置</string>
+    <string name="v5_7_call_sounds">通話鈴聲</string>
+    <string name="v5_7_forward">轉發並保存訊息</string>
+    <string name="v5_7_forward_descr">訊息來源保持私密</string>
+    <string name="no_connected_mobile">沒有已連接的行動裝置</string>
+    <string name="files_and_media_prohibited">禁止檔案和媒體！</string>
+    <string name="loading_remote_file_title">檔案載入中</string>
+    <string name="file_error">檔案錯誤</string>
+    <string name="update_network_smp_proxy_fallback_question">備用訊息路由</string>
+    <string name="network_smp_proxy_fallback_prohibit_description">如果你或你的目標伺服器不支持私密路由，將不直接傳送訊息。</string>
+    <string name="create_another_profile_button">建立個人資料</string>
+    <string name="migrate_from_another_device">從另一台裝置轉移</string>
+    <string name="profile_update_event_member_name_changed">成員姓名從 %1$s 改為了 %2$s</string>
+    <string name="conn_event_ratchet_sync_agreed">同意加密</string>
+    <string name="info_row_message_status">訊息狀態</string>
+    <string name="connect_via_member_address_alert_desc">連接請求將傳送給該組成員。</string>
+    <string name="v5_2_more_things_descr">- 更穩定的消息傳送。
+\n- 更好的群組。
+\n- 還有更多！</string>
+    <string name="v5_5_new_interface_languages">匈牙利語和土耳其語用戶界面</string>
+    <string name="migrate_from_device_migration_complete">轉移完成</string>
+    <string name="migrate_from_device_delete_database_from_device">從此裝置刪除數據庫</string>
+    <string name="delivery">傳送</string>
+    <string name="download_file">下載</string>
+    <string name="forward_chat_item">轉發</string>
+    <string name="forwarded_chat_item_info_tab">已轉發</string>
+    <string name="forwarded_from_chat_item_info_title">轉發自</string>
+    <string name="files_and_media_not_allowed">不允許檔案和媒體</string>
+    <string name="forward_message">轉發訊息…</string>
+    <string name="creating_link">建立連結中…</string>
+    <string name="keep_invitation_link">保留</string>
+    <string name="profile_update_event_contact_name_changed">聯絡人姓名從 %1$s 改為了 %2$s</string>
+    <string name="new_message">新訊息</string>
+    <string name="invite_friends_short">邀請</string>
+    <string name="receipts_contacts_disable_keep_overrides">停用（保留覆蓋）</string>
+    <string name="share_text_message_status">訊息狀態：%s</string>
+    <string name="message_queue_info">訊息隊列資訊</string>
+    <string name="servers_info_messages_received">收到的訊息</string>
+    <string name="encrypt_local_files">加密本機檔案</string>
+    <string name="settings_section_title_files">檔案</string>
+    <string name="receipts_groups_disable_for_all">對所有群組關閉</string>
+    <string name="wallpaper_scale_fill">填充</string>
+    <string name="v5_8_chat_themes_descr">讓你的聊天看上去不相同！</string>
+    <string name="v6_0_increase_font_size">增大字體大小。</string>
+    <string name="migrate_to_device_enter_passphrase">輸入密碼短語</string>
+    <string name="servers_info_messages_sent">傳送的訊息</string>
+    <string name="remote_ctrl_error_busy">PC版處理中</string>
+    <string name="connect_via_link_incognito">隱身模式連接</string>
+    <string name="conversation_deleted">已刪除對話！</string>
+    <string name="snd_error_relay">目標伺服器錯誤：%1$s</string>
+    <string name="loading_chats">聊天載入中…</string>
+    <string name="message_forwarded_title">已轉發的訊息</string>
+    <string name="blocked_by_admin_items_description">管理員封鎖了 %d 條訊息</string>
+    <string name="smp_proxy_error_connecting">連結轉發伺服器 %1$s 出錯。請稍候嘗試。</string>
+    <string name="migrate_from_device_error_deleting_database">刪除資料庫出錯</string>
+    <string name="snd_error_proxy">轉發伺服器：%1$s
+\n錯誤：%2$s</string>
+    <string name="proxy_destination_error_failed_to_connect">轉發伺服器 %1$s 連結目標伺服器 %2$s 失敗。請稍後嘗試。</string>
+    <string name="migrate_to_device_importing_archive">導入存檔中</string>
+    <string name="v5_8_message_delivery">改進訊息傳送</string>
+    <string name="app_check_for_updates_button_install">安裝更新</string>
+    <string name="v6_0_private_routing_descr">它保護你的 IP 位址和連線。</string>
+    <string name="v5_5_join_group_conversation">加入群組對話</string>
+    <string name="remote_host_error_bad_version"><![CDATA[不支援行動裝置 <b>%s</b> 的版本。請檢察兩台裝置安裝的是否版本相同]]></string>
+    <string name="v5_7_network_descr">更可靠的網路連接</string>
+    <string name="v5_3_discover_join_groups">發現和加入群組</string>
+    <string name="devices">裝置</string>
+    <string name="new_mobile_device">新行動裝置</string>
+    <string name="migrate_from_device_error_saving_settings">保存設定出錯</string>
+    <string name="migrate_from_device_exported_file_doesnt_exist">導出的檔案不存在</string>
+    <string name="migrate_from_device_error_exporting_archive">導出資料庫時出錯</string>
+    <string name="migrate_from_device_confirm_upload">確認上傳</string>
+    <string name="migrate_from_device_creating_archive_link">正在建立存檔連結</string>
+    <string name="conn_event_ratchet_sync_ok">加密OK</string>
+    <string name="unblock_member_desc">將顯示來自 %s 的訊息！</string>
+    <string name="delivery_receipts_title">送達回執！</string>
+    <string name="forwarded_description">已轉發</string>
+    <string name="e2ee_info_no_pq"><![CDATA[訊息、檔案和通話均受到<b>端對端加密</b>的保護，並具有完全的前向加密、不可否認性和入侵恢復。]]></string>
+    <string name="encryption_renegotiation_error">加密協商錯誤</string>
+    <string name="e2ee_info_pq"><![CDATA[訊息、檔案和通話受到完全前向加密、不可否認性和入侵恢復的<b>抗量子端對端加密</b>保護。]]></string>
+    <string name="alert_text_encryption_renegotiation_failed">加密重協商失敗</string>
+    <string name="database_encryption_will_be_updated_in_settings">將更新資料庫密碼並儲存在設定中。</string>
+    <string name="v5_4_incognito_groups_descr">使用隨機身分建立群組</string>
+    <string name="v5_4_better_groups_descr">加入速度更快、訊息更可靠。</string>
+    <string name="v5_4_incognito_groups">匿名群組</string>
+    <string name="link_a_mobile">連接行動裝置</string>
+    <string name="in_reply_to">回復</string>
+    <string name="connect_with_contact_name_question">和 %1$s 連接？</string>
+    <string name="v5_3_new_desktop_app_descr">在桌面應用裡建立新的帳號。💻</string>
+    <string name="enter_this_device_name">輸入此裝置名稱…</string>
+    <string name="connected_to_mobile">已連結到行動裝置</string>
+    <string name="multicast_discoverable_via_local_network">可通過局域網發現</string>
+    <string name="new_desktop"><![CDATA[<i>（新）</i>]]></string>
+    <string name="agent_critical_error_title">嚴重錯誤</string>
+    <string name="agent_internal_error_title">內部錯誤</string>
+    <string name="migrate_from_device_error_verifying_passphrase">驗證密碼短語出錯：</string>
+    <string name="failed_to_create_user_invalid_title">顯示名稱無效！</string>
+    <string name="non_content_uri_alert_title">無效的檔案路徑</string>
+    <string name="v5_2_favourites_filter_descr">過濾未讀和收藏的聊天記錄。</string>
+    <string name="disconnect_remote_host">斷開連結</string>
+    <string name="disconnect_desktop_question">斷開桌面連結？</string>
+    <string name="error_aborting_address_change">中止地址更改時出錯</string>
+    <string name="error_showing_desktop_notification">顯示通知出錯，請聯繫開發者。</string>
+    <string name="delete_and_notify_contact">刪除並通知聯絡人</string>
+    <string name="update_network_smp_proxy_mode_question">訊息路由模式</string>
+    <string name="network_smp_proxy_mode_never_description">不使用私密路由。</string>
+    <string name="permissions_grant">要進行通話請授予一項或多項權限</string>
+    <string name="permissions_find_in_settings_and_grant">在 Android 系統設定中找到此權限並手動授予權限。</string>
+    <string name="permissions_grant_in_settings">在系統設定中授予</string>
+    <string name="error_sending_message_contact_invitation">傳送邀請出錯</string>
+    <string name="error_creating_member_contact">建立聯絡人時出錯</string>
+    <string name="v5_2_disappear_one_message">移除一條訊息</string>
+    <string name="v5_2_fix_encryption">保持連接</string>
+    <string name="v5_3_discover_join_groups_descr">- 連接到目錄服務（BETA）！
+\n- 發送回執（最多20名成員）。
+\n- 更快，更穩定。</string>
+    <string name="v5_4_link_mobile_desktop">連接行動端和桌面端應用程式！ 🔗</string>
+    <string name="v5_5_message_delivery">改進訊息傳送</string>
+    <string name="delivery_receipts_are_disabled">已關閉送達回執！</string>
+    <string name="remote_host_was_disconnected_toast"><![CDATA[行動裝置 <b>%s</b> 斷開連接]]></string>
+    <string name="remote_host_error_missing"><![CDATA[行動裝置 <b>%s</b> 未找到]]></string>
+    <string name="migrate_to_device_downloading_archive">存檔下載中</string>
+    <string name="migrate_to_device_migrating">轉移中</string>
+    <string name="migrate_to_device_download_failed">下載失敗</string>
+    <string name="receipts_groups_enable_for_all">為所有組啟用</string>
+    <string name="conn_event_ratchet_sync_required">需要重協商加密</string>
+    <string name="send_receipts_disabled">關閉</string>
+    <string name="fix_connection">修復連結</string>
+    <string name="fix_connection_not_supported_by_contact">修復聯絡人不支援的問題</string>
+    <string name="fix_connection_confirm">修復</string>
+    <string name="fix_connection_question">修復連結？</string>
+    <string name="database_migration_in_progress">正在進行資料庫轉移。
+\n可能需要幾分鐘時間。</string>
+    <string name="error_creating_message">建立訊息出錯</string>
+    <string name="error_deleting_note_folder">刪除私密筆記錯誤</string>
+    <string name="enable_camera_access">啟用相機訪問</string>
+    <string name="new_chat">新聊天</string>
+    <string name="receipts_contacts_enable_for_all">為所有人啟用</string>
+    <string name="error_synchronizing_connection">同步連接時出錯</string>
+    <string name="error_showing_content">顯示內容出錯</string>
+    <string name="error_showing_message">顯示訊息出錯</string>
+    <string name="error_alert_title">錯誤</string>
+    <string name="system_restricted_background_in_call_title">無後台通話</string>
+    <string name="create_chat_profile">建立聊天資料</string>
+    <string name="snd_conn_event_ratchet_sync_agreed">已同意 %s 的加密</string>
+    <string name="snd_conn_event_ratchet_sync_allowed">允許重新協商與 %s 的加密</string>
+    <string name="snd_conn_event_ratchet_sync_ok">與 %s 的加密OK</string>
+    <string name="desktop_devices">桌面設備</string>
+    <string name="linked_desktop_options">連接桌面選項</string>
+    <string name="linked_desktops">連接桌面</string>
+    <string name="rcv_group_event_member_created_contact">直接連線中</string>
+    <string name="action_button_add_members">邀請</string>
+    <string name="create_group_button">建立群組</string>
+    <string name="fix_connection_not_supported_by_group_member">修復群組成員不支援的問題</string>
+    <string name="v6_0_connect_faster_descr">更快地連接到你的好友</string>
+    <string name="v6_0_delete_many_messages_descr">最多同時刪除20條訊息</string>
+    <string name="remote_ctrl_error_inactive">PC版非活躍</string>
+    <string name="servers_info_connected_servers_section_header">已連接的伺服器</string>
+    <string name="servers_info_detailed_statistics">詳細統計數據</string>
+    <string name="member_info_member_disabled">已停用</string>
+    <string name="member_info_member_inactive">不活躍</string>
+    <string name="connect_via_member_address_alert_title">直接連接？</string>
+    <string name="wallpaper_preview_hello_alice">午安！</string>
+    <string name="wallpaper_preview_hello_bob">早安！</string>
+    <string name="disable_sending_recent_history">不向新成員傳送歷史訊息</string>
+    <string name="recent_history_is_not_sent_to_new_members">未發送歷史訊息給新成員。</string>
+    <string name="v5_6_quantum_resistant_encryption_descr">在私聊中開啟（測試版）！</string>
+    <string name="v5_6_app_data_migration_descr">透過QR code轉移到另一部裝置。</string>
+    <string name="dont_enable_receipts">不啟用</string>
+    <string name="error">錯誤</string>
+    <string name="remote_host_was_disconnected_title">連線停止</string>
+    <string name="remote_host_disconnected_from"><![CDATA[和移動裝置<b>%s</b>的連結斷開，原因是：%s]]></string>
+    <string name="remote_ctrl_disconnected_with_reason">斷線原因：%s</string>
+    <string name="disconnect_remote_hosts">斷開行動裝置連接</string>
+    <string name="desktop_address">桌面地址</string>
+    <string name="discover_on_network">通過局域網發現</string>
+    <string name="remote_host_error_busy"><![CDATA[行動裝置 <b>%s</b> 處理中]]></string>
+    <string name="remote_host_error_disconnected"><![CDATA[行動裝置 <b>%s</b> 斷開連接]]></string>
+    <string name="migrate_to_device_downloading_details">下載連結詳情中</string>
+    <string name="connect_plan_group_already_exists">群組已存在！</string>
+    <string name="servers_info_modal_error_title">錯誤</string>
+    <string name="servers_info_downloaded">已下載</string>
+    <string name="servers_info_reset_stats_alert_error_title">重製統計數據出錯</string>
+    <string name="expired_label">已過期</string>
+    <string name="connections">連接數</string>
+    <string name="created">已建立</string>
+    <string name="deletion_errors">刪除錯誤</string>
+    <string name="decryption_errors">解密出錯</string>
+    <string name="deleted">已刪除</string>
+    <string name="downloaded_files">已下載的檔案</string>
+    <string name="download_errors">下載出錯</string>
+    <string name="possible_slow_function_desc">功能執行所花費的時間過長：%1$d 秒：%2$s</string>
+    <string name="invalid_name">無效名稱</string>
+    <string name="correct_name_to">正確名字為 %s?</string>
+    <string name="copy_error">複製錯誤</string>
+    <string name="connecting_to_desktop">正在連接到桌面</string>
+    <string name="found_desktop">找到桌面</string>
+    <string name="multicast_connect_automatically">自動連接</string>
+    <string name="remote_ctrl_error_bad_state">與PC版的連接不穩定</string>
+    <string name="desktop_device">桌面</string>
+    <string name="remote_ctrl_error_bad_version">已安裝的PC版本不支援。請確認兩台裝置所安裝的版本相同</string>
+    <string name="remote_ctrl_error_bad_invitation">PC版邀請碼錯誤</string>
+    <string name="connect_plan_connect_via_link">通過連結連接？</string>
+    <string name="connect_plan_join_your_group">加入你的群組嗎？</string>
+    <string name="migrate_to_device_title">轉移到此處</string>
+    <string name="invalid_file_link">無效連結</string>
+    <string name="migrate_to_device_finalize_migration">在另一部設備上完成轉移</string>
+    <string name="migrate_to_device_error_downloading_archive">下載存檔錯誤</string>
+    <string name="migrate_from_device_to_another_device">轉移到另一部裝置</string>
+    <string name="migrate_from_device_chat_should_be_stopped">必須停止聊天才能繼續。</string>
+    <string name="keep_conversation">保留對話</string>
+    <string name="delete_without_notification">不通知刪除</string>
+    <string name="invalid_qr_code">無效的QR code</string>
+    <string name="keep_unused_invitation_question">保留未使用的邀請嗎？</string>
+    <string name="receipts_contacts_title_disable">停用回執？</string>
+    <string name="receipts_contacts_title_enable">啟用回執？</string>
+    <string name="cant_call_contact_connecting_wait_alert_text">正在連接聯絡人，請等待或稍後檢查！</string>
+    <string name="cant_call_contact_deleted_alert_text">聯絡人被刪除了。</string>
+    <string name="info_row_debug_delivery">傳送調試</string>
+    <string name="v5_3_encrypt_local_files">為儲存的檔案和媒體加密</string>
+    <string name="connect_plan_connect_to_yourself">連接到你自己？</string>
+    <string name="migrate_from_device_finalize_migration">完成轉移</string>
+    <string name="current_user">目前配置文件</string>
+    <string name="servers_info_files_tab">檔案</string>
+    <string name="servers_info_reconnect_server_error">重連伺服器出錯</string>
+    <string name="servers_info_reconnect_servers_error">重連伺服器出錯</string>
+    <string name="duplicates_label">重複</string>
+    <string name="share_text_file_status">檔案狀態：%s</string>
+    <string name="permissions_required">授予權限</string>
+    <string name="permissions_record_audio">麥克風</string>
+    <string name="database_will_be_encrypted_and_passphrase_stored_in_settings">資料庫將被加密，密碼將儲存在設定中</string>
+    <string name="delete_members_messages__question">刪除成員的 %d 條訊息嗎？</string>
+    <string name="member_inactive_title">成員非活躍</string>
+    <string name="compose_message_placeholder">輸入訊息</string>
+    <string name="delete_messages_mark_deleted_warning">訊息將被標記為刪除。收信人可以揭示這些訊息。</string>
+    <string name="info_view_connect_button">連接</string>
+    <string name="info_view_message_button">訊息</string>
+    <string name="app_check_for_updates_notice_disable">停用</string>
+    <string name="app_check_for_updates_download_started">下載更新中，請不要關閉應用</string>
+    <string name="app_check_for_updates_button_download">下載 %s（%s）</string>
+    <string name="network_smp_proxy_mode_never">從不</string>
+    <string name="privacy_media_blur_radius_medium">中等</string>
+    <string name="media_and_file_servers">媒體和檔案伺服器</string>
+    <string name="message_servers">訊息伺服器</string>
+    <string name="v5_2_disappear_one_message_descr">即使在對話中禁用。</string>
+    <string name="v5_2_favourites_filter">更快的發起聊天</string>
+    <string name="v5_2_fix_encryption_descr">修復還原備份後的加密問題</string>
+    <string name="v5_7_network">網路管理</string>
+    <string name="v5_3_new_desktop_app">新的桌面應用！</string>
+    <string name="servers_info_sessions_connected">已連接</string>
+    <string name="servers_info_sessions_connecting">連接中</string>
+    <string name="servers_info_sessions_errors">錯誤</string>
+    <string name="receipts_groups_title_disable">為群組停用回執？</string>
+    <string name="past_member_vName">過往的成員 %1$s</string>
+    <string name="v5_8_private_routing">私密訊息路由 🚀</string>
+    <string name="paste_archive_link">貼上存檔連結</string>
+    <string name="open_on_mobile_and_scan_qr_code"><![CDATA[在行動應用中打開<i>從桌面使用</i>並掃描QR code。]]></string>
+    <string name="no_info_on_delivery">無傳送資訊</string>
+    <string name="or_show_this_qr_code">或者顯示此碼</string>
+    <string name="servers_info_subscriptions_connections_pending">待連接</string>
+    <string name="error_parsing_uri_desc">請檢查 Simple X 鏈接是否正確。</string>
+    <string name="note_folder_local_display_name">私密筆記</string>
+    <string name="please_try_later">請稍後再試。</string>
+    <string name="no_filtered_contacts">沒有過濾的聯絡人</string>
+    <string name="app_check_for_updates_button_open">打開檔案位置</string>
+    <string name="rcv_group_event_open_chat">打開</string>
+    <string name="v5_5_private_notes">私密筆記</string>
+    <string name="v5_8_persian_ui">波斯語用戶界面</string>
+    <string name="v6_0_chat_list_media">從聊天列表播放。</string>
+    <string name="migrate_from_device_database_init">正在準備上傳</string>
+    <string name="feature_roles_owners">擁有者</string>
+    <string name="not_compatible">不相容！</string>
+    <string name="agent_critical_error_desc">請將它報告給開發者：
+\n%s
+\n
+\n建議重啟應用。</string>
+    <string name="loading_remote_file_desc">從已連接行動裝置加載檔案時請稍候片刻</string>
+    <string name="or_scan_qr_code">或者掃描QR code</string>
+    <string name="prohibit_sending_simplex_links">禁止傳送 SimpleX 連結</string>
+    <string name="no_selected_chat">沒有選擇聊天</string>
+    <string name="permissions_open_settings">打開設定</string>
+    <string name="settings_section_title_user_theme">這人資料主題</string>
+    <string name="settings_section_title_profile_images">個人資料圖片</string>
+    <string name="only_one_device_can_work_at_the_same_time">同一時刻只有一台裝置可工作</string>
+    <string name="protect_ip_address">保護 IP 地址</string>
+    <string name="network_type_other">其他</string>
+    <string name="network_type_no_network_connection">無網路連接</string>
+    <string name="no_history">無歷史記錄</string>
+    <string name="no_filtered_chats">無過濾聊天</string>
+    <string name="agent_internal_error_desc">請將它報告給開發者：
+\n%s</string>
+    <string name="turn_off_system_restriction_button">打開應用程式設定</string>
+    <string name="auth_open_migration_to_another_device">開啟轉移畫面</string>
+    <string name="shutdown_alert_desc">通知將停止，直到您重啟應用程式</string>
+    <string name="prohibit_sending_files">禁止傳送檔案和媒體。</string>
+    <string name="connect_plan_open_group">打開群組</string>
+    <string name="only_owners_can_enable_files_and_media">只有群組所有者才能啟用檔案和媒體。</string>
+    <string name="paste_the_link_you_received_to_connect_with_your_contact">貼上你收到的連結以與你的聯絡人聯絡…</string>
+    <string name="servers_info_previously_connected_servers_section_header">先前連接的伺服器</string>
+    <string name="other_label">其他</string>
+    <string name="message_queue_info_none">無</string>
+    <string name="v5_4_more_things_descr">- 可選擇通知已刪除的聯絡人。
+\n- 帶空格的個人資料名稱。
+\n- 以及更多！</string>
+    <string name="v5_5_simpler_connect_ui">貼上連結以連接！</string>
+    <string name="paste_desktop_address">貼上桌面地址</string>
+    <string name="migrate_to_device_confirm_network_settings_footer">請確認此裝置的網路設定是否正確。</string>
+    <string name="other_errors">其他錯誤</string>
+    <string name="remote_ctrl_connection_stopped_desc">請檢查行動裝置和桌面設備連接到的是同一個本地網絡，且桌面防火牆允許連接。
+\n請和開發者分享任何其他問題。</string>
+    <string name="open_port_in_firewall_title">在防火牆中打開端口</string>
+    <string name="or_paste_archive_link">或貼上存檔連結</string>
+    <string name="migrate_to_device_database_init">正在準備下載</string>
+    <string name="only_delete_conversation">只刪除對話</string>
+    <string name="paste_link">貼上連結</string>
+    <string name="smp_servers_other">其他 SMP 伺服器</string>
+    <string name="xftp_servers_other">其他 XFTP 伺服器</string>
+    <string name="calls_prohibited_ask_to_enable_calls_alert_text">請讓你的聯絡人啟用通話。</string>
+    <string name="v5_6_picture_in_picture_calls">畫中畫通話</string>
+    <string name="migrate_from_device_or_share_this_file_link">或安全分享此文件連結</string>
+    <string name="servers_info_missing">無資訊，試試重新加載</string>
+    <string name="open_server_settings_button">打開伺服器設定</string>
+    <string name="private_routing_error">私密路由出錯</string>
+    <string name="message_forwarded_desc">尚無直接連接，訊息由管理員轉發。</string>
+    <string name="selected_chat_items_nothing_selected">什麼也沒選中</string>
+    <string name="info_view_open_button">打開</string>
+    <string name="network_smp_proxy_mode_private_routing">私密路由</string>
+    <string name="open_database_folder">打開資料庫文件夾</string>
+    <string name="settings_section_title_private_message_routing">私密訊息路由</string>
+    <string name="app_check_for_updates_installed_successfully_desc">請重啟應用程式。</string>
+    <string name="privacy_media_blur_radius_off">關閉</string>
+    <string name="v5_6_quantum_resistant_encryption">抗量子加密</string>
+    <string name="profile_update_event_removed_address">刪除了聯繫地址</string>
+    <string name="servers_info_reconnect_server_title">重連伺服器？</string>
+    <string name="servers_info_detailed_statistics_received_messages_header">接收到的訊息</string>
+    <string name="servers_info_detailed_statistics_receive_errors">接收錯誤</string>
+    <string name="servers_info_reconnect_servers_message">重新連接所有已連接的伺服器來強制傳送訊息。這會使用額外流量。</string>
+    <string name="servers_info_reconnect_server_message">重連伺服器強制傳送訊息。這會使用額外流量。</string>
+    <string name="network_option_rcv_concurrency">並行接收</string>
+    <string name="recipients_can_not_see_who_message_from">收件人看不到這條訊息來自誰。</string>
+    <string name="profile_update_event_removed_picture">刪除了資料圖片</string>
+    <string name="one_hand_ui">可使用的聊天工具箱</string>
+    <string name="v6_0_reachable_chat_toolbar">可存取的聊天工具欄</string>
+    <string name="v5_5_join_group_conversation_descr">最近歷史和改進的目錄機器人。</string>
+    <string name="network_option_protocol_timeout_per_kb">每 KB 協議超時</string>
+    <string name="v5_8_private_routing_descr">保護您的真實 IP 地址。不讓你聯絡人選擇的訊息中繼看到它。
+\n在*網絡&amp;伺服器*設定中開啓。</string>
+    <string name="you_can_change_it_later">隨機密碼以明文形式儲存在設定中。
+\n您可以稍後更改。</string>
+    <string name="send_receipts_disabled_alert_title">傳送回條已禁用</string>
+    <string name="servers_info_proxied_servers_section_header">代理伺服器</string>
+    <string name="servers_info_reconnect_servers_title">重連伺服器？</string>
+    <string name="conn_event_enabled_pq">抗量子端到端加密</string>
+    <string name="color_received_quote">收到的回覆</string>
+    <string name="servers_info_reconnect_all_servers_button">重連所有伺服器</string>
+    <string name="reconnect">重連</string>
+    <string name="proxied">代理</string>
+    <string name="random_port">隨機</string>
+    <string name="refresh_qr_code">更新</string>
+    <string name="servers_info_detailed_statistics_received_total">接收總計</string>
+    <string name="app_check_for_updates_button_remind_later">稍後提醒</string>
 </resources>
@@ -26,11 +26,11 @@ android.enableJetifier=true
 kotlin.mpp.androidSourceSetLayoutVersion=2
 kotlin.jvm.target=11

-android.version_name=6.0.1
-android.version_code=232
+android.version_name=6.0.2
+android.version_code=234

-desktop.version_name=6.0.1
-desktop.version_code=62
+desktop.version_name=6.0.2
+desktop.version_code=63

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