Merge branch 'master' into master-android

apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/model/SimpleXAPI.kt

@@ -740,7 +740,7 @@ object ChatController {
         val message = { String.format(generalGetString(MR.strings.network_error_desc), serverHostname(e.brokerAddress)) }
         return when (e.brokerErr) {
           is BrokerErrorType.TIMEOUT -> MR.strings.connection_timeout to message()
-          is BrokerErrorType.NETWORK -> MR.strings.connection_error to message()
+          is BrokerErrorType.NETWORK -> if (e.brokerErr.networkError is NetworkError.UnknownCAError) null else MR.strings.connection_error to message()
           else -> null
         }
       }
@@ -749,7 +749,7 @@ object ChatController {
           val message = { String.format(generalGetString(MR.strings.smp_proxy_error_connecting), serverHostname(e.serverAddress)) }
           return when (e.smpErr.proxyErr.brokerErr) {
             is BrokerErrorType.TIMEOUT -> MR.strings.private_routing_timeout to message()
-            is BrokerErrorType.NETWORK -> MR.strings.private_routing_error to message()
+            is BrokerErrorType.NETWORK -> if (e.smpErr.proxyErr.brokerErr.networkError is NetworkError.UnknownCAError) null else MR.strings.private_routing_error to message()
             else -> null
           }
         }
