diff --git a/apps/ios/Shared/Views/ChatList/ServersSummaryView.swift b/apps/ios/Shared/Views/ChatList/ServersSummaryView.swift index f210809a09..30e32ba9d0 100644 --- a/apps/ios/Shared/Views/ChatList/ServersSummaryView.swift +++ b/apps/ios/Shared/Views/ChatList/ServersSummaryView.swift @@ -75,8 +75,8 @@ struct ServersSummaryView: View { Group { if m.users.filter({ u in u.user.activeUser || !u.user.hidden }).count > 1 { Picker("User selection", selection: $selectedUserCategory) { - Text("All users").tag(PresentedUserCategory.allUsers) - Text("Current user").tag(PresentedUserCategory.currentUser) + Text("All profiles").tag(PresentedUserCategory.allUsers) + Text("Current profile").tag(PresentedUserCategory.currentUser) } .pickerStyle(.segmented) } @@ -176,6 +176,7 @@ struct ServersSummaryView: View { Section { infoRow("Active connections", numOrDash(totals.subs.ssActive)) infoRow("Total", numOrDash(totals.subs.total)) + Toggle("Show percentage", isOn: $showSubscriptionPercentage) } header: { HStack { Text("Message reception") diff --git a/apps/ios/Shared/Views/UserSettings/NetworkAndServers.swift b/apps/ios/Shared/Views/UserSettings/NetworkAndServers.swift index b07f0f6a13..3d93a92e08 100644 --- a/apps/ios/Shared/Views/UserSettings/NetworkAndServers.swift +++ b/apps/ios/Shared/Views/UserSettings/NetworkAndServers.swift @@ -32,7 +32,6 @@ struct NetworkAndServers: View { @EnvironmentObject var theme: AppTheme @AppStorage(DEFAULT_DEVELOPER_TOOLS) private var developerTools = false @AppStorage(DEFAULT_SHOW_SENT_VIA_RPOXY) private var showSentViaProxy = false - @AppStorage(DEFAULT_SHOW_SUBSCRIPTION_PERCENTAGE) private var showSubscriptionPercentage = false @State private var cfgLoaded = false @State private var currentNetCfg = NetCfg.defaults @State private var netCfg = NetCfg.defaults @@ -62,8 +61,6 @@ struct NetworkAndServers: View { Text("XFTP servers") } - Toggle("Subscription percentage", isOn: $showSubscriptionPercentage) - Picker("Use .onion hosts", selection: $onionHosts) { ForEach(OnionHosts.values, id: \.self) { Text($0.text) } } diff --git a/apps/ios/SimpleX Localizations/bg.xcloc/Localized Contents/bg.xliff b/apps/ios/SimpleX Localizations/bg.xcloc/Localized Contents/bg.xliff index c17ffcd571..e005b44466 100644 --- a/apps/ios/SimpleX Localizations/bg.xcloc/Localized Contents/bg.xliff +++ b/apps/ios/SimpleX Localizations/bg.xcloc/Localized Contents/bg.xliff @@ -709,8 +709,8 @@ Всички нови съобщения от %@ ще бъдат скрити! No comment provided by engineer. - - All users + + All profiles No comment provided by engineer. @@ -1705,8 +1705,8 @@ This is your own one-time link! Текуща парола… No comment provided by engineer. - - Current user + + Current profile No comment provided by engineer. @@ -5639,6 +5639,10 @@ Enable in *Network & servers* settings. Server version is incompatible with network settings. srv error text + + Server version is incompatible with network settings: %@. + No comment provided by engineer. + Server version is incompatible with your app: %@. No comment provided by engineer. @@ -5779,6 +5783,10 @@ Enable in *Network & servers* settings. Show message status No comment provided by engineer. + + Show percentage + No comment provided by engineer. + Show preview Показване на визуализация @@ -6002,10 +6010,6 @@ Enable in *Network & servers* settings. Subscription errors No comment provided by engineer. - - Subscription percentage - No comment provided by engineer. - Subscriptions ignored No comment provided by engineer. diff --git a/apps/ios/SimpleX Localizations/cs.xcloc/Localized Contents/cs.xliff b/apps/ios/SimpleX Localizations/cs.xcloc/Localized Contents/cs.xliff index 9cc8d12f74..972d06f001 100644 --- a/apps/ios/SimpleX Localizations/cs.xcloc/Localized Contents/cs.xliff +++ b/apps/ios/SimpleX Localizations/cs.xcloc/Localized Contents/cs.xliff @@ -687,8 +687,8 @@ All new messages from %@ will be hidden! No comment provided by engineer. - - All users + + All profiles No comment provided by engineer. @@ -1635,8 +1635,8 @@ This is your own one-time link! Aktuální přístupová fráze… No comment provided by engineer. - - Current user + + Current profile No comment provided by engineer. @@ -5437,6 +5437,10 @@ Enable in *Network & servers* settings. Server version is incompatible with network settings. srv error text + + Server version is incompatible with network settings: %@. + No comment provided by engineer. + Server version is incompatible with your app: %@. No comment provided by engineer. @@ -5572,6 +5576,10 @@ Enable in *Network & servers* settings. Show message status No comment provided by engineer. + + Show percentage + No comment provided by engineer. + Show preview Zobrazení náhledu @@ -5789,10 +5797,6 @@ Enable in *Network & servers* settings. Subscription errors No comment provided by engineer. - - Subscription percentage - No comment provided by engineer. - Subscriptions ignored No comment provided by engineer. diff --git a/apps/ios/SimpleX Localizations/de.xcloc/Localized Contents/de.xliff b/apps/ios/SimpleX Localizations/de.xcloc/Localized Contents/de.xliff index 341839d246..26f020ffbe 100644 --- a/apps/ios/SimpleX Localizations/de.xcloc/Localized Contents/de.xliff +++ b/apps/ios/SimpleX Localizations/de.xcloc/Localized Contents/de.xliff @@ -709,8 +709,8 @@ Von %@ werden alle neuen Nachrichten ausgeblendet! No comment provided by engineer. - - All users + + All profiles No comment provided by engineer. @@ -1709,8 +1709,8 @@ Das ist Ihr eigener Einmal-Link! Aktuelles Passwort… No comment provided by engineer. - - Current user + + Current profile No comment provided by engineer. @@ -5668,6 +5668,10 @@ Aktivieren Sie es in den *Netzwerk & Server* Einstellungen. Die Server-Version ist nicht mit den Netzwerk-Einstellungen kompatibel. srv error text + + Server version is incompatible with network settings: %@. + No comment provided by engineer. + Server version is incompatible with your app: %@. No comment provided by engineer. @@ -5809,6 +5813,10 @@ Aktivieren Sie es in den *Netzwerk & Server* Einstellungen. Nachrichtenstatus anzeigen No comment provided by engineer. + + Show percentage + No comment provided by engineer. + Show preview Vorschau anzeigen @@ -6033,10 +6041,6 @@ Aktivieren Sie es in den *Netzwerk & Server* Einstellungen. Subscription errors No comment provided by engineer. - - Subscription percentage - No comment provided by engineer. - Subscriptions ignored No comment provided by engineer. diff --git a/apps/ios/SimpleX Localizations/en.xcloc/Localized Contents/en.xliff b/apps/ios/SimpleX Localizations/en.xcloc/Localized Contents/en.xliff index 7bdf67cc94..73e6fb5a23 100644 --- a/apps/ios/SimpleX Localizations/en.xcloc/Localized Contents/en.xliff +++ b/apps/ios/SimpleX Localizations/en.xcloc/Localized Contents/en.xliff @@ -718,9 +718,9 @@ All new messages from %@ will be hidden! No comment provided by engineer. - - All users - All users + + All profiles + All profiles No comment provided by engineer. @@ -1738,9 +1738,9 @@ This is your own one-time link! Current passphrase… No comment provided by engineer. - - Current user - Current user + + Current profile + Current profile No comment provided by engineer. @@ -5773,6 +5773,11 @@ Enable in *Network & servers* settings. Server version is incompatible with network settings. srv error text + + Server version is incompatible with network settings: %@. + Server version is incompatible with network settings: %@. + No comment provided by engineer. + Server version is incompatible with your app: %@. Server version is incompatible with your app: %@. @@ -5918,6 +5923,11 @@ Enable in *Network & servers* settings. Show message status No comment provided by engineer. + + Show percentage + Show percentage + No comment provided by engineer. + Show preview Show preview @@ -6148,11 +6158,6 @@ Enable in *Network & servers* settings. Subscription errors No comment provided by engineer. - - Subscription percentage - Subscription percentage - No comment provided by engineer. - Subscriptions ignored Subscriptions ignored diff --git a/apps/ios/SimpleX Localizations/es.xcloc/Localized Contents/es.xliff b/apps/ios/SimpleX Localizations/es.xcloc/Localized Contents/es.xliff index eb4933e69a..455b74de5d 100644 --- a/apps/ios/SimpleX Localizations/es.xcloc/Localized Contents/es.xliff +++ b/apps/ios/SimpleX Localizations/es.xcloc/Localized Contents/es.xliff @@ -709,8 +709,8 @@ ¡Los mensajes nuevos de %@ estarán ocultos! No comment provided by engineer. - - All users + + All profiles No comment provided by engineer. @@ -1709,8 +1709,8 @@ This is your own one-time link! Contraseña actual… No comment provided by engineer. - - Current user + + Current profile No comment provided by engineer. @@ -5668,6 +5668,10 @@ Actívalo en ajustes de *Servidores y Redes*. La versión del servidor es incompatible con la configuración de red. srv error text + + Server version is incompatible with network settings: %@. + No comment provided by engineer. + Server version is incompatible with your app: %@. No comment provided by engineer. @@ -5809,6 +5813,10 @@ Actívalo en ajustes de *Servidores y Redes*. Estado del mensaje No comment provided by engineer. + + Show percentage + No comment provided by engineer. + Show preview Mostrar vista previa @@ -6033,10 +6041,6 @@ Actívalo en ajustes de *Servidores y Redes*. Subscription errors No comment provided by engineer. - - Subscription percentage - No comment provided by engineer. - Subscriptions ignored No comment provided by engineer. diff --git a/apps/ios/SimpleX Localizations/fi.xcloc/Localized Contents/fi.xliff b/apps/ios/SimpleX Localizations/fi.xcloc/Localized Contents/fi.xliff index 4959324895..92070c316c 100644 --- a/apps/ios/SimpleX Localizations/fi.xcloc/Localized Contents/fi.xliff +++ b/apps/ios/SimpleX Localizations/fi.xcloc/Localized Contents/fi.xliff @@ -682,8 +682,8 @@ All new messages from %@ will be hidden! No comment provided by engineer. - - All users + + All profiles No comment provided by engineer. @@ -1628,8 +1628,8 @@ This is your own one-time link! Nykyinen tunnuslause… No comment provided by engineer. - - Current user + + Current profile No comment provided by engineer. @@ -5424,6 +5424,10 @@ Enable in *Network & servers* settings. Server version is incompatible with network settings. srv error text + + Server version is incompatible with network settings: %@. + No comment provided by engineer. + Server version is incompatible with your app: %@. No comment provided by engineer. @@ -5559,6 +5563,10 @@ Enable in *Network & servers* settings. Show message status No comment provided by engineer. + + Show percentage + No comment provided by engineer. + Show preview Näytä esikatselu @@ -5775,10 +5783,6 @@ Enable in *Network & servers* settings. Subscription errors No comment provided by engineer. - - Subscription percentage - No comment provided by engineer. - Subscriptions ignored No comment provided by engineer. diff --git a/apps/ios/SimpleX Localizations/fr.xcloc/Localized Contents/fr.xliff b/apps/ios/SimpleX Localizations/fr.xcloc/Localized Contents/fr.xliff index a3c5bd8c65..c2a801b0b5 100644 --- a/apps/ios/SimpleX Localizations/fr.xcloc/Localized Contents/fr.xliff +++ b/apps/ios/SimpleX Localizations/fr.xcloc/Localized Contents/fr.xliff @@ -709,8 +709,8 @@ Tous les nouveaux messages de %@ seront cachés ! No comment provided by engineer. - - All users + + All profiles No comment provided by engineer. @@ -1709,8 +1709,8 @@ Il s'agit de votre propre lien unique ! Phrase secrète actuelle… No comment provided by engineer. - - Current user + + Current profile No comment provided by engineer. @@ -5668,6 +5668,10 @@ Activez-le dans les paramètres *Réseau et serveurs*. La version du serveur est incompatible avec les paramètres du réseau. srv error text + + Server version is incompatible with network settings: %@. + No comment provided by engineer. + Server version is incompatible with your app: %@. No comment provided by engineer. @@ -5809,6 +5813,10 @@ Activez-le dans les paramètres *Réseau et serveurs*. Afficher le statut du message No comment provided by engineer. + + Show percentage + No comment provided by engineer. + Show preview Afficher l'aperçu @@ -6033,10 +6041,6 @@ Activez-le dans les paramètres *Réseau et serveurs*. Subscription errors No comment provided by engineer. - - Subscription percentage - No comment provided by engineer. - Subscriptions ignored No comment provided by engineer. diff --git a/apps/ios/SimpleX Localizations/hu.xcloc/Localized Contents/hu.xliff b/apps/ios/SimpleX Localizations/hu.xcloc/Localized Contents/hu.xliff index 5241ae89c0..9bc5a073b8 100644 --- a/apps/ios/SimpleX Localizations/hu.xcloc/Localized Contents/hu.xliff +++ b/apps/ios/SimpleX Localizations/hu.xcloc/Localized Contents/hu.xliff @@ -709,8 +709,8 @@ Minden új üzenet elrejtésre kerül tőle: %@! No comment provided by engineer. - - All users + + All profiles No comment provided by engineer. @@ -1709,8 +1709,8 @@ Ez az egyszer használatos hivatkozása! Jelenlegi jelmondat… No comment provided by engineer. - - Current user + + Current profile No comment provided by engineer. @@ -5668,6 +5668,10 @@ Engedélyezze a beállításokban a *Hálózat és kiszolgálók* menüpontban.< A kiszolgáló verziója nem kompatibilis a hálózati beállításokkal. srv error text + + Server version is incompatible with network settings: %@. + No comment provided by engineer. + Server version is incompatible with your app: %@. No comment provided by engineer. @@ -5809,6 +5813,10 @@ Engedélyezze a beállításokban a *Hálózat és kiszolgálók* menüpontban.< Üzenet állapot megjelenítése No comment provided by engineer. + + Show percentage + No comment provided by engineer. + Show preview Előnézet megjelenítése @@ -6033,10 +6041,6 @@ Engedélyezze a beállításokban a *Hálózat és kiszolgálók* menüpontban.< Subscription errors No comment provided by engineer. - - Subscription percentage - No comment provided by engineer. - Subscriptions ignored No comment provided by engineer. diff --git a/apps/ios/SimpleX Localizations/it.xcloc/Localized Contents/it.xliff b/apps/ios/SimpleX Localizations/it.xcloc/Localized Contents/it.xliff index 2146b0115d..b41a5ddb86 100644 --- a/apps/ios/SimpleX Localizations/it.xcloc/Localized Contents/it.xliff +++ b/apps/ios/SimpleX Localizations/it.xcloc/Localized Contents/it.xliff @@ -709,8 +709,8 @@ Tutti i nuovi messaggi da %@ verrranno nascosti! No comment provided by engineer. - - All users + + All profiles No comment provided by engineer. @@ -1709,8 +1709,8 @@ Questo è il tuo link una tantum! Password attuale… No comment provided by engineer. - - Current user + + Current profile No comment provided by engineer. @@ -5668,6 +5668,10 @@ Attivalo nelle impostazioni *Rete e server*. La versione del server non è compatibile con le impostazioni di rete. srv error text + + Server version is incompatible with network settings: %@. + No comment provided by engineer. + Server version is incompatible with your app: %@. No comment provided by engineer. @@ -5809,6 +5813,10 @@ Attivalo nelle impostazioni *Rete e server*. Mostra stato del messaggio No comment provided by engineer. + + Show percentage + No comment provided by engineer. + Show preview Mostra anteprima @@ -6033,10 +6041,6 @@ Attivalo nelle impostazioni *Rete e server*. Subscription errors No comment provided by engineer. - - Subscription percentage - No comment provided by engineer. - Subscriptions ignored No comment provided by engineer. diff --git a/apps/ios/SimpleX Localizations/ja.xcloc/Localized Contents/ja.xliff b/apps/ios/SimpleX Localizations/ja.xcloc/Localized Contents/ja.xliff index 2e23ad7423..510766fa70 100644 --- a/apps/ios/SimpleX Localizations/ja.xcloc/Localized Contents/ja.xliff +++ b/apps/ios/SimpleX Localizations/ja.xcloc/Localized Contents/ja.xliff @@ -699,8 +699,8 @@ All new messages from %@ will be hidden! No comment provided by engineer. - - All users + + All profiles No comment provided by engineer. @@ -1652,8 +1652,8 @@ This is your own one-time link! 現在の暗証フレーズ… No comment provided by engineer. - - Current user + + Current profile No comment provided by engineer. @@ -5442,6 +5442,10 @@ Enable in *Network & servers* settings. Server version is incompatible with network settings. srv error text + + Server version is incompatible with network settings: %@. + No comment provided by engineer. + Server version is incompatible with your app: %@. No comment provided by engineer. @@ -5577,6 +5581,10 @@ Enable in *Network & servers* settings. Show message status No comment provided by engineer. + + Show percentage + No comment provided by engineer. + Show preview プレビューを表示 @@ -5794,10 +5802,6 @@ Enable in *Network & servers* settings. Subscription errors No comment provided by engineer. - - Subscription percentage - No comment provided by engineer. - Subscriptions ignored No comment provided by engineer. diff --git a/apps/ios/SimpleX Localizations/nl.xcloc/Localized Contents/nl.xliff b/apps/ios/SimpleX Localizations/nl.xcloc/Localized Contents/nl.xliff index e3da8c8d41..f06fac9b97 100644 --- a/apps/ios/SimpleX Localizations/nl.xcloc/Localized Contents/nl.xliff +++ b/apps/ios/SimpleX Localizations/nl.xcloc/Localized Contents/nl.xliff @@ -709,8 +709,8 @@ Alle nieuwe berichten van %@ worden verborgen! No comment provided by engineer. - - All users + + All profiles No comment provided by engineer. @@ -1709,8 +1709,8 @@ Dit is uw eigen eenmalige link! Huidige wachtwoord… No comment provided by engineer. - - Current user + + Current profile No comment provided by engineer. @@ -5668,6 +5668,10 @@ Schakel dit in in *Netwerk en servers*-instellingen. Serverversie is incompatibel met netwerkinstellingen. srv error text + + Server version is incompatible with network settings: %@. + No comment provided by engineer. + Server version is incompatible with your app: %@. No comment provided by engineer. @@ -5809,6 +5813,10 @@ Schakel dit in in *Netwerk en servers*-instellingen. Toon berichtstatus No comment provided by engineer. + + Show percentage + No comment provided by engineer. + Show preview Toon voorbeeld @@ -6033,10 +6041,6 @@ Schakel dit in in *Netwerk en servers*-instellingen. Subscription errors No comment provided by engineer. - - Subscription percentage - No comment provided by engineer. - Subscriptions ignored No comment provided by engineer. diff --git a/apps/ios/SimpleX Localizations/pl.xcloc/Localized Contents/pl.xliff b/apps/ios/SimpleX Localizations/pl.xcloc/Localized Contents/pl.xliff index ce4fe705a1..fd380d7e89 100644 --- a/apps/ios/SimpleX Localizations/pl.xcloc/Localized Contents/pl.xliff +++ b/apps/ios/SimpleX Localizations/pl.xcloc/Localized Contents/pl.xliff @@ -709,8 +709,8 @@ Wszystkie nowe wiadomości z %@ zostaną ukryte! No comment provided by engineer. - - All users + + All profiles No comment provided by engineer. @@ -1709,8 +1709,8 @@ To jest twój jednorazowy link! Obecne hasło… No comment provided by engineer. - - Current user + + Current profile No comment provided by engineer. @@ -5668,6 +5668,10 @@ Włącz w ustawianiach *Sieć i serwery* . Wersja serwera jest niekompatybilna z ustawieniami sieciowymi. srv error text + + Server version is incompatible with network settings: %@. + No comment provided by engineer. + Server version is incompatible with your app: %@. No comment provided by engineer. @@ -5809,6 +5813,10 @@ Włącz w ustawianiach *Sieć i serwery* . Pokaż status wiadomości No comment provided by engineer. + + Show percentage + No comment provided by engineer. + Show preview Pokaż podgląd @@ -6033,10 +6041,6 @@ Włącz w ustawianiach *Sieć i serwery* . Subscription errors No comment provided by engineer. - - Subscription percentage - No comment provided by engineer. - Subscriptions ignored No comment provided by engineer. diff --git a/apps/ios/SimpleX Localizations/ru.xcloc/Localized Contents/ru.xliff b/apps/ios/SimpleX Localizations/ru.xcloc/Localized Contents/ru.xliff index b5da149546..a31e6168e1 100644 --- a/apps/ios/SimpleX Localizations/ru.xcloc/Localized Contents/ru.xliff +++ b/apps/ios/SimpleX Localizations/ru.xcloc/Localized Contents/ru.xliff @@ -709,8 +709,8 @@ Все новые сообщения от %@ будут скрыты! No comment provided by engineer. - - All users + + All profiles No comment provided by engineer. @@ -1709,8 +1709,8 @@ This is your own one-time link! Текущий пароль… No comment provided by engineer. - - Current user + + Current profile No comment provided by engineer. @@ -5666,6 +5666,10 @@ Enable in *Network & servers* settings. Версия сервера несовместима с настройками сети. srv error text + + Server version is incompatible with network settings: %@. + No comment provided by engineer. + Server version is incompatible with your app: %@. No comment provided by engineer. @@ -5807,6 +5811,10 @@ Enable in *Network & servers* settings. Показать статус сообщения No comment provided by engineer. + + Show percentage + No comment provided by engineer. + Show preview Показывать уведомления @@ -6031,10 +6039,6 @@ Enable in *Network & servers* settings. Subscription errors No comment provided by engineer. - - Subscription percentage - No comment provided by engineer. - Subscriptions ignored No comment provided by engineer. diff --git a/apps/ios/SimpleX Localizations/th.xcloc/Localized Contents/th.xliff b/apps/ios/SimpleX Localizations/th.xcloc/Localized Contents/th.xliff index 605a630f10..caeefc37ed 100644 --- a/apps/ios/SimpleX Localizations/th.xcloc/Localized Contents/th.xliff +++ b/apps/ios/SimpleX Localizations/th.xcloc/Localized Contents/th.xliff @@ -674,8 +674,8 @@ All new messages from %@ will be hidden! No comment provided by engineer. - - All users + + All profiles No comment provided by engineer. @@ -1617,8 +1617,8 @@ This is your own one-time link! รหัสผ่านปัจจุบัน… No comment provided by engineer. - - Current user + + Current profile No comment provided by engineer. @@ -5401,6 +5401,10 @@ Enable in *Network & servers* settings. Server version is incompatible with network settings. srv error text + + Server version is incompatible with network settings: %@. + No comment provided by engineer. + Server version is incompatible with your app: %@. No comment provided by engineer. @@ -5535,6 +5539,10 @@ Enable in *Network & servers* settings. Show message status No comment provided by engineer. + + Show percentage + No comment provided by engineer. + Show preview แสดงตัวอย่าง @@ -5750,10 +5758,6 @@ Enable in *Network & servers* settings. Subscription errors No comment provided by engineer. - - Subscription percentage - No comment provided by engineer. - Subscriptions ignored No comment provided by engineer. diff --git a/apps/ios/SimpleX Localizations/tr.xcloc/Localized Contents/tr.xliff b/apps/ios/SimpleX Localizations/tr.xcloc/Localized Contents/tr.xliff index 8a09e1f21a..5f1a48b381 100644 --- a/apps/ios/SimpleX Localizations/tr.xcloc/Localized Contents/tr.xliff +++ b/apps/ios/SimpleX Localizations/tr.xcloc/Localized Contents/tr.xliff @@ -709,8 +709,8 @@ %@ 'den gelen bütün yeni mesajlar saklı olacak! No comment provided by engineer. - - All users + + All profiles No comment provided by engineer. @@ -1709,8 +1709,8 @@ Bu senin kendi tek kullanımlık bağlantın! Şu anki parola… No comment provided by engineer. - - Current user + + Current profile No comment provided by engineer. @@ -5668,6 +5668,10 @@ Enable in *Network & servers* settings. Sunucu sürümü ağ ayarlarıyla uyumlu değil. srv error text + + Server version is incompatible with network settings: %@. + No comment provided by engineer. + Server version is incompatible with your app: %@. No comment provided by engineer. @@ -5809,6 +5813,10 @@ Enable in *Network & servers* settings. Mesaj durumunu göster No comment provided by engineer. + + Show percentage + No comment provided by engineer. + Show preview Ön gösterimi göser @@ -6033,10 +6041,6 @@ Enable in *Network & servers* settings. Subscription errors No comment provided by engineer. - - Subscription percentage - No comment provided by engineer. - Subscriptions ignored No comment provided by engineer. diff --git a/apps/ios/SimpleX Localizations/uk.xcloc/Localized Contents/uk.xliff b/apps/ios/SimpleX Localizations/uk.xcloc/Localized Contents/uk.xliff index f210d39a78..318d8a877b 100644 --- a/apps/ios/SimpleX Localizations/uk.xcloc/Localized Contents/uk.xliff +++ b/apps/ios/SimpleX Localizations/uk.xcloc/Localized Contents/uk.xliff @@ -709,8 +709,8 @@ Всі нові повідомлення від %@ будуть приховані! No comment provided by engineer. - - All users + + All profiles No comment provided by engineer. @@ -1709,8 +1709,8 @@ This is your own one-time link! Поточна парольна фраза… No comment provided by engineer. - - Current user + + Current profile No comment provided by engineer. @@ -5668,6 +5668,10 @@ Enable in *Network & servers* settings. Серверна версія несумісна з мережевими налаштуваннями. srv error text + + Server version is incompatible with network settings: %@. + No comment provided by engineer. + Server version is incompatible with your app: %@. No comment provided by engineer. @@ -5809,6 +5813,10 @@ Enable in *Network & servers* settings. Показати статус повідомлення No comment provided by engineer. + + Show percentage + No comment provided by engineer. + Show preview Показати попередній перегляд @@ -6033,10 +6041,6 @@ Enable in *Network & servers* settings. Subscription errors No comment provided by engineer. - - Subscription percentage - No comment provided by engineer. - Subscriptions ignored No comment provided by engineer. diff --git a/apps/ios/SimpleX Localizations/zh-Hans.xcloc/Localized Contents/zh-Hans.xliff b/apps/ios/SimpleX Localizations/zh-Hans.xcloc/Localized Contents/zh-Hans.xliff index bc61b16ce0..e53ab5b1a7 100644 --- a/apps/ios/SimpleX Localizations/zh-Hans.xcloc/Localized Contents/zh-Hans.xliff +++ b/apps/ios/SimpleX Localizations/zh-Hans.xcloc/Localized Contents/zh-Hans.xliff @@ -696,8 +696,8 @@ All new messages from %@ will be hidden! No comment provided by engineer. - - All users + + All profiles No comment provided by engineer. @@ -1683,8 +1683,8 @@ This is your own one-time link! 现有密码…… No comment provided by engineer. - - Current user + + Current profile No comment provided by engineer. @@ -5589,6 +5589,10 @@ Enable in *Network & servers* settings. Server version is incompatible with network settings. srv error text + + Server version is incompatible with network settings: %@. + No comment provided by engineer. + Server version is incompatible with your app: %@. No comment provided by engineer. @@ -5729,6 +5733,10 @@ Enable in *Network & servers* settings. Show message status No comment provided by engineer. + + Show percentage + No comment provided by engineer. + Show preview 显示预览 @@ -5952,10 +5960,6 @@ Enable in *Network & servers* settings. Subscription errors No comment provided by engineer. - - Subscription percentage - No comment provided by engineer. - Subscriptions ignored No comment provided by engineer. diff --git a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chatlist/ServersSummaryView.kt b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chatlist/ServersSummaryView.kt index 5a3f09919e..74f4fcdcc3 100644 --- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chatlist/ServersSummaryView.kt +++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chatlist/ServersSummaryView.kt @@ -50,10 +50,10 @@ import chat.simplex.common.platform.appPlatform import chat.simplex.common.ui.theme.* import chat.simplex.common.views.helpers.* import chat.simplex.common.views.usersettings.ProtocolServersView +import chat.simplex.common.views.usersettings.SettingsPreferenceItem import chat.simplex.res.MR import dev.icerock.moko.resources.compose.painterResource import dev.icerock.moko.resources.compose.stringResource -import kotlinx.coroutines.cancel import kotlinx.coroutines.launch import kotlinx.datetime.Instant import numOrDash @@ -345,6 +345,7 @@ private fun SMPSubscriptionsSection(totals: SMPTotals) { generalGetString(MR.strings.servers_info_subscriptions_total), numOrDash(totals.subs.total) ) + SettingsPreferenceItem(null, stringResource(MR.strings.subscription_percentage), chatModel.controller.appPrefs.networkShowSubscriptionPercentage) } } } @@ -768,7 +769,7 @@ fun ModalData.ServersSummaryView(rh: RemoteHostInfo?, serversSummary: MutableSta ) { PresentedServerType.entries.size } KeyChangeEffect(serverTypePagerState.currentPage) { - selectedServerType.value = PresentedServerType.values()[serverTypePagerState.currentPage] + selectedServerType.value = PresentedServerType.entries[serverTypePagerState.currentPage] } TabRow( selectedTabIndex = serverTypePagerState.currentPage, diff --git a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/usersettings/NetworkAndServers.kt b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/usersettings/NetworkAndServers.kt index e7033e88f4..61c8e1b75f 100644 --- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/usersettings/NetworkAndServers.kt +++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/usersettings/NetworkAndServers.kt @@ -42,7 +42,6 @@ fun NetworkAndServersView() { // It's not a state, just a one-time value. Shouldn't be used in any state-related situations val netCfg = remember { chatModel.controller.getNetCfg() } val networkUseSocksProxy: MutableState = remember { mutableStateOf(netCfg.useSocksProxy) } - val networkShowSubscriptionPercentage: MutableState = remember { mutableStateOf(chatModel.controller.appPrefs.networkShowSubscriptionPercentage.get()) } val developerTools = chatModel.controller.appPrefs.developerTools.get() val onionHosts = remember { mutableStateOf(netCfg.onionHosts) } val sessionMode = remember { mutableStateOf(netCfg.sessionMode) } @@ -54,7 +53,6 @@ fun NetworkAndServersView() { currentRemoteHost = currentRemoteHost, developerTools = developerTools, networkUseSocksProxy = networkUseSocksProxy, - networkShowSubscriptionPercentage = networkShowSubscriptionPercentage, onionHosts = onionHosts, sessionMode = sessionMode, smpProxyMode = smpProxyMode, @@ -119,9 +117,6 @@ fun NetworkAndServersView() { ) } }, - toggleNetworkShowSubscriptionPercentage = { enable -> - networkShowSubscriptionPercentage.value = enable - }, useOnion = { if (onionHosts.value == it) return@NetworkAndServersLayout val prevValue = onionHosts.value @@ -235,14 +230,12 @@ fun NetworkAndServersView() { currentRemoteHost: RemoteHostInfo?, developerTools: Boolean, networkUseSocksProxy: MutableState, - networkShowSubscriptionPercentage: MutableState, onionHosts: MutableState, sessionMode: MutableState, smpProxyMode: MutableState, smpProxyFallback: MutableState, proxyPort: State, toggleSocksProxy: (Boolean) -> Unit, - toggleNetworkShowSubscriptionPercentage: (Boolean) -> Unit, useOnion: (OnionHosts) -> Unit, updateSessionMode: (TransportSessionMode) -> Unit, updateSMPProxyMode: (SMPProxyMode) -> Unit, @@ -263,7 +256,6 @@ fun NetworkAndServersView() { SettingsActionItem(painterResource(MR.images.ic_dns), stringResource(MR.strings.xftp_servers), { ModalManager.start.showCustomModal { close -> ProtocolServersView(m, m.remoteHostId, ServerProtocol.XFTP, close) } }) if (currentRemoteHost == null) { - SettingsPreferenceItem(painterResource(MR.images.ic_radiowaves_up_forward_4_bar),stringResource(MR.strings.subscription_percentage), chatModel.controller.appPrefs.networkShowSubscriptionPercentage) UseSocksProxySwitch(networkUseSocksProxy, proxyPort, toggleSocksProxy, showModal, chatModel.controller.appPrefs.networkProxyHostPort, false) UseOnionHosts(onionHosts, networkUseSocksProxy, showModal, useOnion) if (developerTools) { @@ -685,10 +677,8 @@ fun PreviewNetworkAndServersLayout() { currentRemoteHost = null, developerTools = true, networkUseSocksProxy = remember { mutableStateOf(true) }, - networkShowSubscriptionPercentage = remember { mutableStateOf(false) }, proxyPort = remember { mutableStateOf(9050) }, toggleSocksProxy = {}, - toggleNetworkShowSubscriptionPercentage = {}, onionHosts = remember { mutableStateOf(OnionHosts.PREFER) }, sessionMode = remember { mutableStateOf(TransportSessionMode.User) }, smpProxyMode = remember { mutableStateOf(SMPProxyMode.Never) }, diff --git a/apps/multiplatform/common/src/commonMain/resources/MR/base/strings.xml b/apps/multiplatform/common/src/commonMain/resources/MR/base/strings.xml index 24bc6194cc..d8fdfac45b 100644 --- a/apps/multiplatform/common/src/commonMain/resources/MR/base/strings.xml +++ b/apps/multiplatform/common/src/commonMain/resources/MR/base/strings.xml @@ -700,7 +700,7 @@ XFTP servers Configured XFTP servers Other XFTP servers - Subscription percentage + Show percentage Install SimpleX Chat for terminal Star on GitHub Contribute @@ -2120,8 +2120,8 @@ Files No info, try to reload Showing info for - All users - Current user + All profiles + Current profile Transport sessions Connected Connecting