Merge pull request #376 from meshtastic/refactor-protos

Update with new default modem configurations

app/src/main/java/com/geeksville/mesh/model/Channel.kt

@@ -22,7 +22,7 @@ data class Channel(val settings: ChannelProtos.ChannelSettings) {
         // TH=he unsecured channel that devices ship with
         val default = Channel(
             ChannelProtos.ChannelSettings.newBuilder()
-                .setModemConfig(ChannelProtos.ChannelSettings.ModemConfig.Bw125Cr48Sf4096)
+                .setModemConfig(ChannelProtos.ChannelSettings.ModemConfig.LongFast)
                 .setPsk(ByteString.copyFrom(defaultPSK))
                 .build()
         )
@@ -35,12 +35,13 @@ data class Channel(val settings: ChannelProtos.ChannelSettings) {
             if (settings.bandwidth != 0)
                 "Unset"
             else when (settings.modemConfig) {
-                ChannelProtos.ChannelSettings.ModemConfig.Bw500Cr45Sf128 -> "ShortFast"
-                ChannelProtos.ChannelSettings.ModemConfig.Bw125Cr45Sf128 -> "ShortSlow"
-                ChannelProtos.ChannelSettings.ModemConfig.Bw250Cr47Sf1024 -> "MediumFast"
-                ChannelProtos.ChannelSettings.ModemConfig.Bw250Cr46Sf2048 -> "MediumSlow"
-                ChannelProtos.ChannelSettings.ModemConfig.Bw31_25Cr48Sf512 -> "LongFast"
-                ChannelProtos.ChannelSettings.ModemConfig.Bw125Cr48Sf4096 -> "LongSlow"
+                ChannelProtos.ChannelSettings.ModemConfig.ShortFast -> "ShortFast"
+                ChannelProtos.ChannelSettings.ModemConfig.ShortSlow -> "ShortSlow"
+                ChannelProtos.ChannelSettings.ModemConfig.MidFast -> "MidFast"
+                ChannelProtos.ChannelSettings.ModemConfig.MidSlow -> "MidSlow"
+                ChannelProtos.ChannelSettings.ModemConfig.LongFast -> "LongFast"
+                ChannelProtos.ChannelSettings.ModemConfig.LongSlow -> "LongSlow"
+                ChannelProtos.ChannelSettings.ModemConfig.VLongSlow -> "VLongSlow"
                 else -> "Invalid"
             }
         } else

app/src/main/java/com/geeksville/mesh/model/ChannelOption.kt

@@ -8,12 +8,13 @@ enum class ChannelOption(
     val configRes: Int,
     val minBroadcastPeriodSecs: Int
 ) {
-    SHORT(ChannelProtos.ChannelSettings.ModemConfig.Bw500Cr45Sf128,R.string.modem_config_short, 30),
-    MEDIUM(ChannelProtos.ChannelSettings.ModemConfig.Bw125Cr45Sf128, R.string.modem_config_slow_short, 30),
-    MED_FAST(ChannelProtos.ChannelSettings.ModemConfig.Bw250Cr47Sf1024,R.string.modem_config_medium, 60),
-    MED_SLOW(ChannelProtos.ChannelSettings.ModemConfig.Bw250Cr46Sf2048,R.string.modem_config_slow_medium, 60),
-    LONG(ChannelProtos.ChannelSettings.ModemConfig.Bw31_25Cr48Sf512, R.string.modem_config_long, 240),
-    VERY_LONG(ChannelProtos.ChannelSettings.ModemConfig.Bw125Cr48Sf4096, R.string.modem_config_very_long, 375);
+    SHORT_FAST(ChannelProtos.ChannelSettings.ModemConfig.ShortFast,R.string.modem_config_short, 30),
+    SHORT_SLOW(ChannelProtos.ChannelSettings.ModemConfig.ShortSlow, R.string.modem_config_slow_short, 30),
+    MED_FAST(ChannelProtos.ChannelSettings.ModemConfig.MidFast,R.string.modem_config_medium, 60),
+    MED_SLOW(ChannelProtos.ChannelSettings.ModemConfig.MidSlow,R.string.modem_config_slow_medium, 60),
+    LONG_FAST(ChannelProtos.ChannelSettings.ModemConfig.LongFast, R.string.modem_config_long, 240),
+    LONG_SLOW(ChannelProtos.ChannelSettings.ModemConfig.LongSlow, R.string.modem_config_slow_long, 375),
+    VERY_LONG(ChannelProtos.ChannelSettings.ModemConfig.VLongSlow, R.string.modem_config_very_long, 375);
 
     companion object {
         fun fromConfig(modemConfig: ChannelProtos.ChannelSettings.ModemConfig?): ChannelOption? {

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

@@ -1,142 +1,76 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-
     <string name="action_settings">Ρυθμίσεις</string>
-
     <string name="channel_name">Όνομα Καναλιού</string>
-
     <string name="channel_options">Επιλογές Καναλιού</string>
-
     <string name="share_button">Κοινή χρήση</string>
-
     <string name="qr_code">Κώδικας QR</string>
-
     <string name="unset">Αναίρεση</string>
-
     <string name="connection_status">Κατάσταση Σύνδεσης</string>
-
     <string name="application_icon">Εικονίδιο εφαρμογής </string>
-
     <string name="unknown_username">Άγνωστο Όνομα Χρήστη</string>
-
     <string name="user_avatar">Avatar Χρήστη</string>
-
-
     <string name="sample_message">Βρήκα το σημείο, είναι διπλα στη τίγρη. Φοβάμαι λίγο.</string>
-
     <string name="send_text">Αποστολή κειμένου</string>
-
     <string name="warning_not_paired">Δεν έχετε κάνει ακόμη pair μια συσκευή συμβατή με Meshtastic με το τηλέφωνο. Παρακαλώ κάντε pair μια συσκευή και ορίστε το όνομα χρήστη.\n\nΗ εφαρμογή ανοιχτού κώδικα βρίσκεται σε alpha-testing, αν εντοπίσετε προβλήματα παρακαλώ δημοσιεύστε τα στο forum: meshtastic.discourse.group.\n\nΠερισσότερες πληροφορίες στην ιστοσελίδα - www.meshtastic.org.</string>
-
     <string name="username_unset">Όνομα Χρήστη αναιρέθηκε</string>
-
     <string name="your_name">Όνομα</string>
-
     <string name="analytics_okay">Ανώνυμα στατιστικά χρήσης και αναφορές crash.</string>
-
     <string name="looking_for_meshtastic_devices">Αναζήτηση συσκευών Meshtastic …</string>
-
     <string name="requires_bluetooth">Η εφαρμογή απαιτεί bluetooth πρόσβαση. Παρακαλώ παρέχεται σχετική άδεια χρήσης στις ρυθμίσεις του android.</string>
-
     <string name="error_bluetooth">Σφάλμα - η εφαρμογή απαιτεί bluetooth</string>
-
     <string name="starting_pairing">Αρχή pairing</string>
-
     <string name="pairing_failed">Pairing απέτυχε</string>
-
     <string name="url_for_join">Διεύθυνση URL για συμμετοχή σε Meshtastic mesh</string>
-
     <string name="accept">Αποδοχή</string>
-
     <string name="cancel">Ακύρωση</string>
-
     <string name="change_channel">Αλλαγή καναλιού</string>
-
     <string name="are_you_sure_channel">Είστε βέβαιοι ότι θέλετε να αλλάξετε κανάλι? Η επικοινωνία με άλλες συσκευές θα σταματήσεις μέχρι να μοιραστείτε τις ρυθμίσεις του νέου καναλιού.</string>
-
     <string name="new_channel_rcvd">Λήψη URL νέου καναλιού</string>
-
     <string name="do_you_want_switch">Θέλετε να αλλάξετε ‘%s’ κανάλι?</string>
-
     <string name="map_not_allowed">Έχετε απενεργοποιήσει την ανάλυση δεδομένων. Δυστυχώς ο πάροχος χαρτών μας (mapbox) απαιτεί η ανάλυση δεδομένων να επιτρέπεται στο ‘δωρεάν’ πακέτο. Επομένως έχουμε απενεργοποιήσει το χάρτη.\n\n
     Αν επιθυμείτε να δείτε το χάρτη, θα πρέπει να ενεργοποιήσετε την ανάλυση δεδομένων στις Ρυθμίσεις (επίσης - προσωρινά - θα πρέπει να επανεκκινήσετε την εφαρμογή).\n\n
     Αν θεωρείτε ότι πρέπει να πληρώνουμε το mapbox (η να αλλάξουμε πάροχο χαρτών), παρακαλώ δημοσιεύστε στο meshtastic.discourse.group</string>
-
     <string name="permission_missing">Λείπει μια απαιτούμενη άδεια, Meshtastic δεν θα λειτοργεί σωστά.  Ενεργοποιήστε τις ρυθμίσεις εφαρμογής Android.</string>
-
     <string name="radio_sleeping">Radio σε κατάσταση ύπνου, δεν γίνεται αλλαγή καναλιού</string>
-
     <string name="report_bug">Αναφορά Bug</string>
-
     <string name="report_a_bug">Αναφέρετε ένα bug</string>
-
     <string name="report_bug_text">Είστε σίγουροι ότι θέλετε να αναφέρετε ένα bug? Μετά την αναφορά δημοσιεύστε στο meshtastic.discourse.group ώστε να συνδέσουμε την αναφορά με το συμβάν.</string>
-
     <string name="report">Αναφορά</string>
-
     <string name="select_radio">Επιλογή radio</string>
-
     <string name="current_pair">Έχετε κάνει pair με radio %s</string>
-
     <string name="not_paired_yet">Δεν έχετε κάνει pair με radio ακόμη.</string>
-
     <string name="change_radio">Αλλαγή radio</string>
-
     <string name="please_pair">Παρακαλώ κάντε pair μια συσκευή στις ρυθμίσεις Android.</string>
-
     <string name="pairing_completed">Η διαδικασία pairing ολοκληρώθηκε, εκκίνηση υπηρεσίας</string>
-
     <string name="pairing_failed_try_again">Η διαδικασία pairing απέτυχε, παρακαλώ επιλέξτε πάλι</string>
-
     <string name="location_disabled">Ο εντοπισμός τοποθεσίας είναι απενεργοποιημένος, δε μπορούμε να μοιραστούμε τη θέση σας με το mesh.</string>
-
     <string name="share">Κοινοποίηση</string>
-
     <string name="disconnected">Αποσυνδεδεμένο</string>
-
     <string name="device_sleeping">Συσκευή σε ύπνωση</string>
-
     <string name="connected_count">Συνδεδεμένος: %s από %s online</string>
-
     <string name="list_of_nodes">Λίστα κόμβων δικτύου</string>
-
     <string name="update_firmware">Αναβάθμιση Firmware</string>
-
     <string name="connected">Συνδεδεμένο στο radio</string>
-
     <string name="connected_to">Συνδεδεμένο στο radio (%s)</string>
-
     <string name="not_connected">Αποσυνδεδεμένο, επιλέξτε radio </string>
-
     <string name="connected_sleeping">Συνδεδεμένο στο radio, αλλά βρίσκεται σε ύπνωση</string>
-
     <string name="update_to">Αναβάθμιση σε %s</string>
-
     <string name="app_too_old">Εφαρμογή πολύ παλαιά</string>
-
     <string name="must_update">Πρέπει να ενημερώσετε την εφαρμογή μέσω Google Play store (ή Github). Είναι πολύ παλαιά ώστε να συνδεθεί με το radio.</string>
-
     <string name="none">Κανένα (απενεργοποιημένο)</string>
-
-    <string name="modem_config_short">Μικρή εμβέλεια (αλλά γρήγορο)</string>
-
-    <string name="modem_config_medium">Μεσαία εμβέλεια (αλλά γρήγορο)</string>
-
-    <string name="modem_config_long">Μεγάλη εμβέλεια (αλλά αργό)</string>
-
-    <string name="modem_config_very_long">Πολύ μεγάλη εμβέλεια (αλλά αργό)</string>
-
+    <string name="modem_config_short">Μικρή εμβέλεια (γρήγορο)</string>
+    <string name="modem_config_medium">Μεσαία εμβέλεια (γρήγορο)</string>
+    <string name="modem_config_long">Μεγάλη εμβέλεια (γρήγορο)</string>
+    <string name="modem_config_very_long">Πολύ μεγάλη εμβέλεια (αργό)</string>
     <string name="modem_config_unrecognized">ΜΗ ΑΝΑΓΝΩΡΙΣΙΜΟ</string>
-
     <string name="meshtastic_service_notifications">Ειδοποιήσεις Υπηρεσίας Meshtastic</string>
-
     <string name="location_disabled_warning">Πρέπει να ενεργοποιήσετε τις υπηρεσίες εντοπισμού τοποθεσίας στις ρυθμίσεις Android</string>
-
     <string name="about">Σχετικά</string>
-
     <string name="a_list_of_nodes_in_the_mesh">Λίστα κόμβων στο mesh</string>
-
     <string name="text_messages">Μηνύματα</string>
-
     <string name="channel_invalid">Αυτό το κανάλι URL δεν είναι ορθό και δεν μπορεί να χρησιμοποιηθεί</string>
+    <string name="modem_config_slow_short">Μικρή εμβέλεια (αργό)</string>
+    <string name="modem_config_slow_medium">Μεσαία εμβέλεια (αργό)</string>
+    <string name="modem_config_slow_long">μεγάλη εμβέλεια (αργό)</string>
 </resources>

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

@@ -55,10 +55,10 @@
     <string name="update_to">Actualizar a %s</string>
     <string name="app_too_old">Es necesario actualizar la aplicación</string>
     <string name="none">Ninguno (desactivado)</string>
-    <string name="modem_config_short">Corto alcance (pero rápido)</string>
-    <string name="modem_config_medium">Alcance medio (pero rápido)</string>
-    <string name="modem_config_long">Largo alcance (pero más lento)</string>
-    <string name="modem_config_very_long">Muy largo alcance (pero lento)</string>
+    <string name="modem_config_short">Corto alcance / rápido</string>
+    <string name="modem_config_medium">Alcance medio / rápido</string>
+    <string name="modem_config_long">Largo alcance / rápido</string>
+    <string name="modem_config_very_long">Muy largo alcance / lento</string>
     <string name="modem_config_unrecognized">SIN RECONOCIMIENTO</string>
     <string name="meshtastic_service_notifications">Notificaciones de servicio de Meshtastic</string>
     <string name="location_disabled_warning">Debes activar los servicios de localización (de alta precisión) en los Ajustes de Android</string>
@@ -93,4 +93,7 @@
     <string name="are_you_shure_change_default">¿Estás seguro de que quieres cambiar al canal por defecto?</string>
     <string name="reset_to_defaults">Restablecer los valores predeterminados</string>
     <string name="apply">Aplique</string>
+    <string name="modem_config_slow_short">Curto alcance / lento</string>
+    <string name="modem_config_slow_medium">Médio alcance / lento</string>
+    <string name="modem_config_slow_long">Largo alcance / lento)</string>
 </resources>

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

@@ -66,7 +66,7 @@
     <string name="update_to">Mise à jour vers %s</string>
     <string name="modem_config_short">Courte distance (rapide)</string>
     <string name="modem_config_medium">Moyenne distance (rapide)</string>
-    <string name="modem_config_long">Longue distance (plus lent)</string>
+    <string name="modem_config_long">Longue distance (rapide)</string>
     <string name="modem_config_very_long">Très longue distance (lent)</string>
     <string name="meshtastic_service_notifications">Meshtastic Notifications de Service</string>
     <string name="location_disabled_warning">Besoin d\'activer l\'accès à la position dans les Paramètres Android</string>
@@ -74,4 +74,7 @@
     <string name="a_list_of_nodes_in_the_mesh">Une liste des nœuds dans le réseau</string>
     <string name="text_messages">Messages tèxte</string>
     <string name="channel_invalid">Cet URL Canal n\'est pas valide et ne peut être utilisé</string>
+    <string name="modem_config_slow_short">Courte distance (lent)</string>
+    <string name="modem_config_slow_medium">Moyenne distance (lent)</string>
+    <string name="modem_config_slow_long">Longue distance (lent)</string>
 </resources>

app/src/main/res/values-ht/strings.xml

@@ -59,7 +59,7 @@
     <string name="none">Okenn (enfim)</string>
     <string name="modem_config_short">Distans kout (men vit)</string>
     <string name="modem_config_medium">Distans mwayènn (men vit)</string>
-    <string name="modem_config_long">Anpil distans (men pi lan)</string>
+    <string name="modem_config_long">Anpil distans (men vit)</string>
     <string name="modem_config_very_long">Distans vrèman long (men lan)</string>
     <string name="modem_config_unrecognized">PA REKONÈT</string>
     <string name="meshtastic_service_notifications">Notifikasyon Sèvis Meshtastic</string>
@@ -68,4 +68,7 @@
     <string name="a_list_of_nodes_in_the_mesh">Yon lis ne elektronik nan mesh la</string>
     <string name="text_messages">Mesaj tèks yo</string>
     <string name="channel_invalid">Chènn URL sa a pa valab epi yo pa kapab itilize li</string>
+    <string name="modem_config_slow_short">Distans kout (men lan)</string>
+    <string name="modem_config_slow_medium">Distans mwayènn (men lan)</string>
+    <string name="modem_config_slow_long">Anpil distans (men lan)</string>
 </resources>

app/src/main/res/values-hu/strings.xml

@@ -58,10 +58,10 @@
     <string name="app_too_old">Az alkalmazás frissítése szükséges</string>
     <string name="must_update">Frissítenie kell ezt az alkalmazást a Google Play áruházban (vagy a GitHub-ról), mert túl régi, hogy kommunikálni tudjob ezzel a rádió firmware-rel. Kérem olvassa el a tudnivalókat ebből a <a href="https://www.meshtastic.org/software/android-too-old.html">wiki</a>-ből.</string>
     <string name="none">Egyik sem (letiltás)</string>
-    <string name="modem_config_short">Rövid hatótáv (nagyon gyors)</string>
+    <string name="modem_config_short">Rövid hatótáv (gyors)</string>
     <string name="modem_config_medium">Közepes hatótáv (gyors)</string>
-    <string name="modem_config_long">Távoli hatótáv (lassú)</string>
-    <string name="modem_config_very_long">Nagyon távoli hatótáv (nagyon lassú)</string>
+    <string name="modem_config_long">Távoli hatótáv (gyors)</string>
+    <string name="modem_config_very_long">Nagyon távoli hatótáv (lassú)</string>
     <string name="modem_config_unrecognized">FELISMERHETETLEN</string>
     <string name="meshtastic_service_notifications">Meshtastic szolgáltatás értesítések</string>
     <string name="location_disabled_warning">Be kell kapcsolja a (nagy pontosságú) helyzet szolgáltatásokat az Android beállításokban</string>
@@ -102,4 +102,7 @@
     <string name="theme_dark">Sötét</string>
     <string name="theme_system">Rendszer alapértelmezett</string>
     <string name="choose_theme_title">Válasszon témát</string>
+    <string name="modem_config_slow_short">Rövid hatótáv (lassú)</string>
+    <string name="modem_config_slow_medium">Közepes hatótáv (lassú)</string>
+    <string name="modem_config_slow_long">Távoli hatótáv (lassú)</string>
 </resources>

app/src/main/res/values-ko-rKR/strings.xml

@@ -59,7 +59,7 @@
     <string name="none">없음 (비활성화)</string>
     <string name="modem_config_short">짧은 거리 (빠른 속도)</string>
     <string name="modem_config_medium">중간 거리 (빠른 속도)</string>
-    <string name="modem_config_long">먼 거리 (느린 속도)</string>
+    <string name="modem_config_long">먼 거리 (빠른 속도)</string>
     <string name="modem_config_very_long">아주 먼 거리 (느린 속도)</string>
     <string name="modem_config_unrecognized">알 수 없음</string>
     <string name="meshtastic_service_notifications">Meshtastic 서비스 알림</string>
@@ -73,4 +73,7 @@
     <string name="rate_dialog_message_en">이 앱은 상업적인 목적으로 만들어 진 것이 아닙니다. 개발자의 노고를 치하하기 위해서 평가를 해주시겠어요? 만약 버그를 발견하면 해당 포럼에 알려주세요. 고맙습니다.</string>
     <string name="rate_dialog_no_en">하지 않음</string>
     <string name="rate_dialog_title_en">Meshtastic 평가</string>
+    <string name="modem_config_slow_short">짧은 거리 (느린 속도)</string>
+    <string name="modem_config_slow_medium">중간 거리 (느린 속도)</string>
+    <string name="modem_config_slow_long">>먼 거리 (느린 속도)</string>
 </resources>

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

@@ -59,10 +59,10 @@
     <string name="app_too_old">Applicatie te oud</string>
     <string name="must_update">Applicatie update noodzakelijk in Google Play store (of Github). Deze versie is te oud om te praten met deze radio.</string>
     <string name="none">Geen (inactief)</string>
-    <string name="modem_config_short">Klein bereik (maar snel)</string>
-    <string name="modem_config_medium">Medium bereik (minder snel)</string>
-    <string name="modem_config_long">Groot bereik (maar trager)</string>
-    <string name="modem_config_very_long">Zeer groot bereik (maar traag)</string>
+    <string name="modem_config_short">Klein bereik (snel)</string>
+    <string name="modem_config_medium">Medium bereik (snel)</string>
+    <string name="modem_config_long">Groot bereik (snel)</string>
+    <string name="modem_config_very_long">Zeer groot bereik (traag)</string>
     <string name="modem_config_unrecognized">ONBEKEND</string>
     <string name="meshtastic_service_notifications">Meshtastic Service Berichten</string>
     <string name="location_disabled_warning">Noodzakelijk de positioneringsservice te activeren in Android Instellingen</string>
@@ -70,4 +70,7 @@
     <string name="a_list_of_nodes_in_the_mesh">Een lijst van de aansluitpunten in het netwerk</string>
     <string name="text_messages">Teksberichten</string>
     <string name="channel_invalid">Deze Kanaal URL kan niet worden gebruikt</string>
+    <string name="modem_config_slow_short">Klein bereik (traag)</string>
+    <string name="modem_config_slow_medium">Medium bereik (traag)</string>
+    <string name="modem_config_slow_long">Groot bereik (traag)</string>
 </resources>

app/src/main/res/values-no/strings.xml

@@ -59,10 +59,10 @@
     <string name="app_too_old">Applikasjon for gammel</string>
     <string name="must_update">Du må oppdatere denne applikasjonen på Google Play store (eller Github). Den er for gammel til å snakke med denne radioen.</string>
     <string name="none">Ingen (slå av)</string>
-    <string name="modem_config_short">Kort rekkevidde (men rask)</string>
-    <string name="modem_config_medium">Medium rekkevidde (men rask)</string>
-    <string name="modem_config_long">Lang rekkevidde (men langsommerer)</string>
-    <string name="modem_config_very_long">Veldig lang rekkevidde (men langsom)</string>
+    <string name="modem_config_short">Kort rekkevidde (rask)</string>
+    <string name="modem_config_medium">Medium rekkevidde (rask)</string>
+    <string name="modem_config_long">Lang rekkevidde (rask)</string>
+    <string name="modem_config_very_long">Veldig lang rekkevidde (langsom)</string>
     <string name="modem_config_unrecognized">IKKE GJENKJENT</string>
     <string name="meshtastic_service_notifications">Meshtastic Tjeneste meldinger</string>
     <string name="location_disabled_warning">Du må slå på (høy presisjon) lokasjonstjenester i Android Innstillinger</string>
@@ -70,4 +70,7 @@
     <string name="a_list_of_nodes_in_the_mesh">En liste over noder i nettet</string>
     <string name="text_messages">Tekstmeldinger</string>
     <string name="channel_invalid">Denne kanall URL er ugyldig og kan ikke benyttes</string>
+    <string name="modem_config_slow_short">Kort rekkevidde (langsom)</string>
+    <string name="modem_config_slow_medium">Medium rekkevidde (langsom)</string>
+    <string name="modem_config_slow_long">Lang rekkevidde (langsom)</string>
 </resources>

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

@@ -64,10 +64,10 @@
     <string name="app_too_old">Wymagana jest aktualizacja aplikacji.</string>
     <string name="must_update">Musisz zaktualizować tę aplikację w Google Play store (lub ręcznie przez Github). Wersja aplikacji jest za stara, aby komunikować się z urządzeniem. Więcej informacji na ten temat znajdziesz tu: <a href="https://www.meshtastic.org/software/android-too-old.html">wiki</a></string>
     <string name="none">Żadne (Wyłącz)</string>
-    <string name="modem_config_short">Bliski zasięg (ale szybki transfer)</string>
-    <string name="modem_config_medium">Średni zasięg (ale szybki transfer)</string>
-    <string name="modem_config_long">Daleki zasięg (ale wolniejszy transfer)</string>
-    <string name="modem_config_very_long">Bardzo daleki zasięg (ale wolny transfer)</string>
+    <string name="modem_config_short">Bliski zasięg (szybko)</string>
+    <string name="modem_config_medium">Średni zasięg (szybko)</string>
+    <string name="modem_config_long">Daleki zasięg (szybko)</string>
+    <string name="modem_config_very_long">Bardzo daleki zasięg (wolny)</string>
     <string name="modem_config_unrecognized">Nierozpoznany</string>
     <string name="meshtastic_service_notifications">Powiadomienia usługi Meshtastic</string>
     <string name="location_disabled_warning">Musisz włączyć usługi lokalizacji (duża dokładność) w ustawieniach systemu.</string>
@@ -108,4 +108,7 @@
     <string name="theme_dark">Ciemny</string>
     <string name="theme_system">Domyślny systemu</string>
     <string name="choose_theme_title">Wybierz motyw</string>
+    <string name="modem_config_slow_short">Bliski zasięg (wolny)</string>
+    <string name="modem_config_slow_medium">Średni zasięg (wolny)</string>
+    <string name="modem_config_slow_long">Daleki zasięg (wolny)</string>
 </resources>

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

@@ -62,7 +62,7 @@
     <string name="modem_config_short">Curto alcance / rápido</string>
     <string name="modem_config_medium">Médio alcance / rápido</string>
     <string name="modem_config_long">Longo alcance / lento</string>
-    <string name="modem_config_very_long">Longo alcance / lento</string>
+    <string name="modem_config_very_long">Muito longo alcance / lento</string>
     <string name="modem_config_unrecognized">DESCONHECIDO</string>
     <string name="meshtastic_service_notifications">Notificações do Serviço Meshtastic</string>
     <string name="location_disabled_warning"> Você deve ativar o modo de alta precisão nas Configurações de Local do Android</string>
@@ -116,4 +116,5 @@
     <string name="why_camera_required">Precisamos acessar a câmera para escanear códigos QR. Nenhuma foto ou video são armazenados.</string>
     <string name="modem_config_slow_short">Curto alcance / lento</string>
     <string name="modem_config_slow_medium">Médio alcance / lento</string>
+    <string name="modem_config_slow_long">Longo alcance / lento</string>
 </resources>

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

@@ -61,7 +61,7 @@
     <string name="modem_config_short">Curto alcance / rápido</string>
     <string name="modem_config_medium">Médio alcance / rápido</string>
     <string name="modem_config_long">Longo alcance / lento</string>
-    <string name="modem_config_very_long">Longo alcance / lento</string>
+    <string name="modem_config_very_long">Muito longo alcance / lento</string>
     <string name="modem_config_unrecognized">DESCONHECIDO</string>
     <string name="meshtastic_service_notifications">Notificações do Serviço Meshtastic</string>
     <string name="location_disabled_warning">Deve ativar os serviços de localização nas configurações do Android</string>
@@ -116,4 +116,5 @@
     <string name="camera_required">Permissão da câmera</string>
     <string name="modem_config_slow_short">Curto alcance / lento</string>
     <string name="modem_config_slow_medium">Médio alcance / lento</string>
+    <string name="modem_config_slow_long">Longo alcance / lento</string>
 </resources>

app/src/main/res/values-ro/strings.xml

@@ -59,9 +59,9 @@
     <string name="app_too_old">Aplicație prea veche</string>
     <string name="must_update">Trebuie să updatezi această aplicație de pe Google Play  (sau Github). Aplicația este prea veche pentru a comunica cu dispozitivul.</string>
     <string name="none">Niciunul (dezactivat)</string>
-    <string name="modem_config_short">Rază scurtă (comunicare rapidă)</string>
-    <string name="modem_config_medium">Rază medie (comunicare rapidă)</string>
-    <string name="modem_config_long">Rază lungă (încet)</string>
+    <string name="modem_config_short">Rază scurtă (rapidă)</string>
+    <string name="modem_config_medium">Rază medie (rapidă)</string>
+    <string name="modem_config_long">Rază lungă (rapidă)</string>
     <string name="modem_config_very_long">Rază foarte lungă (încet)</string>
     <string name="modem_config_unrecognized">NERECUNOSCUT</string>
     <string name="meshtastic_service_notifications">Notificările Sistemului Meshtastic</string>
@@ -70,4 +70,7 @@
     <string name="a_list_of_nodes_in_the_mesh">O lista cu nodurile din rețea</string>
     <string name="text_messages">Mesaje Text</string>
     <string name="channel_invalid">Acest URL de canal este invalid și nu poate fi folosit</string>
+    <string name="modem_config_slow_short">Rază scurtă (încet)</string>
+    <string name="modem_config_slow_medium">Rază medie (încet)</string>
+    <string name="modem_config_slow_long">Rază lungă (încet)</string>
 </resources>

app/src/main/res/values-sk/strings.xml

@@ -120,4 +120,5 @@
     <string name="why_camera_required">Aplikácia Meshtastic potrebuje práva pre prístup ku fotoaparátu kvôli možnosti načítania QR kódov. Fotky ani videá nebudú ukladané na Vašom Android zariadení.</string>
     <string name="modem_config_slow_short">Krátky dosah / Pomalé</string>
     <string name="modem_config_slow_medium">Stredný dosah / Pomalé</string>
+    <string name="modem_config_slow_long">Dlhý dosah / Pomalé</string>
 </resources>

app/src/main/res/values-sl/strings.xml

@@ -57,12 +57,15 @@
     <string name="app_too_old">Aplikacija je prestara</string>
     <string name="must_update">To aplikacijo morate posodobiti v trgovini Google Play (ali Github). Žal se ne more povezati s tem radiem.</string>
     <string name="none">Brez (onemogoči)</string>
-    <string name="modem_config_short">Kratek doseg (vendar hiter)</string>
-    <string name="modem_config_medium">Srednji doseg (vendar hiter)</string>
-    <string name="modem_config_long">Dolg doseg (vendar počasnejši)</string>
-    <string name="modem_config_very_long">Zelo dolg doseg (vendar počasen)</string>
+    <string name="modem_config_short">Kratek doseg (hitro)</string>
+    <string name="modem_config_medium">Srednji doseg (hitro)</string>
+    <string name="modem_config_long">Dolg doseg (hitro)</string>
+    <string name="modem_config_very_long">Zelo dolg doseg (počasen)</string>
     <string name="modem_config_unrecognized">NEZNANO</string>
     <string name="meshtastic_service_notifications">Obvestila storitve Meshtastic</string>
     <string name="location_disabled_warning">V nastavitvah za Android morate vključiti lokacijske storitve</string>
     <string name="about">O programu</string>
+    <string name="modem_config_slow_short">Kratek doseg (počasen)</string>
+    <string name="modem_config_slow_medium">Srednji doseg (počasen)</string>
+    <string name="modem_config_slow_long">Dolg doseg (počasen)</string>
 </resources>

app/src/main/res/values-tr/strings.xml

@@ -59,12 +59,15 @@
     <string name="app_too_old">Uygulama çok eski</string>
     <string name="must_update">Uygulamayı Google Play store (ya da GitHub)\'da güncellemelisiniz. Bu telsiz ile haberleşmek için uygualama çok eski.</string>
     <string name="none">Hiçbiri (kapat)</string>
-    <string name="modem_config_short">Kısa menzilli (ama hızlı)</string>
-    <string name="modem_config_medium">Orta menzilli (ama hızlı)</string>
-    <string name="modem_config_long">Uzun menzilli (ama yavaş)</string>
-    <string name="modem_config_very_long">Çok uzun menzilli (ama yavaş)</string>
+    <string name="modem_config_short">Kısa menzilli (hızlı)</string>
+    <string name="modem_config_medium">Orta menzilli (hızlı)</string>
+    <string name="modem_config_long">Uzun menzilli (hızlı)</string>
+    <string name="modem_config_very_long">Çok uzun menzilli (yavaş)</string>
     <string name="modem_config_unrecognized">TANIMLANAMADI</string>
     <string name="meshtastic_service_notifications">Meshtastic Servis Bildirimleri</string>
     <string name="location_disabled_warning">Android ayarlarında konum servislerine izin vermelisiniz</string>
     <string name="about">Hakkında</string>
+    <string name="modem_config_slow_short">Kısa menzilli (yavaş)</string>
+    <string name="modem_config_slow_medium">Orta menzilli (yavaş)</string>
+    <string name="modem_config_slow_long">Uzun menzilli (yavaş)</string>
 </resources>

app/src/main/res/values-zh/strings.xml

@@ -61,7 +61,7 @@
     <string name="none">无（禁用）</string>
     <string name="modem_config_short">短距离（速度快）</string>
     <string name="modem_config_medium">中等距离（速度快）</string>
-    <string name="modem_config_long">长距离（速度较慢）</string>
+    <string name="modem_config_long">长距离（速度快）</string>
     <string name="modem_config_very_long">远距离（速度慢）</string>
     <string name="modem_config_unrecognized">无法识别</string>
     <string name="meshtastic_service_notifications">Mesh网络服务通知</string>
@@ -103,4 +103,7 @@
     <string name="theme_dark">暗黑</string>
     <string name="theme_system">系统默认</string>
     <string name="choose_theme_title">选择主题</string>
+    <string name="modem_config_slow_short">短距离（速度慢）</string>
+    <string name="modem_config_slow_medium">中等距离（速度慢）</string>
+    <string name="modem_config_slow_long">长距离（速度慢）</string>
 </resources>

app/src/main/res/values/strings.xml

@@ -66,7 +66,7 @@
     <string name="modem_config_short">Short Range / Fast</string>
     <string name="modem_config_medium">Medium Range / Fast</string>
     <string name="modem_config_long">Long Range / Fast</string>
-    <string name="modem_config_very_long">Long Range / Slow</string>
+    <string name="modem_config_very_long">Very Long Range / Slow</string>
     <string name="modem_config_unrecognized">UNRECOGNIZED</string>
     <string name="meshtastic_service_notifications">Meshtastic Service Notifications</string>
     <string name="location_disabled_warning">Location must be turned on (high accuracy) to find new devices via bluetooth. You can turn it off again afterwards.</string>
@@ -123,4 +123,5 @@
     <string name="delete_selected_message">Delete selected message?</string>
     <string name="delete">Delete</string>
     <string name="delete_all_messages">Delete All Messages</string>
+    <string name="modem_config_slow_long">Long Range / Slow</string>
 </resources>