@@ -760,7 +760,7 @@ object ChatController {
             is ProxyError.BROKER ->
               when (e.proxyErr.protocolErr.proxyErr.brokerErr) {
                 is BrokerErrorType.TIMEOUT -> MR.strings.private_routing_timeout to message()
-                is BrokerErrorType.NETWORK -> MR.strings.private_routing_error to message()
+                is BrokerErrorType.NETWORK -> if (e.proxyErr.protocolErr.proxyErr.brokerErr.networkError is NetworkError.UnknownCAError) null else MR.strings.private_routing_error to message()
                 else -> null
               }
             is ProxyError.NO_SESSION -> MR.strings.private_routing_no_session to message()
@@ -2385,7 +2385,10 @@ object ChatController {
           && e.agentError.brokerErr is BrokerErrorType.NETWORK -> {
         AlertManager.shared.showAlertMsg(
           generalGetString(MR.strings.connection_error),
-          String.format(generalGetString(MR.strings.network_error_desc), serverHostname(e.agentError.brokerAddress))
+          String.format(
+            generalGetString(if (e.agentError.brokerErr.networkError is NetworkError.UnknownCAError) MR.strings.network_error_unknown_ca else MR.strings.network_error_desc),
+            serverHostname(e.agentError.brokerAddress)
+          )
         )
         true
       }
@@ -2439,7 +2442,10 @@ object ChatController {
           && pe.brokerErr is BrokerErrorType.NETWORK -> {
         AlertManager.shared.showAlertMsg(
           generalGetString(MR.strings.private_routing_error),
-          String.format(generalGetString(MR.strings.smp_proxy_error_connecting), serverHostname(srvAddr))
+          String.format(
+            generalGetString(if (pe.brokerErr.networkError is NetworkError.UnknownCAError) MR.strings.smp_proxy_error_unknown_ca else MR.strings.smp_proxy_error_connecting),
+            serverHostname(srvAddr)
+          )
         )
         true
       }
@@ -2478,7 +2484,8 @@ object ChatController {
           && pe.brokerErr is BrokerErrorType.NETWORK -> {
         AlertManager.shared.showAlertMsg(
           generalGetString(MR.strings.private_routing_error),
-          String.format(generalGetString(MR.strings.proxy_destination_error_failed_to_connect), serverHostname(proxyServer), serverHostname(relayServer))
+          if (pe.brokerErr.networkError is NetworkError.UnknownCAError) String.format(generalGetString(MR.strings.proxy_destination_error_unknown_ca), serverHostname(relayServer))
+          else String.format(generalGetString(MR.strings.proxy_destination_error_failed_to_connect), serverHostname(proxyServer), serverHostname(relayServer))
         )
         true
       }
@@ -4601,9 +4608,10 @@ data class ProtocolTestFailure(
         err + " " + generalGetString(MR.strings.error_smp_test_server_auth)
       testError is AgentErrorType.XFTP && testError.xftpErr is XFTPErrorType.AUTH ->
         err + " " + generalGetString(MR.strings.error_xftp_test_server_auth)
-      testError is AgentErrorType.BROKER && testError.brokerErr is BrokerErrorType.NETWORK ->
+      testError is AgentErrorType.BROKER && testError.brokerErr is BrokerErrorType.NETWORK && testError.brokerErr.networkError is NetworkError.UnknownCAError ->
         err + " " + generalGetString(MR.strings.error_smp_test_certificate)
-      else -> err
+      else ->
+        err + " " + String.format(generalGetString(MR.strings.error_with_info), testError.toString())
     }
   }
 }
@@ -7408,7 +7416,7 @@ sealed class BrokerErrorType {
   }
   @Serializable @SerialName("RESPONSE") class RESPONSE(val smpErr: String): BrokerErrorType()
   @Serializable @SerialName("UNEXPECTED") object UNEXPECTED: BrokerErrorType()
-  @Serializable @SerialName("NETWORK") object NETWORK: BrokerErrorType()
+  @Serializable @SerialName("NETWORK") class NETWORK(val networkError: NetworkError): BrokerErrorType()
   @Serializable @SerialName("HOST") object HOST: BrokerErrorType()
   @Serializable @SerialName("TRANSPORT") class TRANSPORT(val transportErr: SMPTransportError): BrokerErrorType()
   @Serializable @SerialName("TIMEOUT") object TIMEOUT: BrokerErrorType()
@@ -7495,6 +7503,16 @@ sealed class ProtocolCommandError {
   @Serializable @SerialName("NO_QUEUE") object NO_QUEUE: ProtocolCommandError()
 }
 
+@Serializable
+sealed class NetworkError {
+  @Serializable @SerialName("connectError") class ConnectError(val connectError: String): NetworkError()
+  @Serializable @SerialName("tLSError") class TLSError(val tlsError: String): NetworkError()
+  @Serializable @SerialName("unknownCAError") object UnknownCAError: NetworkError()
+  @Serializable @SerialName("failedError") object FailedError: NetworkError()
+  @Serializable @SerialName("timeoutError") object TimeoutError: NetworkError()
+  @Serializable @SerialName("subscribeError") class SubscribeError(val subscribeError: String): NetworkError()
+}
+
 @Serializable
 sealed class SMPTransportError {
   val string: String get() = when (this) {

apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/usersettings/networkAndServers/NewServerView.kt

@@ -43,6 +43,13 @@ fun ModalData.NewServerView(
             if (isActive) {
               newServer.value = res.first
               testing.value = false
+              val failure = res.second
+              if (failure != null) {
+                AlertManager.shared.showAlertMsg(
+                  title = generalGetString(MR.strings.smp_servers_test_failed),
+                  text = failure.localizedDescription
+                )
+              }
             }
           }
         },

apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/usersettings/networkAndServers/ProtocolServerView.kt

@@ -93,6 +93,13 @@ fun ProtocolServerView(
             if (isActive) {
               draftServer.value = res.first
               testing.value = false
+              val failure = res.second
+              if (failure != null) {
+                AlertManager.shared.showAlertMsg(
+                  title = generalGetString(MR.strings.smp_servers_test_failed),
+                  text = failure.localizedDescription
+                )
+              }
             }
           }
         },

apps/multiplatform/common/src/commonMain/resources/MR/ar/strings.xml

@@ -2516,4 +2516,5 @@
     <string name="privacy_chat_list_open_full_web_link">افتح الرابط الكامل</string>
     <string name="sanitize_links_toggle">أزل تتبع الروابط</string>
     <string name="simplex_link_relay">رابط مُرحل SimpleX</string>
+    <string name="error_marking_member_support_chat_read">خطأ في وضع علامة \"مقروءة\" على الدردشة مع العضو</string>
 </resources>

apps/multiplatform/common/src/commonMain/resources/MR/base/strings.xml

@@ -146,15 +146,18 @@
   <!-- API Error Responses - SimpleXAPI.kt -->
   <string name="connection_timeout">Connection timeout</string>
   <string name="connection_error">Connection error</string>
+  <string name="network_error_unknown_ca">Fingerprint in server address does not match certificate: %1$s.</string>
   <string name="network_error_desc">Please check your network connection with %1$s and try again.</string>
   <string name="network_error_broker_host_desc">Server address is incompatible with network settings: %1$s.</string>
   <string name="network_error_broker_version_desc">Server version is incompatible with your app: %1$s.</string>
   <string name="private_routing_timeout">Private routing timeout</string>
   <string name="private_routing_error">Private routing error</string>
   <string name="private_routing_no_session">No private routing session</string>
+  <string name="smp_proxy_error_unknown_ca">Fingerprint in forwarding server address does not match certificate: %1$s.</string>
   <string name="smp_proxy_error_connecting">Error connecting to forwarding server %1$s. Please try later.</string>
   <string name="smp_proxy_error_broker_host">Forwarding server address is incompatible with network settings: %1$s.</string>
   <string name="smp_proxy_error_broker_version">Forwarding server version is incompatible with network settings: %1$s.</string>
+  <string name="proxy_destination_error_unknown_ca">Fingerprint in destination server address does not match certificate: %1$s.</string>
   <string name="proxy_destination_error_failed_to_connect">Forwarding server %1$s failed to connect to destination server %2$s. Please try later.</string>
   <string name="proxy_destination_error_broker_host">Destination server address of %1$s is incompatible with forwarding server %2$s settings.</string>
   <string name="proxy_destination_error_broker_version">Destination server version of %1$s is incompatible with forwarding server %2$s.</string>
@@ -167,8 +170,8 @@
   <string name="error_adding_members">Error adding member(s)</string>
   <string name="error_joining_group">Error joining group</string>
   <string name="error_accepting_member">Error accepting member</string>
-  <string name="error_marking_member_support_chat_read">Error marking chat with member as read</string>
-  <string name="error_deleting_member_support_chat">Error deleting chat with member</string>
+  <string name="error_marking_member_support_chat_read">Error marking read</string>
+  <string name="error_deleting_member_support_chat">Error deleting chat</string>
   <string name="cannot_receive_file">Cannot receive file</string>
   <string name="sender_cancelled_file_transfer">Sender cancelled file transfer.</string>
   <string name="file_not_approved_title">Unknown servers!</string>
@@ -201,9 +204,9 @@
   <string name="error_aborting_address_change">Error aborting address change</string>
   <string name="error_synchronizing_connection">Error synchronizing connection</string>
   <string name="error_smp_test_failed_at_step">Test failed at step %s.</string>
-  <string name="error_smp_test_server_auth">Server requires authorization to create queues, check password</string>
-  <string name="error_xftp_test_server_auth">Server requires authorization to upload, check password</string>
-  <string name="error_smp_test_certificate">Possibly, certificate fingerprint in server address is incorrect</string>
+  <string name="error_smp_test_server_auth">Server requires authorization to create queues, check password.</string>
+  <string name="error_xftp_test_server_auth">Server requires authorization to upload, check password.</string>
+  <string name="error_smp_test_certificate">Fingerprint in server address does not match certificate.</string>
   <string name="error_setting_address">Error setting address</string>
   <string name="error_alert_title">Error</string>
   <string name="smp_server_test_connect">Connect</string>

apps/multiplatform/common/src/commonMain/resources/MR/bg/strings.xml

@@ -1559,7 +1559,7 @@
     <string name="remote_ctrl_error_busy">Настолното устройство е заето</string>
     <string name="remote_ctrl_error_disconnected">Връзката с настолното устройство бе прекъсната</string>
     <string name="agent_critical_error_title">Критична грешка</string>
-    <string name="past_member_vName">Бивш член %1$s</string>
+    <string name="past_member_vName">Член %1$s</string>
     <string name="group_member_status_unknown">неизвестен статус</string>
     <string name="group_member_status_unknown_short">неизвестен</string>
     <string name="agent_internal_error_title">Вътрешна грешка</string>
@@ -1859,7 +1859,7 @@
     <string name="appearance_font_size">Размер на шрифта</string>
     <string name="share_text_message_status">Статус на съобщението: %s</string>
     <string name="chat_theme_set_default_theme">Задай тема по подразбиране</string>
-    <string name="v5_8_safe_files_descr">Потвърдете файловете от неизвестни сървъри.</string>
+    <string name="v5_8_safe_files_descr">Потвърди файлове от неизвестни сървъри.</string>
     <string name="servers_info_detailed_statistics_sent_messages_header">Изпратени съобщения</string>
     <string name="error_initializing_web_view">Грешка при стартиране на WebView. Актуализирайте системата си до новата версия. Моля, свържете се с разработчиците.\nГрешка: %s</string>
     <string name="xftp_servers_other">Други XFTP сървъри</string>
@@ -1967,7 +1967,7 @@
     <string name="uploaded_files">Качени файлове</string>
     <string name="upload_errors">Грешки при качване</string>
     <string name="size">Размер</string>
-    <string name="chunks_deleted">Парчета изтрити</string>
+    <string name="chunks_deleted">Изтрити парчета</string>
     <string name="chunks_downloaded">Изтеглени парчета</string>
     <string name="downloaded_files">Изтеглени файлове</string>
     <string name="toolbar_settings">Настройки</string>
@@ -2313,7 +2313,7 @@
     <string name="block_members_for_all_question">Блокиране на членовете за всички?</string>
     <string name="chat_banner_business_connection">Бизнес връзка</string>
     <string name="onboarding_conditions_by_using_you_agree">С използването на SimpleX Chat вие се съгласявате със:\n- изпращане само на легално съдържание в публични групи.\n- уважение към другите потребители – без спам.</string>
-    <string name="context_user_picker_cant_change_profile_alert_title">Промената на профила е невъзможна</string>
+    <string name="context_user_picker_cant_change_profile_alert_title">Промяната на профила е невъзможна</string>
     <string name="cant_send_message_generic">съобщенията не могат да бъдат изпратени</string>
     <string name="v6_4_1_new_interface_languages_descr">Каталонски, индонезийски, румънски и виетнамски - благодарение на нашите потребители!</string>
     <string name="e2ee_info_e2ee"><![CDATA[Съобщенията са защитени с<b>криптиране от край до край</b>.]]></string>
@@ -2508,4 +2508,21 @@
     <string name="member_is_deleted_cant_accept_request">Членът е изтрит - не може да се приеме заявката</string>
     <string name="rcv_direct_event_group_inv_link_received">заявка за връзка от група %1$s</string>
     <string name="this_setting_is_for_your_current_profile">Тази настройка е за текущия профил</string>
+    <string name="allow_files_and_media_only_if">Разреши файлове и медия само ако вашият контакт ги разрешава.</string>
+    <string name="allow_your_contacts_to_send_files_and_media">Позволи на вашите контактите да изпращат файлове и медия.</string>
+    <string name="chat_banner_bot">Бот</string>
+    <string name="both_you_and_your_contact_can_send_files">И вие, и вашият контакт можете да изпращате файлове и медия.</string>
+    <string name="deprecated_options_section">Отпадащи опции</string>
+    <string name="error_marking_member_support_chat_read">Грешка при маркиране на чата като прочетен</string>
+    <string name="files_prohibited_in_this_chat">Файлове и медията са забранени в този чат.</string>
+    <string name="only_you_can_send_files">Само вие можете да изпращате файлове и медия.</string>
+    <string name="only_your_contact_can_send_files">Само вашият контакт може да изпраща файлове и медия.</string>
+    <string name="privacy_chat_list_open_clean_web_link">Отвори почистен линк</string>
+    <string name="privacy_chat_list_open_full_web_link">Отвори пълен линк</string>
+    <string name="open_to_use_bot">Отвори за използване на бот</string>
+    <string name="prohibit_sending_files_and_media">Забрани изпращането на файлове и медия.</string>
+    <string name="sanitize_links_toggle">Премахни параметри за проследяване от линковете</string>
+    <string name="simplex_link_relay">SimpleX реле линк</string>
+    <string name="chat_banner_connect_to_use_bot">Натисни Свързване, за използване на бота</string>
+    <string name="cant_send_commands_alert_text">За да изпращате команди, трябва да сте свързани.</string>
 </resources>

apps/multiplatform/common/src/commonMain/resources/MR/ca/strings.xml

@@ -1999,7 +1999,7 @@
     <string name="invite_to_chat_button">Convidar a xatejar</string>
     <string name="new_member_role">Nou rol de membre</string>
     <string name="no_contacts_to_add">No hi ha contactes per afegir</string>
-    <string name="past_member_vName">Membre anterior %1$s</string>
+    <string name="past_member_vName">Membre %1$s</string>
     <string name="skip_inviting_button">Ometre convidar membres</string>
     <string name="group_member_status_unknown_short">desconegut</string>
     <string name="button_add_members">Convidar membres</string>
@@ -2496,4 +2496,5 @@
     <string name="privacy_chat_list_open_full_web_link">Obrir enllaç complet</string>
     <string name="sanitize_links_toggle">Eliminar el seguiment de l\'enllaç</string>
     <string name="deprecated_options_section">Opcions obsoletes</string>
+    <string name="simplex_link_relay">Enllaç de servidor SimpleX</string>
 </resources>

apps/multiplatform/common/src/commonMain/resources/MR/cs/strings.xml

@@ -548,8 +548,8 @@
     <string name="for_me_only">Smazat pro mě</string>
     <string name="icon_descr_edited">upraveno</string>
     <string name="icon_descr_sent_msg_status_unauthorized_send">neautorizované odeslání</string>
-    <string name="group_preview_you_are_invited">jste pozváni do skupiny</string>
-    <string name="group_preview_join_as">připojit jako %s</string>
+    <string name="group_preview_you_are_invited">Jste pozváni do skupiny</string>
+    <string name="group_preview_join_as">Připojit jako %s</string>
     <string name="group_connection_pending">připojuji…</string>
     <string name="tap_to_start_new_chat">Začněte nový chat</string>
     <string name="chat_with_developers">Chat s vývojáři</string>
@@ -1172,7 +1172,7 @@
     <string name="share_address_with_contacts_question">Sdílet adresu s kontakty\?</string>
     <string name="stop_sharing_address">Přestat sdílet adresu\?</string>
     <string name="create_address_and_let_people_connect">Vytvořit adresu, aby se s vámi lidé mohli spojit.</string>
-    <string name="save_auto_accept_settings">Uložit nastavení automatického přijímání</string>
+    <string name="save_auto_accept_settings">Uložit nastavení SimpleX adresy</string>
     <string name="stop_sharing">Přestat sdílet</string>
     <string name="auto_accept_contact">Automaticky přijmout</string>
     <string name="you_can_create_it_later">Můžete vytvořit později</string>
@@ -1363,7 +1363,7 @@
     <string name="v5_3_new_interface_languages">6 nových jazyků pro rozhraní</string>
     <string name="v5_3_encrypt_local_files_descr">Aplikace šifruje nové místní soubory (kromě videí)</string>
     <string name="v5_3_new_interface_languages_descr">Arabština, bulharština, finština, hebrejština, thajština a ukrajinština - díky uživatelům a Weblate.</string>
-    <string name="rcv_group_event_member_created_contact">propojeno napřímo</string>
+    <string name="rcv_group_event_member_created_contact">požádáno o připojení</string>
     <string name="rcv_group_event_open_chat">Otevřít</string>
     <string name="v5_3_encrypt_local_files">Šifrování uložených souborů a médií</string>
     <string name="error_creating_member_contact">Chyba vytváření kontaktu</string>
@@ -1374,7 +1374,7 @@
     <string name="v5_3_new_desktop_app_descr">Vytvořit nový profil v desktopové aplikaci. 💻</string>
     <string name="v5_3_simpler_incognito_mode_descr">Změnit inkognito při připojování.</string>
     <string name="v5_3_discover_join_groups_descr">- připojení k adresáři skupin (BETA)!\n- doručenky (až 20 členů).\n- rychlejší a stabilnější.</string>
-    <string name="member_contact_send_direct_message">odeslat přímou zprávu</string>
+    <string name="member_contact_send_direct_message">odeslat pro připojení</string>
     <string name="rcv_direct_event_contact_deleted">smazaný kontakt</string>
     <string name="error_alert_title">Chyba</string>
     <string name="create_another_profile_button">Vytvořit profil</string>
@@ -1573,7 +1573,7 @@
     <string name="v5_5_simpler_connect_ui_descr">Vyhledávání přijímá pozvánky.</string>
     <string name="show_slow_api_calls">Zobrazit pomalé API volání</string>
     <string name="profile_update_event_removed_address">odstraněna kontaktní adresa</string>
-    <string name="past_member_vName">Vložte člena %1$s</string>
+    <string name="past_member_vName">Člen %1$s</string>
     <string name="v5_5_simpler_connect_ui">Vložte odkaz na připojení!</string>
     <string name="v5_5_join_group_conversation_descr">Nejnovější historie a vylepšený directory bot.</string>
     <string name="v5_5_private_notes">Soukromé poznámky</string>
@@ -2282,7 +2282,7 @@
     <string name="notification_group_report">Report: %s</string>
     <string name="report_compose_reason_header_other">Nahlásit další: uvidí pouze skupinový moderátoři.</string>
     <string name="you_can_set_connection_name_to_remember">Můžete nastavit název připojení, pro pamatování, s kým byl odkaz sdílen.</string>
-    <string name="switching_profile_error_message">Vaše připojení bylo přesunuto na %s, ale došlo k neočekávané chybě při přesměrování na profil.</string>
+    <string name="switching_profile_error_message">Vaše připojení bylo přesunuto na %s, ale nastala chyba při přepínání profilu.</string>
     <string name="network_proxy_auth_mode_isolate_by_auth_user">Pro každý profil použijte různé přihlašovací údaje</string>
     <string name="network_smp_proxy_mode_unknown">Neznámé servery</string>
     <string name="private_routing_explanation">Pro ochranu vaší IP adresy, soukromé směrování používá vaše servery SMP k doručování zpráv.</string>
@@ -2396,7 +2396,7 @@
     <string name="accept_pending_member_button">Přijmout</string>
     <string name="accept_pending_member_alert_title">Přijmout člena</string>
     <string name="reviewed_by_admins">schválen adminy</string>
-    <string name="add_short_link">Přidat krátký odkaz</string>
+    <string name="add_short_link">Upgradovat adresu</string>
     <string name="rcv_group_event_member_accepted">přijat %1$s</string>
     <string name="rcv_group_event_user_accepted">Vás přijal</string>
     <string name="group_member_status_pending_review_short">schválení</string>
@@ -2466,4 +2466,7 @@
     <string name="reject_contact_request">Odmítnout žádost o kontakt</string>
     <string name="sanitize_links_toggle">Odebrat sledování odkazů</string>
     <string name="v6_4_role_moderator_descr">Odstranit zprávy a blokovat členy.</string>
+    <string name="e2ee_info_e2ee"><![CDATA[Zprávy jsou chráněny <b>koncovým šifrováním</b>.]]></string>
+    <string name="simplex_link_relay">SimpleX relé odkaz</string>
+    <string name="private_routing_no_session">Bez soukromého směrování sezení</string>
 </resources>

apps/multiplatform/common/src/commonMain/resources/MR/de/strings.xml

@@ -2606,4 +2606,5 @@
     <string name="chat_banner_connect_to_use_bot">Verbinden tippen, um den Bot zu nutzen.</string>
     <string name="cant_send_commands_alert_text">Um Befehle senden zu können, müssen Sie verbunden sein.</string>
     <string name="simplex_link_relay">SimpleX Relais-Link</string>
+    <string name="error_marking_member_support_chat_read">Fehler beim Versuch, den Chat mit einem Mitglied als gelesen zu markieren</string>
 </resources>

apps/multiplatform/common/src/commonMain/resources/MR/es/strings.xml

@@ -23,7 +23,7 @@
     <string name="settings_section_title_icon">ICONO DE LA APLICACIÓN</string>
     <string name="turning_off_service_and_periodic">La optimización de la batería está activa, desactivando el servicio en segundo plano y las solicitudes periódicas de nuevos mensajes. Puedes volver a activarlos en Configuración.</string>
     <string name="notifications_mode_service_desc">El servicio está siempre en funcionamiento en segundo plano. Las notificaciones se muestran en cuanto haya mensajes nuevos.</string>
-    <string name="it_can_disabled_via_settings_notifications_still_shown"><![CDATA[<b>Se puede desactivar en Configuración</b> – las notificaciones se seguirán mostrando mientras la app esté en funcionamiento.]]></string>
+    <string name="it_can_disabled_via_settings_notifications_still_shown"><![CDATA[<b>Se puede desactivar en la configuración</b>. En ese caso las notificaciones se seguirán mostrando mientras la aplicación esté en funcionamiento.]]></string>
     <string name="notifications_mode_service">Siempre activo</string>
     <string name="allow_verb">Permitir</string>
     <string name="above_then_preposition_continuation">y después:</string>
@@ -438,7 +438,7 @@
     <string name="to_verify_compare">Para verificar el cifrado de extremo a extremo con tu contacto, compara (o escanea) el código en ambos dispositivos.</string>
     <string name="database_is_not_encrypted">La base de datos no está cifrada. Escribe una contraseña para protegerla.</string>
     <string name="ensure_smp_server_address_are_correct_format_and_unique">Asegúrate de que las direcciones del servidor SMP tienen el formato correcto, están separadas por líneas y no están duplicadas.</string>
-    <string name="icon_descr_instant_notifications">Notificación instantánea</string>
+    <string name="icon_descr_instant_notifications">Notificaciones instantáneas</string>
     <string name="network_settings_title">Configuración avanzada</string>
     <string name="only_client_devices_store_contacts_groups_e2e_encrypted_messages">Sólo los dispositivos cliente almacenan perfiles de usuario, contactos, grupos y mensajes.</string>
     <string name="onboarding_notifications_mode_subtitle">Cómo afecta a la batería</string>
@@ -463,7 +463,7 @@
     <string name="alert_title_group_invitation_expired">¡Invitación caducada!</string>
     <string name="group_member_status_left">ha salido</string>
     <string name="v4_4_live_messages">Mensajes en vivo</string>
-    <string name="service_notifications">Notificación instantánea</string>
+    <string name="service_notifications">Notificaciones instantáneas</string>
     <string name="settings_notifications_mode_title">Servicio</string>
     <string name="delete_message_mark_deleted_warning">El mensaje se marcará para eliminar. El destinatario o destinatarios podrán revelar este mensaje.</string>
     <string name="live_message">¡Mensaje en vivo!</string>
@@ -738,7 +738,7 @@
     <string name="enable_automatic_deletion_message">Esta acción es irreversible. Los mensajes enviados y recibidos anteriores a la selección serán eliminados. Podría tardar varios minutos.</string>
     <string name="messages_section_description">Esta configuración se aplica a los mensajes del perfil actual</string>
     <string name="this_string_is_not_a_connection_link">¡Esta cadena no es un enlace de conexión!</string>
-    <string name="to_preserve_privacy_simplex_has_background_service_instead_of_push_notifications_it_uses_a_few_pc_battery"><![CDATA[Para mejorar la privacidad <b>SimpleX se ejecuta en segundo plano</b> en lugar de usar notificaciones push.]]></string>
+    <string name="to_preserve_privacy_simplex_has_background_service_instead_of_push_notifications_it_uses_a_few_pc_battery"><![CDATA[Para mejorar la privacidad, en lugar de usar notificaciones push, <b>SimpleX se ejecuta en segundo plano</b>.]]></string>
     <string name="icon_descr_settings">Configuración</string>
     <string name="icon_descr_speaker_off">Altavoz desactivado</string>
     <string name="add_contact_or_create_group">Inciar chat nuevo</string>
@@ -2425,7 +2425,7 @@
     <string name="member_support">Chat con miembros</string>
     <string name="support_chat">Chat con administradores</string>
     <string name="delete_member_support_chat_button">Eliminar chat</string>
-    <string name="delete_member_support_chat_alert_title">¿Eliminar chat con el miembro?</string>
+    <string name="delete_member_support_chat_alert_title">¿Eliminar chat con miembro?</string>
     <string name="reject_pending_member_button">Rechazar</string>
     <string name="reject_pending_member_alert_title">¿Rechazar al miembro?</string>
     <string name="admission_stage_review">Revisar miembros</string>
@@ -2531,4 +2531,5 @@
     <string name="sanitize_links_toggle">Limpiar enlaces de seguimiento</string>
     <string name="privacy_chat_list_open_full_web_link">Abrir enlace completo</string>
     <string name="simplex_link_relay">Enlace de servidor SimpleX</string>
+    <string name="error_marking_member_support_chat_read">Error al marcar el chat con miembro como leído</string>
 </resources>

apps/multiplatform/common/src/commonMain/resources/MR/hu/strings.xml

@@ -52,7 +52,7 @@
     <string name="v4_5_transport_isolation_descr">A csevegési profillal (alapértelmezett), vagy a kapcsolattal (BÉTA).</string>
     <string name="connect__a_new_random_profile_will_be_shared">Egy új, véletlenszerű profil lesz megosztva.</string>
     <string name="allow_voice_messages_only_if">A hangüzenetek küldése csak abban az esetben van engedélyezve, ha a partnere is engedélyezi.</string>
-    <string name="app_version_code">Az alkalmazás összeállítási száma: %s</string>
+    <string name="app_version_code">Alkalmazás összeállítási száma: %s</string>
     <string name="audio_video_calls">Hang- és videóhívások</string>
     <string name="network_settings">Speciális hálózati beállítások</string>
     <string name="allow_your_contacts_to_send_voice_messages">A hangüzenetek küldése engedélyezve van a partnerei számára.</string>
@@ -63,7 +63,7 @@
     <string name="connect_plan_already_connecting">Kapcsolódás folyamatban!</string>
     <string name="cannot_receive_file">Nem lehet fogadni a fájlt</string>
     <string name="auth_unavailable">Hitelesítés elérhetetlen</string>
-    <string name="app_version_title">Az alkalmazás verziója</string>
+    <string name="app_version_title">Alkalmazás verziója</string>
     <string name="button_add_welcome_message">Üdvözlőüzenet hozzáadása</string>
     <string name="snd_conn_event_ratchet_sync_started">titkosítás elfogadása %s számára…</string>
     <string name="available_in_v51">\nElérhető az v5.1-es kiadásban</string>
@@ -161,7 +161,7 @@
     <string name="both_you_and_your_contact_can_make_calls">Mindkét fél tud hívásokat kezdeményezni.</string>
     <string name="la_auth_failed">Sikertelen hitelesítés</string>
     <string name="block_member_desc">%s összes új üzenete el lesz rejtve!</string>
-    <string name="app_version_name">Az alkalmazás verziója: v%s</string>
+    <string name="app_version_name">Alkalmazás verziója: v%s</string>
     <string name="allow_calls_only_if">A hívások kezdeményezése csak abban az esetben van engedélyezve, ha a partnere is engedélyezi.</string>
     <string name="smp_servers_add">Kiszolgáló hozzáadása</string>
     <string name="icon_descr_audio_on">Hang bekapcsolva</string>
@@ -882,7 +882,7 @@
     <string name="rcv_group_event_open_chat">Megnyitás</string>
     <string name="network_option_protocol_timeout">Protokoll időtúllépése</string>
     <string name="secret_text">titok</string>
-    <string name="settings_notification_preview_mode_title">Értesítések előnézetének megjelenítése</string>
+    <string name="settings_notification_preview_mode_title">Értesítésekben megjelenő információk</string>
     <string name="callstate_waiting_for_confirmation">várakozás a visszaigazolásra…</string>
     <string name="stop_file__action">Fájl megállítása</string>
     <string name="description_via_group_link">a csoporthivatkozáson keresztül</string>
@@ -1543,7 +1543,7 @@
     <string name="developer_options_section">Fejlesztői beállítások</string>
     <string name="possible_slow_function_desc">A funkció végrehajtása túl sokáig tart: %1$d másodperc: %2$s</string>
     <string name="remote_host_error_busy"><![CDATA[A(z) <b>%s</b> hordozható eszköz elfoglalt]]></string>
-    <string name="past_member_vName">%1$s tag</string>
+    <string name="past_member_vName">%1$s ismeretlen vagy már nem tag</string>
     <string name="group_member_status_unknown">ismeretlen állapot</string>
     <string name="profile_update_event_member_name_changed">%1$s a következőre módosította a nevét: %2$s</string>
     <string name="profile_update_event_removed_address">eltávolította a kapcsolattartási címet</string>
@@ -2393,7 +2393,7 @@
     <string name="cant_send_message_rejected">csatlakozási kérés elutasítva</string>
     <string name="cant_send_message_you_left">Ön elhagyta a csoportot</string>
     <string name="cant_send_message_member_has_old_version">a tag régi verziót használ</string>
-    <string name="error_deleting_member_support_chat">Hiba a taggal való csevegés törlésekor</string>
+    <string name="error_deleting_member_support_chat">Hiba a csevegés törlésekor</string>
     <string name="cant_send_message_alert_title">Ön nem tud üzeneteket küldeni!</string>
     <string name="cant_send_message_contact_not_ready">a partner nem áll készen</string>
     <string name="cant_send_message_contact_not_synchronized">nincs szinkronizálva</string>
@@ -2499,4 +2499,7 @@
     <string name="privacy_chat_list_open_full_web_link">Teljes hivatkozás megnyitása</string>
     <string name="sanitize_links_toggle">Nyomonkövetési paraméterek eltávolítása a hivatkozásokból</string>
     <string name="simplex_link_relay">SimpleX továbbítókiszolgáló-hivatkozás</string>
+    <string name="error_marking_member_support_chat_read">Hiba a csevegés olvasottként való megjelölésekor</string>
+    <string name="proxy_destination_error_unknown_ca">A célkiszolgáló címében szereplő ujjlenyomat nem egyezik a tanúsítvánnyal: %1$s.</string>
+    <string name="smp_proxy_error_unknown_ca">A továbbítókiszolgáló címében szereplő ujjlenyomat nem egyezik a tanúsítvánnyal: %1$s.</string>
 </resources>

apps/multiplatform/common/src/commonMain/resources/MR/in/strings.xml

@@ -692,7 +692,7 @@
     <string name="invalid_qr_code">Kode QR tidak valid</string>
     <string name="switching_profile_error_title">Kesalahan saat mengganti profil</string>
     <string name="tap_to_paste_link">Ketuk untuk tempel tautan</string>
-    <string name="switching_profile_error_message">Koneksi Anda dipindahkan ke %s tetapi terjadi kesalahan tak terduga saat mengarahkan Anda ke profil.</string>
+    <string name="switching_profile_error_message">Koneksi Anda dipindahkan ke %s tetapi gagal saat mengarahkan Anda ke profil.</string>
     <string name="send_us_an_email">Kirim kami email</string>
     <string name="chat_with_the_founder">Kirim pertanyaan dan ide</string>
     <string name="chat_lock">Kunci SimpleX</string>
@@ -2375,7 +2375,7 @@
     <string name="cant_send_message_group_deleted">grup telah dihapus</string>
     <string name="snd_group_event_user_pending_review">Silakan tunggu pengurus grup untuk meninjau permintaanmu untuk bergabung ke grup</string>
     <string name="reviewed_by_admins">ditinjau oleh pengurus</string>
-    <string name="add_short_link">Tambah tautan singkat</string>
+    <string name="add_short_link">Tingkatkan tautan</string>
     <string name="rcv_group_event_user_accepted">menerimamu</string>
     <string name="rcv_group_event_member_accepted">diterima %1$s</string>
     <string name="set_member_admission">Atur penerimaan anggota</string>
@@ -2478,4 +2478,29 @@
     <string name="group_short_descr_field">Deskripsi singkat:</string>
     <string name="v6_4_1_short_address">Alamat singkat SimpleX</string>
     <string name="simplex_link_relay">Tautan relay SimpleX</string>
+    <string name="v6_4_1_welcome_contacts">Sambut kontak Anda 👋</string>
+    <string name="short_descr">Bio Anda:</string>
+    <string name="chat_banner_your_business_contact">Kontak bisnis Anda</string>
+    <string name="chat_banner_your_contact">Kontak Anda</string>
+    <string name="chat_banner_your_group">Grup Anda</string>
+    <string name="context_user_picker_your_profile">Profil Anda</string>
+    <string name="chat_banner_connect_to_chat">Ketuk Hubungkan untuk chat</string>
+    <string name="chat_banner_send_request_to_connect">Tekan Hubungkan untuk kirim permintaan</string>
+    <string name="chat_banner_connect_to_use_bot">Tekan Hubungkan untuk gunakan bot</string>
+    <string name="chat_banner_join_group">Tekan Gabung grup</string>
+    <string name="network_option_tcp_connection_timeout_background">Batas waktu koneksi TCP bg</string>
+    <string name="share_profile_via_link_alert_text">Alamat akan singkat, dan profil Anda akan dibagikan melalui alamat tersebut.</string>
+    <string name="share_group_profile_via_link_alert_text">Tautan akan singkat, dan profil grup akan dibagikan melalui tautan tersebut.</string>
+    <string name="the_sender_will_not_be_notified">Pengirim TIDAK akan diberi tahu.</string>
+    <string name="this_setting_is_for_your_current_profile">Pengaturan ini untuk profil Anda saat ini</string>
+    <string name="time_to_disappear_is_set_only_for_new_contacts">Waktu menghilang hanya diatur untuk kontak baru.</string>
+    <string name="cant_send_commands_alert_text">Untuk mengirim perintah, Anda harus terhubung.</string>
+    <string name="context_user_picker_cant_change_profile_alert_message">Untuk menggunakan profil lain setelah mencoba hubungkan, hapus chat dan gunakan tautan lagi.</string>
+    <string name="v6_4_1_short_address_update">Perbarui alamat Anda</string>
+    <string name="share_profile_via_link_alert_confirm">Tingkatkan</string>
+    <string name="share_profile_via_link">Tingkatkan alamat?</string>
+    <string name="upgrade_group_link">Tingkatkan tautan grup</string>
+    <string name="share_group_profile_via_link">Tingkatkan tautan grup?</string>
+    <string name="connect_use_incognito_profile">Gunakan profil samaran</string>
+    <string name="address_welcome_message">Pesan sambutan</string>
 </resources>

apps/multiplatform/common/src/commonMain/resources/MR/it/strings.xml

@@ -2535,4 +2535,5 @@
     <string name="privacy_chat_list_open_full_web_link">Apri link completo</string>
     <string name="sanitize_links_toggle">Rimuovi il tracciamento del link</string>
     <string name="simplex_link_relay">Link del relay SimpleX</string>
+    <string name="error_marking_member_support_chat_read">Errore nel segnare la chat con il membro come letta</string>
 </resources>

apps/multiplatform/common/src/commonMain/resources/MR/ru/strings.xml

@@ -76,8 +76,8 @@
     <string name="error_deleting_pending_contact_connection">Ошибка удаления ожидаемого соединения</string>
     <string name="error_changing_address">Ошибка при изменении адреса</string>
     <string name="error_smp_test_failed_at_step">Ошибка теста на шаге %s.</string>
-    <string name="error_smp_test_server_auth">Сервер требует авторизации для создания очередей, проверьте пароль</string>
-    <string name="error_smp_test_certificate">Возможно, хэш сертификата в адресе сервера неверный</string>
+    <string name="error_smp_test_server_auth">Сервер требует авторизации для создания очередей, проверьте пароль.</string>
+    <string name="error_smp_test_certificate">Хэш в адресе сервера не соответствует сертификату.</string>
     <string name="smp_server_test_connect">Соединение</string>
     <string name="smp_server_test_create_queue">Создание очереди</string>
     <string name="smp_server_test_secure_queue">Защита очереди</string>
@@ -2479,7 +2479,7 @@
     <string name="group_member_status_pending_review">ожидает одобрения</string>
     <string name="reject_pending_member_button">Отклонить</string>
     <string name="reject_pending_member_alert_title">Отклонить члена группы?</string>
-    <string name="error_deleting_member_support_chat">Ошибка при удалении чата с членом группы</string>
+    <string name="error_deleting_member_support_chat">Ошибка при удалении чата</string>
     <string name="full_link_button_text">Полная ссылка</string>
     <string name="error_accepting_member">Ошибка при вступлении члена группы</string>
     <string name="unsupported_connection_link">Ссылка не поддерживается</string>
@@ -2610,4 +2610,9 @@
     <string name="privacy_chat_list_open_clean_web_link">Открыть очищенную ссылку</string>
     <string name="privacy_chat_list_open_full_web_link">Открыть полную ссылку</string>
     <string name="sanitize_links_toggle">Удалять параметры отслеживания</string>
+    <string name="error_marking_member_support_chat_read">Ошибка прочтения чата</string>
+    <string name="smp_proxy_error_unknown_ca">Хэш в адресе пересылающего сервера не соответствует сертификату: %1$s.</string>
+    <string name="network_error_unknown_ca">Хэш в адресе сервера не соответствует сертификату: %1$s.</string>
+    <string name="simplex_link_relay">Ссылка SimpleX relay</string>
+    <string name="proxy_destination_error_unknown_ca">Хэш в адресе сервера назначения не соответствует сертификату: %1$s.</string>
 </resources>

apps/multiplatform/common/src/commonMain/resources/MR/tr/strings.xml

@@ -2503,4 +2503,10 @@
     <string name="group_descr_too_large">Açıklama çok büyük</string>
     <string name="time_to_disappear_is_set_only_for_new_contacts">Kaybolma süresi yalnızca yeni kişiler için ayarlanır.</string>
     <string name="connect_use_incognito_profile">Gizli profil kullan</string>
+    <string name="open_to_use_bot">Botu kullanmak için açın</string>
+    <string name="chat_banner_connect_to_use_bot">Botu kullanmak için Bağlan tuşuna basın.</string>
+    <string name="chat_banner_bot">Bot</string>
+    <string name="cant_send_commands_alert_text">Komutlar gönderebilmek için bağlanmanış olmanız gereklidir.</string>
+    <string name="member_is_deleted_cant_accept_request">Üye silinmiş - isteği kabul edemeyecek</string>
+    <string name="upgrade_group_link">Grup linkini güncelle</string>
 </resources>

apps/multiplatform/common/src/commonMain/resources/MR/zh-rCN/strings.xml

@@ -2519,4 +2519,5 @@
     <string name="privacy_chat_list_open_full_web_link">打开完整链接</string>
     <string name="sanitize_links_toggle">删除链接跟踪</string>
     <string name="simplex_link_relay">SimpleX 中继链接</string>
+    <string name="error_marking_member_support_chat_read">将和成员的聊天标记为已读时出错</string>
 </resources>